X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=loop.pl;h=bb28f1843e7372b2164aa90c7427ab2ae32b3b2f;hb=feceb0bda28cea09e43b9497e38510ef404d5c4a;hp=4046ca9b95b42dd95f00a8313a4fc588b433563b;hpb=104d1371435741ced5e3fe8f78f352865505133c;p=dweather.git diff --git a/loop.pl b/loop.pl index 4046ca9..bb28f18 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; @@ -145,6 +146,8 @@ dbg '***'; dbg "*** starting $0"; dbg '***'; +read_ld(); + our $dlog = SMGLog->new("day"); dbg "before next tick"; Mojo::IOLoop->next_tick(sub { loop() }); @@ -153,7 +156,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(); @@ -168,8 +173,6 @@ exit 0; sub loop { - read_ld(); - dbg "last_min: " . scalar gmtime($ld->{last_min}); dbg "last_hour: " . scalar gmtime($ld->{last_hour}); @@ -375,12 +378,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 +407,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,6 +434,7 @@ sub process @{$ld->{wind_hour}} = (); @{$ld->{wind_min}} = (); + output_str($s, 1) if $s; write_ld(); } elsif ($ts >= $ld->{last_min} + 60) { @@ -438,6 +454,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); @@ -446,6 +464,7 @@ sub process $ld->{last_min} = int($ts/60)*60; @{$ld->{wind_min}} = (); + output_str($s, 1) if $s; write_ld(); } else { @@ -456,8 +475,8 @@ sub process else { dbg "loop rec not changed" if isdbg 'chan'; } + output_str($s, 0) if $s; } - output_str($s) if $s; $ld->{last_h} = \%h; ++$loop_count; } else { @@ -473,18 +492,32 @@ 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) { @@ -503,7 +536,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; } @@ -622,7 +655,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); } @@ -652,7 +685,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); } @@ -666,7 +699,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"; @@ -681,21 +715,33 @@ __DATA__ % my $url = url_for 'weather'; - DWeather + + DWeather + + + + + + + + + + + -

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: -
+
+
+

+ + + + + + + +
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: +
+
+
+
+
+ + + +