X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=loop.pl;h=8a33ba72ce797146e6b6c81e7c1de65c4c35687e;hb=9a9679bb16f6676d568db58d46ac0bbe85da2a4c;hp=ef0c4e031a5c37150046cd13981e8047b2b5c265;hpb=34fb2f9bb6432b6dffe2f79fe6c4e31801565aad;p=dweather.git diff --git a/loop.pl b/loop.pl index ef0c4e0..8a33ba7 100755 --- a/loop.pl +++ b/loop.pl @@ -3,17 +3,22 @@ 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 Debug; +use SMGLog; my $devname = "/dev/davis"; +my $rain_mult = 0.1; # 0.1 or 0.2 mm or 0.01 inches my $tid; my $rid; my $count; my $state = "ready"; my $buf; +my $dbg; +my $last_reading; our @crc_table = ( 0x0, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7, @@ -60,11 +65,16 @@ $bar_trend{0} = "Steady"; $bar_trend{20} = "Rising Slowly"; $bar_trend{60} = "Rising Rapidly"; -#$SIG{TERM} = $SIG{INT} = sub {Mojo::IOLoop->reset if Mojo::IOLoop->is_running && !$DB::VERSION}; +#$SIG{TERM} = $SIG{INT} = sub {Mojo::IOLoop->stop if Mojo::IOLoop->is_running && !$DB::VERSION}; + +my $dlog = SMGLog->new("day"); +$dlog->mode('a'); my $s = do_open($devname); start_loop(); +Mojo::IOLoop->recurring(0.1 => sub { $dlog->flushall }); + Mojo::IOLoop->start unless Mojo::IOLoop->is_running; exit 0; @@ -74,11 +84,11 @@ 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; +# say "read added '$d' buf lth=" . length $buf if $dbg; if ($state eq 'waitnl' && $buf =~ /[\cJ\cM]+/) { - undef $tid; + Mojo::IOLoop->remove($tid); undef $buf; - $s->write("LOOP 1\n"); + $s->write("LPS 1 1\n"); chgstate("waitloop"); } elsif ($state eq "waitloop") { if ($buf =~ /\x06/) { @@ -87,7 +97,8 @@ sub on_read } } elsif ($state eq 'waitlooprec') { if (length $buf >= 99) { - say "got loop record\n"; + say "got loop record\n" if $dbg; + chgstate(''); process($buf); undef $buf; @@ -97,15 +108,18 @@ sub on_read sub start_loop { - say "writing \\n"; + say "writing \\n" if $dbg; + $s->write("\n"); - $tid = Mojo::IOLoop->timer(0.6 => sub {say "writing \\n"; $s->write("\n")}); + $tid = Mojo::IOLoop->recurring(0.6 => sub {say "writing \\n" if $dbg; $s->write("\n")}); + chgstate("waitnl"); } sub chgstate { - say "state '$state' -> '$_[0]'"; + say "state '$state' -> '$_[0]'" if $dbg; + $state = $_[0]; } @@ -113,104 +127,144 @@ sub do_open { my $name = shift; my $ob = Serial->new($name, 19200) || die "$name $!\n"; - say "streaming $name fileno(", fileno($ob), ")"; + say "streaming $name fileno(", fileno($ob), ")" if $dbg; + 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(read=>sub {on_read(@_)}); $str->start; - $rid = Mojo::IOLoop->recurring(2.5 => sub {start_loop() if !$state || $state eq "waitnl";}); + $rid = Mojo::IOLoop->recurring(2.5 => sub { + start_loop() if !$state || $state eq "waitnl"; + }); return $str; } +my $last_time; + sub process { my $blk = shift; my $loo = substr $blk,0,3; unless ( $loo eq 'LOO') { - say "Block invalid loo -> $loo"; return; + say "Block invalid loo -> $loo" if $dbg; return; } my $t; - my %hsh; - + my %h; - #$hsh{'next_rec'} = unpack("s", substr $blk,5,2); - - $hsh{'Barometric_Trend'} = unpack("C", substr $blk,3,1); - $hsh{'Barometric_Trend_txt'} = $bar_trend{$hsh{'Barometric_Trend'}}; + # Common ones + $h{Pressure_Trend} = unpack("C", substr $blk,3,1); + $h{Pressure_Trend_txt} = $bar_trend{$h{'Pressure_Trend'}}; $t = unpack("s", substr $blk,7,2) / 1000; - # $hsh{'Barometric_Press_hg'} = $t; - $hsh{'Barometric_Press_mb'} = sprintf("%.2f",$t*33.8637526); - + $h{Pressure} = sprintf("%.0f",in2mb($t))+0; $t = unpack("s", substr $blk,9,2) / 10; - # $hsh{'Air_Temp_Inside_f'} = $t; - $hsh{'Air_Temp_Inside_c'} = sprintf("%.1f",($t - 32) * 5/9); - my $tf = unpack("s", substr $blk,12,2) / 10; - # $hsh{'Air_Temp_Outside_f'} = $tf; - $hsh{'Air_Temp_Outside_c'} = sprintf("%.1f",($tf - 32) * 5/9); + $h{Temp_In} = sprintf("%.1f", f2c($t))+0; + + $t = unpack("s", substr $blk,12,2) / 10; + $h{Temp_Out} = sprintf("%.1f", f2c($t))+0; + + $t = unpack("C", substr $blk,14,1); + $h{Wind} = sprintf("%.1f",mph2mps($t))+0; + $h{Dir} = unpack("s", substr $blk,16,2)+0; - $hsh{'Wind_Speed_mph'} = unpack("C", substr $blk,14,1); - # $hsh{'Wind_Speed_mps'} = sprintf("%.1f",$hsh{'Wind_Speed_mph'}*0.44704); - $hsh{'Wind_Speed_10min_Avg_mph'} = unpack("C", substr $blk,15,1); - # $hsh{'Wind_Speed_10min_Avg_mps'} = sprintf("%.1f",$hsh{'Wind_Speed_10min_Avg_mph'}*0.44704); - $hsh{'Wind_Dir'} = unpack("s", substr $blk,16,2); + $h{'Humidity_Out'} = unpack("C", substr $blk,33,1)+0; + $h{'Humidity_In'} = unpack("C", substr $blk,11,1)+0; - $hsh{'Humidity_Outside'} = unpack("C", substr $blk,33,1); - $hsh{'Humidity_Inside'} = unpack("C", substr $blk,11,1); - $hsh{'Dew_Point'} = dew_point($tf, $hsh{'Humidity_Outside'}); + $t = unpack("C", substr $blk,43,1)+0; + $h{'UV'} = $t unless $t >= 255; + $t = unpack("s", substr $blk,44,2)+0; # watt/m**2 + $h{'Solar'} = $t unless $t >= 32767; - # $hsh{'UV'} = unpack("C", substr $blk,43,1); - # $hsh{'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; + $h{'Rain_Day'} = sprintf("%0.1f", unpack("s", substr $blk,50,2) * $rain_mult)+0; - $hsh{'Rain_Rate'} = (unpack("s", substr $blk,41,2) / 100) * 25.4; # Inches per hr converted to mm - $hsh{'Rain_Storm'} = (unpack("s", substr $blk,46,2) / 100) * 25.4; # Inches per storm - #$hsh{'Storm_Date'} = unpack("s", substr $blk,48,2); # Need to parse data (not sure what this is) - $hsh{'Rain_Day'} = (unpack("s", substr $blk,50,2)/100) * 25.4; - $hsh{'Rain_Month'} = (unpack("s", substr $blk,52,2)/100) * 25.4; - $hsh{'Rain_Year'} = (unpack("s", substr $blk,54,2)/100) * 25.4; + # what sort of packet is it? - $hsh{'ET_Day'} = unpack("s", substr $blk,56,2)/1000; - $hsh{'ET_Month'} = unpack("s", substr $blk,58,2)/100; - $hsh{'ET_Year'} = unpack("s", substr $blk,60,2)/100; + $t = unpack("C", substr $blk,4,1); + if ($t) { - #$hsh{'Alarms_Inside'} = unpack("b8", substr $blk,70,1); - #$hsh{'Alarms_Rain'} = unpack("b8", substr $blk,70,1); - #$hsh{'Alarms_Outside'} = unpack("b8", substr $blk,70,1); + # Newer LOOP2 packet + $t = unpack("C", substr $blk,18,2); + $h{Wind_Avg_10} = sprintf("%.1f",mph2mps($t/10))+0; + $t = unpack("C", substr $blk,20,2); + $h{Wind_Avg_2} = sprintf("%.1f",mph2mps($t/10))+0; + $t = unpack("C", substr $blk,22,2); + $h{Wind_Gust_10} = sprintf("%.1f",mph2mps($t/10))+0; + + $h{Dir_Avg_10} = unpack("C", substr $blk,24,2)+0; + $t = unpack("C", substr $blk,30,2); + $h{Dew_Point} = sprintf("%0.1f", f2c($t))+0; - $hsh{'Batt_Transmitter'} = unpack("C", substr $blk,86,1); # * 0.005859375 - $hsh{'Batt_Console'} = unpack("s", substr $blk,87,2) * 0.005859375; + } else { + + # Older LOOP packet + $t = unpack("C", substr $blk,15,1); + $h{Wind_Avg_10} = sprintf("%.1f",mph2mps($t))+0; + $h{'Dew_Point'} = sprintf("%0.1f", dew_point($h{Temp_Out}, $h{'Humidity_Out'}))+0; - $hsh{'Forecast_Icon'} = unpack("C", substr $blk,89,1); - $hsh{'Forecast_Rule'} = unpack("C", substr $blk,90,1); + $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; - $hsh{'Sunrise'} = sprintf( "%04d", unpack("S", substr $blk,91,2) ); - $hsh{'Sunrise'} =~ s/(\d{2})(\d{2})/$1:$2/; - $hsh{'Sunset'} = sprintf( "%04d", unpack("S", substr $blk,93,2) ); - $hsh{'Sunset'} =~ s/(\d{2})(\d{2})/$1:$2/; - #my $nl = ord substr $blk,95,1; - #my $cr = ord substr $blk,96,1; + $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/; + } my $crc = unpack "%n", substr($blk,97,2); my $crc_calc = CRC_CCITT($blk); if ($crc_calc==0) { - say "inside: $hsh{Air_Temp_Inside_c} degC $hsh{Humidity_Inside}\% outside: $hsh{Air_Temp_Outside_c} degC $hsh{Humidity_Outside}\% wind: $hsh{Wind_Speed_mph} $hsh{Wind_Dir} deg $hsh{Barometric_Press_mb} mB"; - + my $o = gen_hash_diff($last_reading, \%h); + $last_reading = \%h; + my $t = time; + my $j; + my $s; + if ($t >= $last_time + 60) { + $j = encode_json(\%h); + $s = qq|{"t":$t,"m":$j}|; + $last_time = $t; + } elsif ($o) { + $j = encode_json($o); + $s = qq|{"t":$t,"r":$j}|; + } + if ($s) { + say $s; + $dlog->writenow($s); + } } else { - print "CRC check failed for LOOP data!\n"; + say "CRC check failed for LOOP data!"; return 1; } - #delete @hsh{'crc', 'crc_calc', 'next_rec'}; - #delete($hsh{crc})||die"cant delete crc"; - #delete($hsh{crc_calc})||die"cant delete crc_calc"; - #delete($hsh{next_rec})||die"cant delete next_rec"; +} + +sub gen_hash_diff +{ + my $last = shift; + my $now = shift; + my %o; + my $count; + + while (my ($k, $v) = each %$now) { + if ($last->{$k} ne $now->{$k}) { + $o{$k} = $v; + ++$count; + } + } + return $count ? \%o : undef; } sub dew_point @@ -222,9 +276,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); + + # 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 $dew_point; + return $dewpoint; } sub CRC_CCITT @@ -250,3 +311,17 @@ sub CRC_CCITT return $crc; } +sub f2c +{ + return ($_[0] - 32) * 5/9; +} + +sub mph2mps +{ + return $_[0] * 0.44704; +} + +sub in2mb +{ + return $_[0] * 33.8637526; +}