From: Dirk Koopman Date: Wed, 29 Oct 2014 17:49:53 +0000 (+0000) Subject: add decoded time to record X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d4930c43d5ff2093e8ef3a4a259c4549c97ca3d4;p=dweather.git add decoded time to record So I can understand it better when looking at the logs. I must be getting like Tubby! Having said that, the time_t timestamp may go and, if necessary be regenerated. --- diff --git a/loop.pl b/loop.pl index 5fe9594..12e60a8 100755 --- a/loop.pl +++ b/loop.pl @@ -10,6 +10,9 @@ use Mojo::IOLoop::Stream; use JSON; use Debug; use SMGLog; +use Math::Round qw(nearest); + +use constant pi => 3.14159265358979; my $devname = "/dev/davis"; my $rain_mult = 0.2; # 0.1 or 0.2 mm or 0.01 inches @@ -31,6 +34,8 @@ our $last_hour = 0; our $last_rain_hour; our $last_rain_min; our $last_rain; +our @rain24; +our $rain24; our $loop_count; # how many LOOPs we have done, used as start indicator @@ -221,75 +226,73 @@ sub process my $rain; my %h; - # Common ones - $tmp = unpack("s", substr $blk,7,2) / 1000; - $h{Pressure} = sprintf("%.0f",in2mb($tmp))+0; + my $crc_calc = CRC_CCITT($blk); - $tmp = unpack("s", substr $blk,9,2) / 10; - $h{Temp_In} = sprintf("%.1f", f2c($tmp))+0; - - $tmp = unpack("s", substr $blk,12,2) / 10; - $h{Temp_Out} = sprintf("%.1f", f2c($tmp))+0; + if ($crc_calc==0) { - $tmp = unpack("C", substr $blk,14,1); - $h{Wind} = sprintf("%.1f",mph2mps($tmp))+0; - $h{Dir} = unpack("s", substr $blk,16,2)+0; + # Common ones + $tmp = unpack("s", substr $blk,7,2) / 1000; + $h{Pressure} = nearest(1, in2mb($tmp)); - my $wind = {w => $h{Wind}, d => $h{Dir}}; - push @min, $wind; + $tmp = unpack("s", substr $blk,9,2) / 10; + $h{Temp_In} = nearest(0.1, f2c($tmp)); - $h{Humidity_Out} = unpack("C", substr $blk,33,1)+0; - $h{Humidity_In} = unpack("C", substr $blk,11,1)+0; + $tmp = unpack("s", substr $blk,12,2) / 10; + $h{Temp_Out} = nearest(0.1, f2c($tmp)); - $tmp = unpack("C", substr $blk,43,1)+0; - $h{UV} = $tmp unless $tmp >= 255; - $tmp = unpack("s", substr $blk,44,2)+0; # watt/m**2 - $h{Solar} = $tmp unless $tmp >= 32767; + $tmp = unpack("C", substr $blk,14,1); + $h{Wind} = nearest(0.1, mph2mps($tmp)); + $h{Dir} = unpack("s", substr $blk,16,2)+0; -# $h{Rain_Rate} = sprintf("%0.1f",unpack("s", substr $blk,41,2) * $rain_mult)+0; - $rain = $h{Rain_Day} = sprintf("%0.1f", unpack("s", substr $blk,50,2) * $rain_mult)+0; - my $delta_rain = $h{Rain} = ($rain >= $last_rain ? $rain - $last_rain : $rain) if $loop_count; - $last_rain = $rain; + my $wind = {w => $h{Wind}, d => $h{Dir}}; + push @min, $wind; - # what sort of packet is it? + $h{Humidity_Out} = unpack("C", substr $blk,33,1)+0; + $h{Humidity_In} = unpack("C", substr $blk,11,1)+0; - my $sort = unpack("C", substr $blk,4,1); - if ($sort) { + $tmp = unpack("C", substr $blk,43,1)+0; + $h{UV} = $tmp unless $tmp >= 255; + $tmp = unpack("s", substr $blk,44,2)+0; # watt/m**2 + $h{Solar} = $tmp unless $tmp >= 32767; - # Newer LOOP2 packet - $tmp = unpack("C", substr $blk,18,2); -# $h{Wind_Avg_10} = sprintf("%.1f",mph2mps($tmp/10))+0; - $tmp = unpack("C", substr $blk,20,2); -# $h{Wind_Avg_2} = sprintf("%.1f",mph2mps($tmp/10))+0; - $tmp = unpack("C", substr $blk,22,2); -# $h{Wind_Gust_10} = sprintf("%.1f",mph2mps($tmp/10))+0; + # $h{Rain_Rate} = nearest(0.1,unpack("s", substr $blk,41,2) * $rain_mult); + $rain = $h{Rain_Day} = nearest(0.1, unpack("s", substr $blk,50,2) * $rain_mult); + my $delta_rain = $h{Rain} = nearest(0.1, ($rain >= $last_rain ? $rain - $last_rain : $rain)) if $loop_count; + $last_rain = $rain; -# $h{Dir_Avg_10} = unpack("C", substr $blk,24,2)+0; - $tmp = unpack("C", substr $blk,30,2); - $h{Dew_Point} = sprintf("%0.1f", f2c($tmp))+0; + # what sort of packet is it? + my $sort = unpack("C", substr $blk,4,1); + if ($sort) { - } else { + # Newer LOOP2 packet + $tmp = unpack("C", substr $blk,18,2); + # $h{Wind_Avg_10} = nearest(0.1,mph2mps($tmp/10)); + $tmp = unpack("C", substr $blk,20,2); + # $h{Wind_Avg_2} = nearest(0.1,mph2mps($tmp/10)); + $tmp = unpack("C", substr $blk,22,2); + # $h{Wind_Gust_10} = nearest(0.1,mph2mps($tmp/10)); - # Older LOOP packet - $tmp = unpack("C", substr $blk,15,1); -# $h{Wind_Avg_10} = sprintf("%.1f",mph2mps($tmp))+0; - $h{Dew_Point} = sprintf("%0.1f", dew_point($h{Temp_Out}, $h{Humidity_Out}))+0; - $h{Rain_Month} = sprintf("%0.1f", unpack("s", substr $blk,52,2) * $rain_mult)+0; - $h{Rain_Year} = sprintf("%0.1f", unpack("s", substr $blk,54,2) * $rain_mult)+0; + # $h{Dir_Avg_10} = unpack("C", substr $blk,24,2)+0; + $tmp = unpack("C", substr $blk,30,2); + $h{Dew_Point} = nearest(0.1, f2c($tmp)); - } + } else { - my $crc_calc = CRC_CCITT($blk); + # Older LOOP packet + $tmp = unpack("C", substr $blk,15,1); + # $h{Wind_Avg_10} = nearest(0.1,mph2mps($tmp)); + $h{Dew_Point} = nearest(0.1, dew_point($h{Temp_Out}, $h{Humidity_Out})); + $h{Rain_Month} = nearest(0.1, unpack("s", substr $blk,52,2) * $rain_mult); + $h{Rain_Year} = nearest(0.1, unpack("s", substr $blk,54,2) * $rain_mult); + } - if ($crc_calc==0) { my $ts = time; - my $j; my $s; if ($ts >= $last_hour + 3600) { $h{Pressure_Trend} = unpack("C", substr $blk,3,1); $h{Pressure_Trend_txt} = $bar_trend{$h{Pressure_Trend}}; $h{Batt_TX_OK} = (unpack("C", substr $blk,86,1)+0) ^ 1; - $h{Batt_Console} = sprintf("%0.2f", unpack("s", substr $blk,87,2) * 0.005859375)+0; + $h{Batt_Console} = nearest(0.01, unpack("s", substr $blk,87,2) * 0.005859375); $h{Forecast_Icon} = unpack("C", substr $blk,89,1); $h{Forecast_Rule} = unpack("C", substr $blk,90,1); $h{Sunrise} = sprintf( "%04d", unpack("S", substr $blk,91,2) ); @@ -298,50 +301,50 @@ sub process $h{Sunset} =~ s/(\d{2})(\d{2})/$1:$2/; if ($loop_count) { # i.e not the first - my $a = average(scalar @hour ? @hour : {w => $h{Wind}, d => $h{Dir}}); + my $a = wind_average(scalar @hour ? @hour : {w => $h{Wind}, d => $h{Dir}}); - $h{Wind_1h} = sprintf("%0.1f", $a->{w})+0; - $h{Dir_1h} = sprintf("%0.0f", $a->{d})+0; - $h{Rain_1h} = $rain >= $last_rain_hour ? $rain - $last_rain_hour : $rain; + $h{Wind_1h} = nearest(0.1, $a->{w}); + $h{Dir_1h} = nearest(0.1, $a->{d}); - $h{Wind_1m} = sprintf("%0.1f", $a->{w})+0; - $h{Dir_1m} = sprintf("%0.0f", $a->{d})+0; - $h{Rain_1m} = $rain >= $last_rain_min ? $rain - $last_rain_min : $rain; + $a = wind_average(@min); + $h{Wind_1m} = nearest(0.1, $a->{w}); + $h{Dir_1m} = nearest(1, $a->{d}); + + ($h{Rain_1m}, $h{Rain_1h}, $h{Rain_24h}) = calc_rain($rain); } $last_rain_min = $last_rain_hour = $rain; - $j = $json->encode(\%h); - - $s = qq|{"t":$ts,"h":$j}|; + $s = genstr($ts, 'h', \%h); + $last_hour = int($ts/3600)*3600; $last_min = int($ts/60)*60; @hour = (); @min = (); } elsif ($ts >= $last_min + 60) { - my $a = average(@min); + my $a = wind_average(@min); my %save; push @hour, $a; if ($loop_count) { # i.e not the first - $h{Wind_1m} = sprintf("%0.1f", $a->{w})+0; - $h{Dir_1m} = sprintf("%0.0f", $a->{d})+0; - $h{Rain_1h} = $rain >= $last_rain_hour ? $rain - $last_rain_hour : $rain; # this is the rate for this hour, so far - $h{Rain_1m} = $rain >= $last_rain_min ? $rain - $last_rain_min : $rain; + my $rm; + + $h{Wind_1m} = nearest(0.1, $a->{w}); + $h{Dir_1m} = nearest(1, $a->{d}); + ($h{Rain_1m}, $h{Rain_1h}, $h{Rain_24h}) = calc_rain($rain); } $last_rain_min = $rain; - $j = $json->encode(\%h); - - $s = qq|{"t":$ts,"m":$j}|; + $s = genstr($ts, 'm', \%h); + $last_min = int($ts/60)*60; @min = (); } else { my $o = gen_hash_diff($last_reading, \%h); if ($o) { - $j = $json->encode($o); - $s = qq|{"t":$ts,"r":$j}|; - } else { + $s = genstr($ts, 'r', $o); + } + else { dbg "loop rec not changed" if isdbg 'chan'; } } @@ -354,6 +357,19 @@ sub process return; } +sub genstr +{ + my $ts = shift; + my $let = shift; + my $h = shift; + + my $j = $json->encode($h); + my ($sec,$min,$hr) = (gmtime $ts)[0,1,2]; + my $tm = sprintf "%02d:%02d:%02d", $hr, $min, $sec; + + return qq|{"tm":"$tm","t":$ts,"$let":$j}|; +} + sub output_str { my $s = shift; @@ -437,20 +453,49 @@ sub in2mb return $_[0] * 33.8637526; } -sub average +sub wind_average { - my %out; + my ($sindir, $cosdir, $wind); my $count; foreach my $r (@_) { - while (my ($k, $v) = each %$r) { - $out{$k} += $v; - } + $wind += $r->{w}; + $sindir += sin(d2r($r->{d})) * $r->{w}; + $cosdir += cos(d2r($r->{d})) * $r->{w}; ++$count; } - while (my ($k, $v) = each %out) { - $out{$k} /= $count; - } - return \%out; + my $avhdg = r2d(atan2($sindir, $cosdir)); + $avhdg += 360 if $avhdg < 0; + return {w => $wind / $count, d => $avhdg}; +} + +# radians to degrees +sub r2d +{ + my $n = shift; + return ($n / pi) * 180; +} + +# degrees to radians +sub d2r +{ + my $n = shift; + return ($n / 180) * pi; +} + +sub calc_rain +{ + my $rain = shift; + + my $Rain_1h = nearest(0.1, $rain >= $last_rain_hour ? $rain - $last_rain_hour : $rain); # this is the rate for this hour, so far + my $rm = $rain >= $last_rain_min ? $rain - $last_rain_min : $rain; + my $Rain_1m = nearest(0.1, $rm); + push @rain24, $rm; + $rain24 += $rm; + while (@rain24 > 24*60) { + $rain24 -= shift @rain24; + } + my $Rain_24h = nearest(0.1, $rain24); + return ($Rain_1m, $Rain_1h, $Rain_24h); }