X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=loop.pl;h=e4a1fb69eb2c341a26d3af625c1ad03ecb6ca336;hb=849ae984242339ff7b8baa14517a4453e285800d;hp=9420e2b95c95876b17a2b8a3043674d00b608d3a;hpb=3e913f5e4a04510bc7144639da5fa97b20d335e2;p=dweather.git diff --git a/loop.pl b/loop.pl index 9420e2b..e4a1fb6 100755 --- a/loop.pl +++ b/loop.pl @@ -3,21 +3,36 @@ use strict; use v5.10.1; -use DBI; use Serial; use Mojo::IOLoop; use Mojo::IOLoop::Stream; -use Mojo::JSON qw(decode_json encode_json); +#use Mojo::JSON qw(decode_json encode_json); +use JSON; +use Debug; +use SMGLog; my $devname = "/dev/davis"; -my $rain_mult = 0.1; # 0.1 or 0.2 mm or 0.01 inches +my $rain_mult = 0.2; # 0.1 or 0.2 mm or 0.01 inches my $tid; my $rid; -my $count; +our $did; +my $nlcount; my $state = "ready"; my $buf; my $dbg; my $last_reading; +my $s; # the serial port Mojo::IOLoop::Stream +our $ending = 0; + +our $json = JSON->new->canonical(1); + +our $last_min = int(time/60)*60; +our $last_hour = 0; +our $last_rain_hour; +our $last_rain_min; +our $last_rain; + +our $loop_count; # how many LOOPs we have done, used as start indicator our @crc_table = ( 0x0, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, @@ -64,14 +79,32 @@ $bar_trend{0} = "Steady"; $bar_trend{20} = "Rising Slowly"; $bar_trend{60} = "Rising Rapidly"; -#$SIG{TERM} = $SIG{INT} = sub {Mojo::IOLoop->stop if Mojo::IOLoop->is_running && !$DB::VERSION}; +our $ending = 0; + +$SIG{TERM} = $SIG{INT} = sub {++$ending; Mojo::IOLoop->stop;}; +$SIG{HUP} = 'IGNORE'; + +dbginit(); +if (@ARGV) { + dbgadd(@ARGV); +} +dbgadd('chan'); + +dbg '***'; +dbg "*** starting $0"; +dbg '***'; + +dbg scalar gmtime($last_min); +dbg scalar gmtime($last_hour); -my $s = do_open($devname); -start_loop(); +my $dlog = SMGLog->new("day"); +$did = Mojo::IOLoop->recurring(1 => sub {$dlog->flushall}); -Mojo::IOLoop->start unless Mojo::IOLoop->is_running; +do_reopen($devname); -$s->close; +dbg '***'; +dbg "*** ending $0"; +dbg '***'; exit 0; @@ -80,21 +113,24 @@ sub on_read my ($str, $d) = @_; $buf .= $d; $d =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; -# say "read added '$d' buf lth=" . length $buf if $dbg; + dbg "read added '$d' buf lth=" . length $buf if isdbg 'raw'; if ($state eq 'waitnl' && $buf =~ /[\cJ\cM]+/) { + dbg "Got \\n" if isdbg 'state'; + Mojo::IOLoop->remove($tid) if $tid; undef $tid; undef $buf; - $s->write("LOOP 1\n"); + $nlcount = 0; + $s->write("LPS 1 1\n"); chgstate("waitloop"); } elsif ($state eq "waitloop") { if ($buf =~ /\x06/) { + dbg "Got ACK 0x06" if isdbg 'state'; chgstate('waitlooprec'); undef $buf; } } elsif ($state eq 'waitlooprec') { if (length $buf >= 99) { - say "got loop record\n" if $dbg; - + dbg "got loop record" if isdbg 'chan'; chgstate(''); process($buf); undef $buf; @@ -104,127 +140,224 @@ sub on_read sub start_loop { - say "writing \\n" if $dbg; - + $nlcount = 1; + dbg "start_loop writing $nlcount \\n" if isdbg 'state'; $s->write("\n"); - $tid = Mojo::IOLoop->timer(0.6 => sub {say "writing \\n" if $dbg; $s->write("\n")}); - + Mojo::IOLoop->remove($tid) if $tid; + undef $tid; + $tid = Mojo::IOLoop->recurring(0.6 => sub { + if (++$nlcount > 10) { + dbg "\\n count > 10, closing connection" if isdbg 'chan'; + do_reopen($devname); + return; + } + dbg "writing $nlcount \\n" if isdbg 'state'; + $s->write("\n"); + }); chgstate("waitnl"); } sub chgstate { - say "state '$state' -> '$_[0]'" if $dbg; - + dbg "state '$state' -> '$_[0]'" if isdbg 'state'; $state = $_[0]; } +sub do_reopen +{ + my $name = shift; + dbg "do reopen on '$name' ending $ending"; + unless ($ending) { + $s = do_open($name); + start_loop(); + chgstate(''); + $nlcount = 0; + Mojo::IOLoop->start unless Mojo::IOLoop->is_running; + } +} + sub do_open { my $name = shift; + + $s->close if $s; + undef $s; + my $ob = Serial->new($name, 19200) || die "$name $!\n"; - say "streaming $name fileno(", fileno($ob), ")" if $dbg; + dbg "streaming $name fileno(" . fileno($ob) . ")" if isdbg 'chan'; my $str = Mojo::IOLoop::Stream->new($ob); - $str->on(error=>sub {say "serial $_[1]"; undef $s; Mojo::IOLoop->reset;}); - - $str->on(close=>sub {say "serial closing"; undef $s; Mojo::IOLoop->reset;}); - $str->on(timeout=>sub {say "serial timeout";}); + $str->on(error=>sub {dbg "serial $_[1]"; do_reopen($name) unless $ending}); + $str->on(close=>sub {dbg "serial closing"; do_reopen($name) unless $ending}); + $str->on(timeout=>sub {dbg "serial timeout";}); $str->on(read=>sub {on_read(@_)}); $str->start; - $rid = Mojo::IOLoop->recurring(2.5 => sub {start_loop() if !$state || $state eq "waitnl";}); - + Mojo::IOLoop->remove($tid) if $tid; + undef $tid; + Mojo::IOLoop->remove($rid) if $rid; + undef $rid; + $rid = Mojo::IOLoop->recurring(2.5 => sub { + start_loop() if !$state; + }); + chgstate(''); + $nlcount = 0; + return $str; } +my @min; +my @hour; + sub process { my $blk = shift; my $loo = substr $blk,0,3; unless ( $loo eq 'LOO') { - say "Block invalid loo -> $loo" if $dbg; return; + dbg "Block invalid loo -> $loo" if isdbg 'chan'; return; } - my $t; + my $tmp; + my $rain; my %h; + # Common ones + $tmp = unpack("s", substr $blk,7,2) / 1000; + $h{Pressure} = sprintf("%.0f",in2mb($tmp))+0; - #$h{'next_rec'} = unpack("s", substr $blk,5,2); - - $h{'Barometric_Trend'} = unpack("C", substr $blk,3,1); - $h{'Barometric_Trend_txt'} = $bar_trend{$h{'Barometric_Trend'}}; - $t = unpack("s", substr $blk,7,2) / 1000; - $h{'Barometric_Press_mb'} = sprintf("%.0f",$t*33.8637526); - + $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; - $t = unpack("s", substr $blk,9,2) / 10; - $h{'Air_Temp_Inside_c'} = sprintf("%.1f",($t - 32) * 5/9); - my $tf = unpack("s", substr $blk,12,2) / 10; - $h{'Air_Temp_Outside_c'} = sprintf("%.1f",($tf - 32) * 5/9); + $tmp = unpack("C", substr $blk,14,1); + $h{Wind} = sprintf("%.1f",mph2mps($tmp))+0; + $h{Dir} = unpack("s", substr $blk,16,2)+0; - $h{'Wind_Speed_mph'} = unpack("C", substr $blk,14,1); - $h{'Wind_Speed_mps'} = sprintf("%.1f",$h{'Wind_Speed_mph'}*0.44704); - $h{'Wind_Speed_10min_Avg_mph'} = unpack("C", substr $blk,15,1); - $h{'Wind_Speed_10min_Avg_mps'} = sprintf("%.1f",$h{'Wind_Speed_10min_Avg_mph'}*0.44704); - $h{'Wind_Dir'} = unpack("s", substr $blk,16,2); + my $wind = {w => $h{Wind}, d => $h{Dir}}; + push @min, $wind; + $h{Humidity_Out} = unpack("C", substr $blk,33,1)+0; + $h{Humidity_In} = unpack("C", substr $blk,11,1)+0; - $h{'Humidity_Outside'} = unpack("C", substr $blk,33,1); - $h{'Humidity_Inside'} = unpack("C", substr $blk,11,1); - $h{'Dew_Point'} = dew_point($h{Air_Temp_Outside_c}, $h{'Humidity_Outside'}); + $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; - $h{'UV'} = unpack("C", substr $blk,43,1); - $h{'Solar'} = unpack("s", substr $blk,44,2); # watt/m**2 +# $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; + $h{Rain} = ($rain >= $last_rain ? $rain - $last_rain : $rain) if $loop_count; + $last_rain = $rain; - $h{'Rain_Rate'} = unpack("s", substr $blk,41,2) * $rain_mult; - $h{'Rain_Day'} = unpack("s", substr $blk,50,2) * $rain_mult; - $h{'Rain_Month'} = unpack("s", substr $blk,52,2) * $rain_mult; - $h{'Rain_Year'} = unpack("s", substr $blk,54,2) * $rain_mult; + # what sort of packet is it? - $h{'ET_Day'} = unpack("s", substr $blk,56,2)/1000; - $h{'ET_Month'} = unpack("s", substr $blk,58,2)/100; - $h{'ET_Year'} = unpack("s", substr $blk,60,2)/100; + my $sort = unpack("C", substr $blk,4,1); + if ($sort) { - #$h{'Alarms_Inside'} = unpack("b8", substr $blk,70,1); - #$h{'Alarms_Rain'} = unpack("b8", substr $blk,70,1); - #$h{'Alarms_Outside'} = unpack("b8", substr $blk,70,1); + # 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{'Batt_TX_OK'} = (unpack("C", substr $blk,86,1)+0) ^ 1; - $h{'Batt_Console'} = unpack("s", substr $blk,87,2) * 0.005859375; +# $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; - $h{'Forecast_Icon'} = unpack("C", substr $blk,89,1); - $h{'Forecast_Rule'} = unpack("C", substr $blk,90,1); + } else { - $h{'Sunrise'} = sprintf( "%04d", unpack("S", substr $blk,91,2) ); - $h{'Sunrise'} =~ s/(\d{2})(\d{2})/$1:$2/; - $h{'Sunset'} = sprintf( "%04d", unpack("S", substr $blk,93,2) ); - $h{'Sunset'} =~ s/(\d{2})(\d{2})/$1:$2/; + # 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; - #my $nl = ord substr $blk,95,1; - #my $cr = ord substr $blk,96,1; + } - my $crc = unpack "%n", substr($blk,97,2); my $crc_calc = CRC_CCITT($blk); if ($crc_calc==0) { - my $o = gen_hash_diff($last_reading, \%h); - $last_reading = \%h; - if (time % 60 == 0) { - my $oo = {t => time, r =>\%h}; - say encode_json($oo); - } elsif ($o) { - my $oo = {t => time, r =>$o}; - say encode_json($oo); + my $ts = time; + my $j; + my $str; + 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{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) ); + $h{Sunrise} =~ s/(\d{2})(\d{2})/$1:$2/; + $h{Sunset} = sprintf( "%04d", unpack("S", substr $blk,93,2) ); + $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}}); + + $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_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; + } + $last_rain_min = $last_rain_hour = $rain; + + $j = $json->encode(\%h); + $str = qq|{"t":$ts,"h":$j}|; + $last_hour = int($ts/3600)*3600; + $last_min = int($ts/60)*60; + @hour = (); + @min = (); + } elsif ($ts >= $last_min + 60) { + my $a = 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; + } + $last_rain_min = $rain; + + $j = $json->encode(\%h); + $str = qq|{"t":$ts,"m":$j}|; + $last_min = int($ts/60)*60; + @min = (); + } else { + my $o = gen_hash_diff($last_reading, \%h); + if ($o) { + $j = $json->encode($o); + $str = qq|{"t":$ts,"r":$j}|; + } else { + dbg "loop rec not changed" if isdbg 'chan'; + } } + output_str($str) if $str; + $last_reading = \%h; + ++$loop_count; } else { - say "CRC check failed for LOOP data!"; - return 1; + dbg "CRC check failed for LOOP data!"; } - #delete @h{'crc', 'crc_calc', 'next_rec'}; - #delete($h{crc})||die"cant delete crc"; - #delete($h{crc_calc})||die"cant delete crc_calc"; - #delete($h{next_rec})||die"cant delete next_rec"; + return; +} + +sub output_str +{ + my $str = shift; + dbg $str; +# say $str; + $dlog->writenow($str); } sub gen_hash_diff @@ -252,9 +385,16 @@ sub dew_point # Accurate to 1 degree C for humidities > 50 % # http://en.wikipedia.org/wiki/Dew_point - my $dew_point = $temp - ( (100 - $rh)/5 ); + my $dewpoint = $temp - ((100 - $rh) / 5); - return $dew_point; + # this is the more complete one (which doesn't work) + #my $a = 6.1121; + #my $b = 18.678; + #my $c = 257.14; + #my $ytrh = log(($rh/100) + ($b * $temp) / ($c + $temp)); + #my $dewpoint = ($c * $ytrh) / ($b - $ytrh); + + return $dewpoint; } sub CRC_CCITT @@ -280,3 +420,35 @@ sub CRC_CCITT return $crc; } +sub f2c +{ + return ($_[0] - 32) * 5/9; +} + +sub mph2mps +{ + return $_[0] * 0.44704; +} + +sub in2mb +{ + return $_[0] * 33.8637526; +} + +sub average +{ + my %out; + my $count; + + foreach my $r (@_) { + while (my ($k, $v) = each %$r) { + $out{$k} += $v; + } + ++$count; + } + while (my ($k, $v) = each %out) { + $out{$k} /= $count; + } + + return \%out; +}