X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=loop.pl;h=1a677d52360866d28f8e247bffbf1ca7dd406e21;hb=cbf57212d7962476d2f2e7bb966283ab4fc1e5ba;hp=12e60a81d6a64fd7a1740ecf7ac43fb239aa6408;hpb=d4930c43d5ff2093e8ef3a4a259c4549c97ca3d4;p=dweather.git diff --git a/loop.pl b/loop.pl index 12e60a8..1a677d5 100755 --- a/loop.pl +++ b/loop.pl @@ -3,18 +3,27 @@ use strict; use v5.10.1; +use Mojolicious::Lite; use Serial; use Mojo::IOLoop; use Mojo::IOLoop::Stream; +use Mojo::Transaction::WebSocket; #use Mojo::JSON qw(decode_json encode_json); use JSON; use Debug; use SMGLog; use Math::Round qw(nearest); +use File::Copy; +use Data::Random qw(rand_chars); +use IO::File; use constant pi => 3.14159265358979; my $devname = "/dev/davis"; +my $datafn = ".loop_data"; +my $dataf; + +my $poll_interval = 2.5; my $rain_mult = 0.2; # 0.1 or 0.2 mm or 0.01 inches my $tid; my $rid; @@ -23,19 +32,16 @@ my $nlcount; my $state = "ready"; my $buf; my $dbg; -my $last_reading; my $ser; # the serial port Mojo::IOLoop::Stream -our $ending = 0; +my $last_min_h; +my $last_hour_h; our $json = JSON->new->canonical(1); +our $WS = {}; # websocket connections -our $last_min = int(time/60)*60; -our $last_hour = 0; -our $last_rain_hour; -our $last_rain_min; -our $last_rain; -our @rain24; -our $rain24; +our $ld = {}; +our @last10minsr = (); +our @last5daysh = (); our $loop_count; # how many LOOPs we have done, used as start indicator @@ -89,6 +95,49 @@ our $ending = 0; $SIG{TERM} = $SIG{INT} = sub {++$ending; Mojo::IOLoop->stop;}; $SIG{HUP} = 'IGNORE'; + +# WebSocket weather service +websocket '/weather' => sub { + my $c = shift; + my $msg = shift; + my $tx = $c->tx; + + # Opened + app->log->debug('WebSocket opened.'); + dbg 'WebSocket opened' if isdbg 'chan'; + $WS->{$tx} = $tx; + + # send historical data + $c->send($ld->{lasthour_h}) if exists $ld->{lasthour_h}; + $c->send($ld->{lastmin_h}) if exists $ld->{lastmin_h}; + + # disable timeout + $c->inactivity_timeout(3615); + + # Incoming message + $c->on( + message => sub { + my ($c, $msg) = @_; + dbg "websocket: text $msg" if isdbg 'chan'; + }, + json => sub { + my ($c, $msg) = @_; + dbg "websocket: json $msg" if isdbg 'chan'; + } + ); + + # Closed + $c->on(finish => sub { + my ($c, $code, $reason) = @_; + app->log->debug("WebSocket closed with status $code."); + dbg "websocket closed with status $code" if isdbg 'chan'; + delete $WS->{$tx}; + }); +}; + +get '/' => {template => 'index'}; + + dbginit(); if (@ARGV) { dbgadd(@ARGV); @@ -99,13 +148,27 @@ dbg '***'; dbg "*** starting $0"; dbg '***'; -dbg scalar gmtime($last_min); -dbg scalar gmtime($last_hour); +read_ld(); -my $dlog = SMGLog->new("day"); -$did = Mojo::IOLoop->recurring(1 => sub {$dlog->flushall}); +my $tnow = time; +my $dayno = int ($tnow/86400); +@last5daysh = grab_history(SMGLog->new("day"), "h", $tnow-(86400*5), $_) for ($dayno-4, $dayno-3, $dayno-2, $dayno-1, $dayno); +@last10minsr = map {my ($t, $js) = split(/\s/, $_, 2); $js} grab_history(SMGLog->new("debug"), "r", $tnow-(60*3), $dayno); -do_reopen($devname); +our $dlog = SMGLog->new("day"); +dbg "before next tick"; +Mojo::IOLoop->next_tick(sub { loop() }); +dbg "before app start"; +app->start; +dbg "after app start"; + +write_ld(); +$dataf->close if $dataf; +undef $dataf; + + +# move all the files along one +cycle_loop_data_files(); dbg '***'; dbg "*** ending $0"; @@ -113,6 +176,20 @@ dbg '***'; exit 0; +################################################################################## + +sub loop +{ + dbg "last_min: " . scalar gmtime($ld->{last_min}); + dbg "last_hour: " . scalar gmtime($ld->{last_hour}); + + $did = Mojo::IOLoop->recurring(1 => sub {$dlog->flushall}); + + do_reopen($devname); +} + + + sub on_read { my ($ser, $d) = @_; @@ -202,7 +279,7 @@ sub do_open undef $tid; Mojo::IOLoop->remove($rid) if $rid; undef $rid; - $rid = Mojo::IOLoop->recurring(2.5 => sub { + $rid = Mojo::IOLoop->recurring($poll_interval => sub { start_loop() if !$state; }); chgstate(''); @@ -223,6 +300,7 @@ sub process } my $tmp; + my $temp; my $rain; my %h; @@ -237,18 +315,34 @@ sub process $tmp = unpack("s", substr $blk,9,2) / 10; $h{Temp_In} = nearest(0.1, f2c($tmp)); - $tmp = unpack("s", substr $blk,12,2) / 10; - $h{Temp_Out} = nearest(0.1, f2c($tmp)); + $temp = nearest(0.1, f2c(unpack("s", substr $blk,12,2) / 10)); + $h{Temp_Out} = $temp; + if ($temp > 75 || $temp < -75) { + dbg "LOOP Temperature out of range ($temp), record ignored"; + return; + } $tmp = unpack("C", substr $blk,14,1); $h{Wind} = nearest(0.1, mph2mps($tmp)); $h{Dir} = unpack("s", substr $blk,16,2)+0; my $wind = {w => $h{Wind}, d => $h{Dir}}; - push @min, $wind; + $wind = 0 if $wind == 255; + push @{$ld->{wind_min}}, $wind; - $h{Humidity_Out} = unpack("C", substr $blk,33,1)+0; - $h{Humidity_In} = unpack("C", substr $blk,11,1)+0; + $tmp = int(unpack("C", substr $blk,33,1)+0); + if ($tmp > 100) { + dbg "LOOP Outside Humidity out of range ($tmp), record ignored"; + return; + } + $h{Humidity_Out} = $tmp; + $tmp = int(unpack("C", substr $blk,11,1)+0); + if ($tmp > 100) { + dbg "LOOP Inside Humidity out of range ($tmp), record ignored"; + return; + } + $h{Humidity_In} = $tmp; + $tmp = unpack("C", substr $blk,43,1)+0; $h{UV} = $tmp unless $tmp >= 255; @@ -257,8 +351,8 @@ sub process # $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; + my $delta_rain = $h{Rain} = nearest(0.1, ($rain >= $ld->{last_rain} ? $rain - $ld->{last_rain} : $rain)) if $loop_count; + $ld->{last_rain} = $rain; # what sort of packet is it? my $sort = unpack("C", substr $blk,4,1); @@ -288,7 +382,26 @@ sub process my $ts = time; my $s; - if ($ts >= $last_hour + 3600) { + my $dayno = int($ts/86400); + if ($dayno > $ld->{last_day}) { + $ld->{Temp_Out_Max} = $ld->{Temp_Out_Min} = $temp; + $ld->{Temp_Out_Max_T} = $ld->{Temp_Out_Min_T} = clocktime($ts, 0); + $ld->{last_day} = $dayno; + write_ld(); + cycle_loop_data_files(); + } + if ($temp > $ld->{Temp_Out_Max}) { + $ld->{Temp_Out_Max} = $temp; + $ld->{Temp_Out_Max_T} = clocktime($ts, 0); + write_ld(); + } + if ($temp < $ld->{Temp_Out_Min}) { + $ld->{Temp_Out_Min} = $temp; + $ld->{Temp_Out_Min_T} = clocktime($ts, 0); + write_ld(); + } + + if ($ts >= $ld->{last_hour} + 1800) { $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; @@ -299,32 +412,47 @@ sub process $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/; + $h{Temp_Out_Max} = $ld->{Temp_Out_Max}; + $h{Temp_Out_Min} = $ld->{Temp_Out_Min}; + $h{Temp_Out_Max_T} = $ld->{Temp_Out_Max_T}; + $h{Temp_Out_Min_T} = $ld->{Temp_Out_Min_T}; + if ($loop_count) { # i.e not the first - my $a = wind_average(scalar @hour ? @hour : {w => $h{Wind}, d => $h{Dir}}); + my $a = wind_average(scalar @{$ld->{wind_hour}} ? @{$ld->{wind_hour}} : {w => $h{Wind}, d => $h{Dir}}); $h{Wind_1h} = nearest(0.1, $a->{w}); $h{Dir_1h} = nearest(0.1, $a->{d}); - $a = wind_average(@min); + $a = wind_average(@{$ld->{wind_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; + $ld->{last_rain_min} = $ld->{last_rain_hour} = $rain; + $last_hour_h = {%h}; $s = genstr($ts, 'h', \%h); + $ld->{lasthour_h} = $s; + + $ld->{last_hour} = int($ts/1800)*1800; + $ld->{last_min} = int($ts/60)*60; + @{$ld->{wind_hour}} = (); + @{$ld->{wind_min}} = (); + + if ($s) { + output_str($s, 1); + push @last5daysh, $s; + shift @last5daysh if @last5daysh > 5*24; + } + write_ld(); - $last_hour = int($ts/3600)*3600; - $last_min = int($ts/60)*60; - @hour = (); - @min = (); - } elsif ($ts >= $last_min + 60) { - my $a = wind_average(@min); + } elsif ($ts >= $ld->{last_min} + 60) { + my $a = wind_average(@{$ld->{wind_min}}); my %save; - push @hour, $a; + push @{$ld->{wind_hour}}, $a; if ($loop_count) { # i.e not the first my $rm; @@ -333,23 +461,36 @@ sub process $h{Dir_1m} = nearest(1, $a->{d}); ($h{Rain_1m}, $h{Rain_1h}, $h{Rain_24h}) = calc_rain($rain); } - $last_rain_min = $rain; + $ld->{last_rain_min} = $rain; + + $h{Temp_Out_Max} = $ld->{Temp_Out_Max}; + $h{Temp_Out_Min} = $ld->{Temp_Out_Min}; + $h{Temp_Out_Max_T} = $ld->{Temp_Out_Max_T}; + $h{Temp_Out_Min_T} = $ld->{Temp_Out_Min_T}; + $last_min_h = {%h}; $s = genstr($ts, 'm', \%h); + $ld->{lastmin_h} = $s; - $last_min = int($ts/60)*60; - @min = (); + $ld->{last_min} = int($ts/60)*60; + @{$ld->{wind_min}} = (); + + output_str($s, 1) if $s; + write_ld(); + } else { - my $o = gen_hash_diff($last_reading, \%h); + my $o = gen_hash_diff($ld->{last_h}, \%h); if ($o) { $s = genstr($ts, 'r', $o); + push @last10minsr, $s; + shift @last10minsr if @last10minsr > 240; } else { dbg "loop rec not changed" if isdbg 'chan'; } + output_str($s, 0) if $s; } - output_str($s) if $s; - $last_reading = \%h; + $ld->{last_h} = \%h; ++$loop_count; } else { dbg "CRC check failed for LOOP data!"; @@ -364,18 +505,40 @@ sub genstr 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; - + my $tm = clocktime($ts, 1); return qq|{"tm":"$tm","t":$ts,"$let":$j}|; } +sub clocktime +{ + my $ts = shift; + my $secsreq = shift; + my ($sec,$min,$hr) = (gmtime $ts)[0,1,2]; + my $s; + if ($secsreq) { + $s = sprintf "%02d:%02d:%02d", $hr, $min, $sec; + } else { + $s = sprintf "%02d:%02d", $hr, $min; + } + return $s; +} + sub output_str { my $s = shift; + my $logit = shift; + dbg $s; # say $s; - $dlog->writenow($s); + $dlog->writenow($s) if $logit; + foreach my $ws (keys $WS) { + my $tx = $WS->{$ws}; + if ($tx) { + $tx->send($s); + } else { + delete $WS->{$tx}; + } + } } sub gen_hash_diff @@ -386,7 +549,7 @@ sub gen_hash_diff my $count; while (my ($k, $v) = each %$now) { - if ($last->{$k} ne $now->{$k}) { + if (!exists $last->{$k} || $last->{$k} ne $now->{$k}) { $o{$k} = $v; ++$count; } @@ -467,7 +630,7 @@ sub wind_average my $avhdg = r2d(atan2($sindir, $cosdir)); $avhdg += 360 if $avhdg < 0; - return {w => $wind / $count, d => $avhdg}; + return {w => nearest(0.1,$wind / $count), d => nearest(0.1,$avhdg)}; } # radians to degrees @@ -488,14 +651,94 @@ 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; + $ld->{rain24} ||= []; + + my $Rain_1h = nearest(0.1, $rain >= $ld->{last_rain_hour} ? $rain - $ld->{last_rain_hour} : $rain); # this is the rate for this hour, so far + my $rm = nearest(0.1, $rain >= $ld->{last_rain_min} ? $rain - $ld->{last_rain_min} : $rain); my $Rain_1m = nearest(0.1, $rm); - push @rain24, $rm; - $rain24 += $rm; - while (@rain24 > 24*60) { - $rain24 -= shift @rain24; + push @{$ld->{rain24}}, $Rain_1m; + $ld->{rain_24} += $rm; + while (@{$ld->{rain24}} > 24*60) { + $ld->{rain_24} -= shift @{$ld->{rain24}}; } - my $Rain_24h = nearest(0.1, $rain24); + my $Rain_24h = nearest(0.1, $ld->{rain_24}); return ($Rain_1m, $Rain_1h, $Rain_24h); } + +sub read_ld +{ + unless ($dataf) { + $dataf = IO::File->new("+>> $datafn") or die "cannot open $datafn $!"; + $dataf->autoflush(1); + } + + seek $dataf, 0, 0; + my $s = <$dataf>; + chomp $s; + dbg "read loop data: $s" if isdbg 'json'; + $ld = $json->decode($s) if length $s; + + # sort out rain stats + my $c; + if ($ld->{rain24} && ($c = @{$ld->{rain24}}) < 24*60) { + my $diff = 24*60 - $c; + unshift @{$ld->{rain24}}, 0 for 0 .. $diff; + } + my $rain; + + if ($ld->{rain24}) { + $rain += $_ for @{$ld->{rain24}}; + } + + $ld->{rain_24} = nearest(0.1, $rain); + delete $ld->{hour}; + delete $ld->{min}; +} + +sub write_ld +{ + unless ($dataf) { + $dataf = IO::File->new("+>> $datafn") or die "cannot open $datafn $!"; + $dataf->autoflush(1); + } + + seek $dataf, 0, 0; + truncate $dataf, 0; + $ld->{ts} = time; + my $s = $json->encode($ld); + dbg "write loop data: $s" if isdbg 'json'; + print $dataf "$s\n"; +} + +sub cycle_loop_data_files +{ + $dataf->close if $dataf; + undef $dataf; + + rename "$datafn.oooo", "$datafn.ooooo"; + rename "$datafn.ooo", "$datafn.oooo"; + rename "$datafn.oo", "$datafn.ooo"; + rename "$datafn.o", "$datafn.oo"; + copy $datafn, "$datafn.o"; +} + +sub grab_history +{ + my $lg = shift; + my $let = shift; + my $start = shift || time - 86400; + my $dayno = shift; + my @out; + + if ($lg->open($dayno, 'r+')) { + while (my $l = $lg->read) { + next unless $l =~ /,"$let":/; + my ($t) = $l =~ /"t":(\d+)/; + if ($t && $t >= $start) { + push @out, $l; + } + } + $lg->close; + } + return @out; +}