X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=loop.pl;h=1fb8998e2361a4a1f8a3f43c7925648fb4c61586;hb=636f61639c1bfc1ad597c3f2f9f025a84b0405cd;hp=b5e939dd5a3e6cdd5fc1aaafe96cd966f7e03235;hpb=0fb8df3c81c404b27f96d416fd029b875495554a;p=dweather.git

diff --git a/loop.pl b/loop.pl
index b5e939d..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; 
 
@@ -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,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();
@@ -168,12 +171,6 @@ 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});
 	
@@ -379,10 +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();
+		}
+		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();
 		}
-		$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} + 1800) {
 			$h{Pressure_Trend}    = unpack("C", substr $blk,3,1);
@@ -397,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}});
@@ -421,6 +432,7 @@ sub process
 			@{$ld->{wind_hour}} = ();
 			@{$ld->{wind_min}} = ();
 
+			output_str($s, 1) if $s;
 			write_ld();
 			
 		} elsif ($ts >= $ld->{last_min} + 60) {
@@ -440,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);
@@ -448,6 +462,7 @@ sub process
 			$ld->{last_min} = int($ts/60)*60;
 			@{$ld->{wind_min}} = ();
 			
+			output_str($s, 1) if $s;
 			write_ld();
 
 		} else {
@@ -458,8 +473,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 {
@@ -475,18 +490,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) {
@@ -623,7 +652,10 @@ sub calc_rain
 
 sub read_ld
 {
-	return unless $dataf;
+	unless ($dataf) {
+		$dataf = IO::File->new("+>> $datafn") or die "cannot open $datafn $!";
+		$dataf->autoflush(1);
+	}
 
 	seek $dataf, 0, 0;
 	my $s = <$dataf>;
@@ -650,7 +682,10 @@ sub read_ld
 
 sub write_ld
 {
-	return unless $dataf;
+	unless ($dataf) {
+		$dataf = IO::File->new("+>> $datafn") or die "cannot open $datafn $!";
+		$dataf->autoflush(1);
+	}
 
 	seek $dataf, 0, 0;
 	truncate $dataf, 0;
@@ -662,6 +697,8 @@ sub write_ld
 
 sub cycle_loop_data_files
 {
+	$dataf->close if $dataf;
+	
 	rename "$datafn.oooo", "$datafn.ooooo";
 	rename "$datafn.ooo", "$datafn.oooo";
 	rename "$datafn.oo", "$datafn.ooo";
@@ -675,21 +712,33 @@ __DATA__
 % my $url = url_for 'weather';
 <!DOCTYPE html>
 <html>
-  <head><title>DWeather</title></head>
+  <head>
+    <title>DWeather</title>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+
+    <!-- Optional theme -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
+
+  </head>
   <body>
-	<h1>DWeather</h1>
+    <center><h1>High View Weather</h1></center>
 
     <script>
 	var ws;
 
-	function process(key,value) {
+    function process(key,value) {
 		var d = document.getElementById(key);
 		if (d !== null) {
 			d.innerHTML = value;
 		}
 	}
-
-    function traverse(o) {
+		
+	function traverse(o) {
 		console.log(o);
 		for (var i in o) {
 			process(i, o[i]);  
@@ -698,62 +747,77 @@ __DATA__
 			}
 		}
 	}
-
-
-    ws = new WebSocket('<%= $url->to_abs %>');
-    document.body.innerHTML += 'ws connecting to: <%= $url->to_abs %> type_of: ' + typeof(ws) + '<br>';
-    if (typeof(ws) === 'object') {
-		ws.onmessage = function (event) {
-			var js = JSON.parse(event.data);
-			if (js !== null && typeof(js) === 'object') {
-				traverse(js);
+		
+	window.onload = function() {
+
+		ws = new WebSocket('<%= $url->to_abs %>');
+
+		if (typeof(ws) === 'object') {
+			ws.onmessage = function (event) {
+				var js = JSON.parse(event.data);
+				if (js !== null && typeof(js) === 'object') {
+					traverse(js);
+				}
+			};
+			ws.onopen = function (event) {
+				document.getElementById("wsconnect").innerHTML = 'ws connected to: <%= $url->to_abs %>';
+				ws.send('WebSocket support works!');
+			};
+			ws.onclose = function(event) {
+				document.getElementById("wsconnect").innerHTML = 'ws disconnected, refresh to restart';
 			}
-		};
-		ws.onopen = function (event) {
-			ws.send('WebSocket support works! ♥');
-		};
-	} else {
-		document.body.innerHTML += 'Webserver only works with Websocket aware browsers';
-	}
- 
+		} else {
+			document.body.innerHTML += 'Webserver only works with Websocket aware browsers';
+		}
+	} 
     </script>
 
-<br><br>
-<table border=1 width=80%>
-<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>
+    <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 -->
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
 </body>
 </html>