X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=loop.pl;h=b0e430055b5cebe676ea338e091255938619502a;hb=ff9c8c8ded1b0ef402d75d968c07c15d6c4cbe1a;hp=2e9549120f84faee71707dd079360d97d9bd9e59;hpb=1b7ccfa8837f5ec3fb2c43741b85fa4658c7b1b9;p=dweather.git

diff --git a/loop.pl b/loop.pl
index 2e95491..b0e4300 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; 
 
@@ -107,6 +108,12 @@ 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 last 24 hour's worth of data to the graph
+  my $lg = SMGLog->new('day');
+  my $tnow = time;
+  my $dayno = int($tnow/86400);
+  send_history($c, $lg, $tnow, $_) for ($dayno-1, $dayno);  
   
   # disable timeout
   $c->inactivity_timeout(3615);
@@ -127,7 +134,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};
   });
 };
@@ -155,7 +162,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 +384,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 +413,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 +460,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 +498,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, $let eq 'r' ? 1 : 0);
 	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 +542,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 +661,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 +691,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 +705,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 +715,21 @@ sub cycle_loop_data_files
 	copy $datafn, "$datafn.o";
 }
 
-__DATA__
- 
-@@ index.html.ep
-% my $url = url_for 'weather';
-<!DOCTYPE html>
-<html>
-  <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>
-    <center><h1>High View Weather</h1></center>
-
-
-    <script>
-	var ws;
-
-    function process(key,value) {
-		var d = document.getElementById(key);
-		if (d !== null) {
-			d.innerHTML = value;
-		}
-	}
-		
-	function traverse(o) {
-		console.log(o);
-		for (var i in o) {
-			process(i, o[i]);  
-			if (o[i] !== null && typeof(o[i])=="object") {
-				traverse(o[i]);
+sub send_history
+{
+	my $c = shift;
+	my $lg = shift;
+	my $tnow = shift;
+	my $dayno = shift;
+	if ($lg->open($dayno, 'r+')) {
+		while (my $l = $lg->read) {
+			next unless $l =~ /,"h":/;
+			my ($t) = $l =~ /"t":(\d+)/;
+			if ($t && $t >= $tnow-86400) {
+				$c->send($l);
+#				dbg "sending: $l";
 			}
 		}
+		$lg->close;
 	}
-		
-	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';
-			}
-		} else {
-			document.body.innerHTML += 'Webserver only works with Websocket aware browsers';
-		}
-	} 
-    </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>
-    <!-- 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>
+}