X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=loop.pl;h=ef8a6734c64ef6ebf14418cf978e71964a86b885;hb=eb43e5b8fd8bf93c8bd6a3fb5090eea8299b3368;hp=ca85bbd9671ddfc59da24fc7961d7fd9ba819348;hpb=68e2c0c4815c17d353499463e5141d6c59c44b6a;p=dweather.git

diff --git a/loop.pl b/loop.pl
index ca85bbd..ef8a673 100755
--- a/loop.pl
+++ b/loop.pl
@@ -13,6 +13,7 @@ use JSON;
 use Debug;
 use SMGLog;
 use Math::Round qw(nearest);
+use File::Copy;
 
 use constant pi => 3.14159265358979; 
 
@@ -30,8 +31,11 @@ my $state = "ready";
 my $buf;
 my $dbg;
 my $ser;							# the serial port Mojo::IOLoop::Stream
+my $last_min_h;
+my $last_hour_h;
 
 our $json = JSON->new->canonical(1);
+our $WS = {};					# websocket connections
 
 our $ld = {};
 
@@ -88,42 +92,48 @@ $SIG{TERM} = $SIG{INT} = sub {++$ending; Mojo::IOLoop->stop;};
 $SIG{HUP} = 'IGNORE';
 
 
-get '/' => 'index';
-
 # WebSocket weather service
-websocket '/index' => sub {
+websocket '/weather' => sub {
   my $c = shift;
- 
+  my $msg = shift;
+  my $tx = $c->tx;
+
   # Opened
-  $c->app->log->debug('WebSocket opened.');
+  app->log->debug('WebSocket opened.');
   dbg 'WebSocket opened' if isdbg 'chan';
-   
-  # Increase inactivity timeout for connection a bit
-  $c->inactivity_timeout(300);
+  $WS->{$tx} = $tx; 
+
+  # send historical data
+  $c->send($ld->{lasthour_h}) if exists $ld->{lasthour_h};
+  $c->send($ld->{lastmin_h}) if exists $ld->{lastmin_h};
+  
+  # disable timeout
+  $c->inactivity_timeout(3615);
  
   # Incoming message
   $c->on(
 		 message => sub {
 			 my ($c, $msg) = @_;
-			 dbg "websocket: $msg" if isdbg 'chan';
+			 dbg "websocket: text $msg" if isdbg 'chan';
 		 },
 		 json => sub {
 			 my ($c, $msg) = @_;
-			 dbg "websocket: $msg" if isdbg 'chan';
+			 dbg "websocket: json $msg" if isdbg 'chan';
 		 }
   );
  
   # Closed
   $c->on(finish => sub {
     my ($c, $code, $reason) = @_;
-    $c->app->log->debug("WebSocket closed with status $code.");
-	dbg 'WebSocket closed with status $code' if isdbg 'chan';
+    app->log->debug("WebSocket closed with status $code.");
+	dbg 'webwocket closed with status $code' if isdbg 'chan';
+	delete $WS->{$tx};
   });
-
-  $c->render;
-  
 };
 
+get '/' => {template => 'index'};
+
+
 dbginit();
 if (@ARGV) {
 	dbgadd(@ARGV);
@@ -144,6 +154,14 @@ dbg "after app start";
 write_ld();
 close $dataf if $dataf;
 
+# move all the files along one 
+copy "$datafn.oooo", "$datafn.ooooo";
+copy "$datafn.ooo", "$datafn.oooo";
+copy "$datafn.oo", "$datafn.ooo";
+copy "$datafn.o", "$datafn.oo";
+copy $datafn, "$datafn.o";
+
+
 dbg '***';
 dbg "*** ending $0";
 dbg '***';
@@ -297,16 +315,32 @@ sub process
 
 		$temp  = nearest(0.1, f2c(unpack("s", substr $blk,12,2) / 10));
 		$h{Temp_Out}  = $temp;
+		if ($temp > 75 || $temp < -75) {
+			dbg "LOOP Temperature out of range ($temp), record ignored";
+			return;
+		}
 
 		$tmp = unpack("C", substr $blk,14,1);
 		$h{Wind} = nearest(0.1, mph2mps($tmp));
 		$h{Dir}     = unpack("s", substr $blk,16,2)+0;
 
 		my $wind = {w => $h{Wind}, d => $h{Dir}};
+		$wind = 0 if $wind == 255;
 		push @{$ld->{wind_min}}, $wind;
 
-		$h{Humidity_Out} = unpack("C", substr $blk,33,1)+0;
-		$h{Humidity_In}  = unpack("C", substr $blk,11,1)+0;
+		$tmp = int(unpack("C", substr $blk,33,1)+0);
+		if ($tmp > 100) {
+			dbg "LOOP Outside Humidity out of range ($tmp), record ignored";
+			return;
+		}
+		$h{Humidity_Out} = $tmp;
+		$tmp = int(unpack("C", substr $blk,11,1)+0);
+		if ($tmp > 100) {
+			dbg "LOOP Inside Humidity out of range ($tmp), record ignored";
+			return;
+		}
+		$h{Humidity_In}  = $tmp;
+		
 
 		$tmp = unpack("C", substr $blk,43,1)+0;
 		$h{UV} = $tmp unless $tmp >= 255;
@@ -354,7 +388,7 @@ sub process
 		$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} + 3600) {
+		if ($ts >= $ld->{last_hour} + 1800) {
 			$h{Pressure_Trend}    = unpack("C", substr $blk,3,1);
 			$h{Pressure_Trend_txt} = $bar_trend{$h{Pressure_Trend}};
 			$h{Batt_TX_OK}  = (unpack("C", substr $blk,86,1)+0) ^ 1;
@@ -382,9 +416,11 @@ sub process
 			}
 			$ld->{last_rain_min} = $ld->{last_rain_hour} = $rain;
 
+			$last_hour_h = {%h};
 			$s = genstr($ts, 'h', \%h);
+			$ld->{lasthour_h} = $s;
 			
-			$ld->{last_hour} = int($ts/3600)*3600;
+			$ld->{last_hour} = int($ts/1800)*1800;
 			$ld->{last_min} = int($ts/60)*60;
 			@{$ld->{wind_hour}} = ();
 			@{$ld->{wind_min}} = ();
@@ -409,7 +445,9 @@ sub process
 			$h{Temp_Out_Max} = $ld->{Temp_Out_Max};
 			$h{Temp_Out_Min} = $ld->{Temp_Out_Min};
 
+			$last_min_h = {%h};
 			$s = genstr($ts, 'm', \%h);
+			$ld->{lastmin_h} = $s;
 			
 			$ld->{last_min} = int($ts/60)*60;
 			@{$ld->{wind_min}} = ();
@@ -453,6 +491,14 @@ sub output_str
 	dbg $s;
 #	say $s;
 	$dlog->writenow($s);
+	foreach my $ws (keys $WS) {
+		my $tx = $WS->{$ws};
+		if ($tx) {
+			$tx->send($s);
+		} else {
+			delete $WS->{$tx};
+		}
+	}
 }
 
 sub gen_hash_diff
@@ -591,12 +637,16 @@ sub read_ld
 	
 	# sort out rain stats
 	my $c;
-	if (($c = @{$ld->{rain24}}) < 24*60) {
+	if ($ld->{rain24} && ($c = @{$ld->{rain24}}) < 24*60) {
 		my $diff = 24*60 - $c;
 		unshift @{$ld->{rain24}}, 0 for 0 .. $diff;  
 	}
 	my $rain;
-	$rain += $_ for @{$ld->{rain24}};
+	
+	if ($ld->{rain24}) {
+		$rain += $_ for @{$ld->{rain24}};
+	}
+	
 	$ld->{rain_24} = nearest(0.1, $rain);
 	delete $ld->{hour};
 	delete $ld->{min};
@@ -605,7 +655,7 @@ sub read_ld
 sub write_ld
 {
 	return unless $dataf;
-	
+
 	seek $dataf, 0, 0;
 	truncate $dataf, 0;
 	$ld->{ts} = time;
@@ -618,37 +668,88 @@ sub write_ld
 __DATA__
  
 @@ index.html.ep
+% my $url = url_for 'weather';
 <!DOCTYPE html>
 <html>
   <head><title>DWeather</title></head>
   <body>
+	<h1>DWeather</h1>
+
     <script>
-      var ws;
-      if ("WebSocket" in window) {
-        ws = new WebSocket('<%= url_for('index')->to_abs %>');
-		//ws = new WebSocket();
-      }
-      if(typeof(ws) !== 'undefined') {
-        ws.onmessage = function (event) {
-          document.body.innerHTML += JSON.parse(event.data).test;
-        };
-        ws.onopen = function (event) {
-          ws.send(JSON.stringify({weather: 'WebSocket support works! ♥'}));
-        };
-      }
-      else {
-        document.body.innerHTML += 'Browser does not support WebSockets.';
-      }
-
-      var ws = new WebSocket('<%= url_for('weather')->to_abs %>');
- 
-      // Incoming messages
-      ws.onmessage = function(event) {
-        document.body.innerHTML += event.data + '<br/>';
-      };
+	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]);
+			}
+		}
+	}
+
+
+    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);
+			}
+		};
+		ws.onopen = function (event) {
+			ws.send('WebSocket support works! ♥');
+		};
+	} else {
+		document.body.innerHTML += 'Webserver only works with Websocket aware browsers';
+	}
  
     </script>
-	<h1>DWeather</h1>
 
-  </body>
+<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 Hour:<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>
+</body>
 </html>