X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=loop.pl;h=ca85bbd9671ddfc59da24fc7961d7fd9ba819348;hb=68e2c0c4815c17d353499463e5141d6c59c44b6a;hp=5fe9594044f815ace92f4770be21da6d97e2776c;hpb=86125caccc4bf630c8db18d9377c42b1ec5da428;p=dweather.git diff --git a/loop.pl b/loop.pl index 5fe9594..ca85bbd 100755 --- a/loop.pl +++ b/loop.pl @@ -3,15 +3,24 @@ 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 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; @@ -20,17 +29,11 @@ my $nlcount; my $state = "ready"; my $buf; my $dbg; -my $last_reading; my $ser; # 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 $ld = {}; our $loop_count; # how many LOOPs we have done, used as start indicator @@ -84,6 +87,43 @@ our $ending = 0; $SIG{TERM} = $SIG{INT} = sub {++$ending; Mojo::IOLoop->stop;}; $SIG{HUP} = 'IGNORE'; + +get '/' => 'index'; + +# WebSocket weather service +websocket '/index' => sub { + my $c = shift; + + # Opened + $c->app->log->debug('WebSocket opened.'); + dbg 'WebSocket opened' if isdbg 'chan'; + + # Increase inactivity timeout for connection a bit + $c->inactivity_timeout(300); + + # Incoming message + $c->on( + message => sub { + my ($c, $msg) = @_; + dbg "websocket: $msg" if isdbg 'chan'; + }, + json => sub { + my ($c, $msg) = @_; + dbg "websocket: $msg" if isdbg 'chan'; + } + ); + + # Closed + $c->on(finish => sub { + my ($c, $code, $reason) = @_; + $c->app->log->debug("WebSocket closed with status $code."); + dbg 'WebSocket closed with status $code' if isdbg 'chan'; + }); + + $c->render; + +}; + dbginit(); if (@ARGV) { dbgadd(@ARGV); @@ -94,13 +134,15 @@ dbg '***'; dbg "*** starting $0"; dbg '***'; -dbg scalar gmtime($last_min); -dbg scalar gmtime($last_hour); - -my $dlog = SMGLog->new("day"); -$did = Mojo::IOLoop->recurring(1 => sub {$dlog->flushall}); +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"; -do_reopen($devname); +write_ld(); +close $dataf if $dataf; dbg '***'; dbg "*** ending $0"; @@ -108,6 +150,26 @@ dbg '***'; exit 0; +################################################################################## + +sub loop +{ + + open $dataf, "+>>", $datafn or die "cannot open $datafn $!"; + $dataf->autoflush(1); + + read_ld(); + + 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) = @_; @@ -197,7 +259,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(''); @@ -218,135 +280,153 @@ sub process } my $tmp; + my $temp; 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; + $temp = nearest(0.1, f2c(unpack("s", substr $blk,12,2) / 10)); + $h{Temp_Out} = $temp; - $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 @{$ld->{wind_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 >= $ld->{last_rain} ? $rain - $ld->{last_rain} : $rain)) if $loop_count; + $ld->{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) { + my $dayno = int($ts/86400); + if ($dayno > $ld->{last_day}) { + $ld->{Temp_Out_Max} = $ld->{Temp_Out_Min} = $temp; + $ld->{last_day} = $dayno; + } + $ld->{Temp_Out_Max} = $temp if $temp > $ld->{Temp_Out_Max}; + $ld->{Temp_Out_Min} = $temp if $temp < $ld->{Temp_Out_Min}; + + if ($ts >= $ld->{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) ); $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}; 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 @{$ld->{wind_hour}} ? @{$ld->{wind_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; - } - $last_rain_min = $last_rain_hour = $rain; - - $j = $json->encode(\%h); + $a = wind_average(@{$ld->{wind_min}}); + $h{Wind_1m} = nearest(0.1, $a->{w}); + $h{Dir_1m} = nearest(1, $a->{d}); - $s = 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); + ($h{Rain_1m}, $h{Rain_1h}, $h{Rain_24h}) = calc_rain($rain); + } + $ld->{last_rain_min} = $ld->{last_rain_hour} = $rain; + + $s = genstr($ts, 'h', \%h); + + $ld->{last_hour} = int($ts/3600)*3600; + $ld->{last_min} = int($ts/60)*60; + @{$ld->{wind_hour}} = (); + @{$ld->{wind_min}} = (); + + write_ld(); + + } 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 - $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; + $ld->{last_rain_min} = $rain; + + $h{Temp_Out_Max} = $ld->{Temp_Out_Max}; + $h{Temp_Out_Min} = $ld->{Temp_Out_Min}; - $j = $json->encode(\%h); + $s = genstr($ts, 'm', \%h); + + $ld->{last_min} = int($ts/60)*60; + @{$ld->{wind_min}} = (); + + write_ld(); - $s = qq|{"t":$ts,"m":$j}|; - $last_min = int($ts/60)*60; - @min = (); } else { - my $o = gen_hash_diff($last_reading, \%h); + my $o = gen_hash_diff($ld->{last_h}, \%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'; } } output_str($s) if $s; - $last_reading = \%h; + $ld->{last_h} = \%h; ++$loop_count; } else { dbg "CRC check failed for LOOP data!"; @@ -354,6 +434,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 +530,125 @@ 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; + + my $avhdg = r2d(atan2($sindir, $cosdir)); + $avhdg += 360 if $avhdg < 0; + return {w => nearest(0.1,$wind / $count), d => nearest(0.1,$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; + + $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 @{$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, $ld->{rain_24}); + return ($Rain_1m, $Rain_1h, $Rain_24h); +} - return \%out; +sub read_ld +{ + return unless $dataf; + + 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 (($c = @{$ld->{rain24}}) < 24*60) { + my $diff = 24*60 - $c; + unshift @{$ld->{rain24}}, 0 for 0 .. $diff; + } + my $rain; + $rain += $_ for @{$ld->{rain24}}; + $ld->{rain_24} = nearest(0.1, $rain); + delete $ld->{hour}; + delete $ld->{min}; } + +sub write_ld +{ + return unless $dataf; + + 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"; +} + + +__DATA__ + +@@ index.html.ep + + + DWeather + + +

DWeather

+ + +