add time of min and max temp

diff --git a/loop.pl b/loop.pl
index 2e9549120f84faee71707dd079360d97d9bd9e59..1fb8998e2361a4a1f8a3f43c7925648fb4c61586 100755 (executable)
--- 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__
   <body>
     <center><h1>High View Weather</h1></center>
 
-
     <script>
        var ws;
 
@@ -735,7 +761,7 @@ __DATA__
                        };
                        ws.onopen = function (event) {
                                document.getElementById("wsconnect").innerHTML = 'ws connected to: <%= $url->to_abs %>';
-                               ws.send('WebSocket support works! ♥');
+                               ws.send('WebSocket support works!');
                        };
                        ws.onclose = function(event) {
                                document.getElementById("wsconnect").innerHTML = 'ws disconnected, refresh to restart';
@@ -746,49 +772,49 @@ __DATA__
        } 
     </script>
 
-<div id="container">
-<div id="start-template">
-<br><br>
-<table border=1 width=80% align="center">
-<tr>
-<th>Time:<td><span id="tm"> </span>
-<th>Sunrise:<td><span id="Sunrise"> </span>
-<th>Sunset:<td><span id="Sunset"> </span>
-<th>Console Volts:<td><span id="Batt_Console"> </span>
-<th>TX Battery OK:<td><span id="Batt_TX_OK"> </span>
-
-<tr>
-<th>Pressure:<td><span id="Pressure"> </span>
-<th>Trend:<td><span id="Pressure_Trend_txt"> </span>
-
-<tr>
-<th>Temperature in:<td> <span id="Temp_In"> </span> 
-<th>Humidity:<td> <span id="Humidity_In"> </span>
-
-<tr>
-<th>Temperature out:<td> <span id="Temp_Out"> </span> 
-<th>Min:<td> <span id="Temp_Out_Min"> </span> 
-<th>Max:<td> <span id="Temp_Out_Max"> </span> 
-<th>Humidity:<td> <span id="Humidity_Out"> </span> 
-<th>Dew Point:<td> <span id="Dew_Point"> </span> 
-
-<tr>
-<th>Wind Direction:<td> <span id="Dir"> </span> 
-<th>Minute Avg:<td> <span id="Dir_1m">  </span> 
-<th>Speed:<td> <span id="Wind"> </span> 
-<th>Minute Avg:<td> <span id="Wind_1m">  </span>
-
-<tr>
-<th>Rain 30mins:<td> <span id="Rain_1h"> </span>
-<th>Day:<td> <span id="Rain_Day"> </span>
-<th>24hrs:<td> <span id="Rain_24h"> </span>
-<th>Month:<td> <span id="Rain_Month"> </span>
-<th>Year:<td> <span id="Rain_Year"> </span>
-</table>
-<br>
-<div id="wsconnect" align="center"> </div>
-</div>
-</div>
+    <div id="container">
+       <div id="start-template">
+       <br><br>
+       <table border=1 width=80% align="center">
+       <tr>
+    <th>Time:<td><span id="tm"> </span>
+       <th>Sunrise:<td><span id="Sunrise"> </span>
+       <th>Sunset:<td><span id="Sunset"> </span>
+       <th>Console Volts:<td><span id="Batt_Console"> </span>
+       <th>TX Battery OK:<td><span id="Batt_TX_OK"> </span>
+
+       <tr>
+    <th>Pressure:<td><span id="Pressure"> </span>
+       <th>Trend:<td><span id="Pressure_Trend_txt"> </span>
+
+       <tr>
+    <th>Temperature in:<td> <span id="Temp_In"> </span> 
+       <th>Humidity:<td> <span id="Humidity_In"> </span>
+
+       <tr>
+    <th>Temperature out:<td> <span id="Temp_Out"> </span> 
+       <th>Min:<td> <span id="Temp_Out_Min"> </span> @ <span id="Temp_Out_Min_T"> </span>
+       <th>Max:<td> <span id="Temp_Out_Max"> </span> @ <span id="Temp_Out_Max_T"> </span>
+       <th>Humidity:<td> <span id="Humidity_Out"> </span> 
+       <th>Dew Point:<td> <span id="Dew_Point"> </span> 
+
+       <tr>
+    <th>Wind Direction:<td> <span id="Dir"> </span> 
+       <th>Minute Avg:<td> <span id="Dir_1m">  </span> 
+       <th>Speed:<td> <span id="Wind"> </span> 
+       <th>Minute Avg:<td> <span id="Wind_1m">  </span>
+
+       <tr>
+    <th>Rain 30mins:<td> <span id="Rain_1h"> </span>
+       <th>Day:<td> <span id="Rain_Day"> </span>
+       <th>24hrs:<td> <span id="Rain_24h"> </span>
+       <th>Month:<td> <span id="Rain_Month"> </span>
+       <th>Year:<td> <span id="Rain_Year"> </span>
+       </table>
+       <br>
+       <div id="wsconnect" align="center"> </div>
+       </div>
+       </div>
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
     <!-- Latest compiled and minified JavaScript -->