From: Dirk Koopman Date: Mon, 26 Jan 2015 15:48:58 +0000 (+0000) Subject: add time of min and max temp X-Git-Url: http://scm.dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=636f61639c1bfc1ad597c3f2f9f025a84b0405cd;p=dweather.git add time of min and max temp --- diff --git a/loop.pl b/loop.pl index 2e95491..1fb8998 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; @@ -155,7 +156,7 @@ app->start; dbg "after app start"; write_ld(); -close $dataf if $dataf; +$dataf->close if $dataf; # move all the files along one cycle_loop_data_files(); @@ -375,12 +376,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 +405,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}}); @@ -439,6 +452,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); @@ -475,12 +490,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; @@ -626,7 +653,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 +683,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 +697,7 @@ sub write_ld sub cycle_loop_data_files { - close $dataf if $dataf; + $dataf->close if $dataf; rename "$datafn.oooo", "$datafn.ooooo"; rename "$datafn.ooo", "$datafn.oooo"; @@ -701,7 +728,6 @@ __DATA__

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

+
+