X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=loop.pl;h=2768a009e92bbf74401deccf70db33d688b05da0;hb=ccdf496819d857203d6a8aace11f1ba7daa7e1ef;hp=2e9549120f84faee71707dd079360d97d9bd9e59;hpb=1b7ccfa8837f5ec3fb2c43741b85fa4658c7b1b9;p=dweather.git diff --git a/loop.pl b/loop.pl index 2e95491..2768a00 100755 --- a/loop.pl +++ b/loop.pl @@ -15,6 +15,7 @@ use SMGLog; use Math::Round qw(nearest); use File::Copy; use Data::Random qw(rand_chars); +use IO::File; use constant pi => 3.14159265358979; @@ -39,6 +40,8 @@ our $json = JSON->new->canonical(1); our $WS = {}; # websocket connections our $ld = {}; +our @last10minsr = (); +our @last5daysh = (); our $loop_count; # how many LOOPs we have done, used as start indicator @@ -107,6 +110,11 @@ websocket '/weather' => sub { # send historical data $c->send($ld->{lasthour_h}) if exists $ld->{lasthour_h}; $c->send($ld->{lastmin_h}) if exists $ld->{lastmin_h}; + + # send the 5 days worth of data to the graph + say "last10min = " . scalar @last10minsr . " last5day = " . scalar @last5daysh; + $c->send($_) for @last10minsr; + $c->send($_) for @last5daysh; # disable timeout $c->inactivity_timeout(3615); @@ -127,7 +135,7 @@ websocket '/weather' => sub { $c->on(finish => sub { my ($c, $code, $reason) = @_; app->log->debug("WebSocket closed with status $code."); - dbg 'webwocket closed with status $code' if isdbg 'chan'; + dbg "websocket closed with status $code" if isdbg 'chan'; delete $WS->{$tx}; }); }; @@ -146,7 +154,12 @@ dbg "*** starting $0"; dbg '***'; read_ld(); - + +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); + our $dlog = SMGLog->new("day"); dbg "before next tick"; Mojo::IOLoop->next_tick(sub { loop() }); @@ -155,7 +168,9 @@ app->start; dbg "after app start"; write_ld(); -close $dataf if $dataf; +$dataf->close if $dataf; +undef $dataf; + # move all the files along one cycle_loop_data_files(); @@ -375,12 +390,21 @@ sub process 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(); } - $ld->{Temp_Out_Max} = $temp if $temp > $ld->{Temp_Out_Max}; - $ld->{Temp_Out_Min} = $temp if $temp < $ld->{Temp_Out_Min}; + 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); @@ -395,6 +419,9 @@ sub process $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 @{$ld->{wind_hour}} ? @{$ld->{wind_hour}} : {w => $h{Wind}, d => $h{Dir}}); @@ -419,7 +446,11 @@ sub process @{$ld->{wind_hour}} = (); @{$ld->{wind_min}} = (); - output_str($s, 1) if $s; + if ($s) { + output_str($s, 1); + push @last5daysh, $s; + shift @last5daysh if @last5daysh > 5*24; + } write_ld(); } elsif ($ts >= $ld->{last_min} + 60) { @@ -439,6 +470,8 @@ sub process $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); @@ -454,6 +487,8 @@ sub process 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'; @@ -475,12 +510,24 @@ 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; @@ -507,7 +554,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; } @@ -626,7 +673,7 @@ sub calc_rain sub read_ld { unless ($dataf) { - open $dataf, "+>>", $datafn or die "cannot open $datafn $!"; + $dataf = IO::File->new("+>> $datafn") or die "cannot open $datafn $!"; $dataf->autoflush(1); } @@ -656,7 +703,7 @@ sub read_ld sub write_ld { unless ($dataf) { - open $dataf, "+>>", $datafn or die "cannot open $datafn $!"; + $dataf = IO::File->new("+>> $datafn") or die "cannot open $datafn $!"; $dataf->autoflush(1); } @@ -670,7 +717,8 @@ sub write_ld sub cycle_loop_data_files { - close $dataf if $dataf; + $dataf->close if $dataf; + undef $dataf; rename "$datafn.oooo", "$datafn.ooooo"; rename "$datafn.ooo", "$datafn.oooo"; @@ -679,119 +727,23 @@ sub cycle_loop_data_files copy $datafn, "$datafn.o"; } -__DATA__ - -@@ index.html.ep -% my $url = url_for 'weather'; - - - - DWeather - - - - - - - - - - - - -

High View Weather

- - - - -
-
-

- - - - - - - -
Time: -Sunrise: -Sunset: -Console Volts: -TX Battery OK: - -
Pressure: -Trend: - -
Temperature in: -Humidity: - -
Temperature out: -Min: -Max: -Humidity: -Dew Point: - -
Wind Direction: -Minute Avg: -Speed: -Minute Avg: - -
Rain 30mins: -Day: -24hrs: -Month: -Year: -
-
-
-
-
- - - - - - + return @out; +}