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

diff --git a/loop.pl b/loop.pl
index b0e4300..bdc06d6 100755
--- a/loop.pl
+++ b/loop.pl
@@ -19,6 +19,7 @@ use IO::File;
 
 use constant pi => 3.14159265358979; 
 
+my $randomfn = '/dev/urandom';
 my $devname = "/dev/davis";
 my $datafn = ".loop_data";
 my $dataf;
@@ -32,7 +33,8 @@ my $nlcount;
 my $state = "ready";
 my $buf;
 my $dbg;
-my $ser;							# the serial port Mojo::IOLoop::Stream
+our $ser;							# the serial port Mojo::IOLoop::Stream
+our $ob;							# the Serial Port filehandle
 my $last_min_h;
 my $last_hour_h;
 
@@ -40,6 +42,11 @@ our $json = JSON->new->canonical(1);
 our $WS = {};					# websocket connections
 
 our $ld = {};
+our @last10minsr = ();
+our @last5daysh = ();
+our $windmins = 2;				# no of minutes of wind data for the windrose
+our $histdays = 5;				# no of days of (half)hour data to search for main graph
+our $updatepermin = 60 / 2.5;	# no of updates per minute
 
 our $loop_count;				# how many LOOPs we have done, used as start indicator
 
@@ -90,7 +97,7 @@ $bar_trend{60} = "Rising Rapidly";
 
 our $ending = 0;
 
-$SIG{TERM} = $SIG{INT} = sub {++$ending; Mojo::IOLoop->stop;};
+$SIG{TERM} = $SIG{INT} = sub {$ending = 1; Mojo::IOLoop->stop;};
 $SIG{HUP} = 'IGNORE';
 
 
@@ -109,12 +116,6 @@ websocket '/weather' => sub {
   $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);
  
@@ -153,14 +154,33 @@ dbg "*** starting $0";
 dbg '***';
 
 read_ld();
-	
+
+my $tnow = time;
+my $dayno = int ($tnow/86400);
+for (my $i = 0-$histdays; $i < 0; ++$i ) {
+	push @last5daysh, grab_history(SMGLog->new("day"), "h", $tnow-(86400*$histdays), $dayno+$i+1); 
+}
+@last10minsr = map {my ($t, $js) = split(/\s/, $_, 2); $js} grab_history(SMGLog->new("debug"), "r", $tnow-(60*$windmins), $dayno);
+dbg sprintf("last5days = %d last10mins = %d", scalar @last5daysh, scalar @last10minsr);
+
+sysopen(R, $randomfn, 0) or die "cannot open $randomfn $!\n";
+my $rs;
+sysread(R, $rs, 8) or die "not enough randomness available\n";
+close R;
+
+app->secrets([qw(Here's something that's really seakrett), $rs]);
+
 our $dlog = SMGLog->new("day");
+$did = Mojo::IOLoop->recurring(1 => sub {$dlog->flushall});
+
 dbg "before next tick";
 Mojo::IOLoop->next_tick(sub { loop() });	
 dbg "before app start";
 app->start;
 dbg "after app start";
 
+doclose();
+
 write_ld();
 $dataf->close if $dataf;
 undef $dataf;
@@ -170,7 +190,7 @@ undef $dataf;
 cycle_loop_data_files();
 
 dbg '***';
-dbg "*** ending $0";
+dbg "*** ending $0 (\$ending = $ending)";
 dbg '***';
 
 exit 0;
@@ -182,9 +202,8 @@ sub loop
 	dbg "last_min: " . scalar gmtime($ld->{last_min});
 	dbg "last_hour: " . scalar gmtime($ld->{last_hour});
 	
-	$did = Mojo::IOLoop->recurring(1 => sub {$dlog->flushall});
-	
-	do_reopen($devname);
+	$ser = doopen($devname);
+	start_loop() if $ser;
 }
 
 
@@ -228,8 +247,7 @@ sub start_loop
 	undef $tid;
 	$tid = Mojo::IOLoop->recurring(0.6 => sub {
 									   if (++$nlcount > 10) {
-										   dbg "\\n count > 10, closing connection" if isdbg 'chan';
-										   do_reopen($devname);
+										   doclose();
 										   return;
 									   }
 									   dbg "writing $nlcount \\n" if isdbg 'state'; 
@@ -244,47 +262,68 @@ sub chgstate
 	$state = $_[0];
 }
 
-sub do_reopen
-{
-	my $name = shift;
-	dbg "do reopen on '$name' ending $ending";
-	unless ($ending) {
-		$ser = do_open($name);
-		start_loop();
-		chgstate('');
-		$nlcount = 0;
-		Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
-	}
-}
+my $closing;
 
-sub do_open
+sub doopen
 {
 	my $name = shift;
 
-	$ser->close if $ser;
-	undef $ser;
-
-	my $ob = Serial->new($name, 19200) || die "$name $!\n";
+    $ob = Serial->new($name, 19200) || die "$name $!\n";
 	dbg "streaming $name fileno(" . fileno($ob) . ")" if isdbg 'chan';
 	
 	my $ser = Mojo::IOLoop::Stream->new($ob);
-	$ser->on(error=>sub {dbg "serial $_[1]"; do_reopen($name) unless $ending});
-	$ser->on(close=>sub {dbg "serial closing"; do_reopen($name) unless $ending});
-	$ser->on(timeout=>sub {dbg "serial timeout";});
+	$ser->on(error=>sub {dbg "error serial $_[1]"; doclose();});
+	$ser->on(close=>sub {dbg "event close";  doclose();});
+	$ser->on(timeout=>sub {dbg "event serial timeout"; doclose();});
 	$ser->on(read=>sub {on_read(@_)});
 	$ser->start;
 
+    $rid = Mojo::IOLoop->recurring($poll_interval => sub {
+                                       start_loop() if !$state;
+                                   });
+
+	chgstate('');
+	$nlcount = 0;
+	
+	return $ser;
+}
+
+sub doclose
+{
+	return if $closing++;
+	
+	dbg "serial port closing" if $ser || $ob;
+	if ($ser) {
+		$ser->stop;
+		$ser->close;
+		undef $ser;
+	}
+	if ($ob) {
+		$ob->close();
+		undef $ob;
+	}
 	Mojo::IOLoop->remove($tid) if $tid;
 	undef $tid;
 	Mojo::IOLoop->remove($rid) if $rid;
 	undef $rid;
-	$rid = Mojo::IOLoop->recurring($poll_interval => sub {
-									   start_loop() if !$state;
-								   });
+
+    if (Mojo::IOLoop->is_running && $ending == 0) {
+		Mojo::IOLoop->delay(
+							sub {
+								my $delay = shift;
+								Mojo::IOLoop->timer(5 => $delay->begin);
+								dbg "Waiting 5 seconds before opening serial port";
+							 },
+
+							sub {
+								dbg "Opening Serial port";
+								$ser = doopen($devname);
+								$closing = 0;
+							}
+						   )->wait;
+	}
 	chgstate('');
 	$nlcount = 0;
-	
-	return $ser;
 }
 
 my @min;
@@ -440,7 +479,11 @@ sub process
 			@{$ld->{wind_hour}} = ();
 			@{$ld->{wind_min}} = ();
 
-			output_str($s, 1) if $s;
+			if ($s) {
+				output_str($s, 1);
+				push @last5daysh, $s;
+				shift @last5daysh if @last5daysh > 5*24;
+			}
 			write_ld();
 			
 		} elsif ($ts >= $ld->{last_min} + 60) {
@@ -476,7 +519,13 @@ sub process
 		} else {
 			my $o = gen_hash_diff($ld->{last_h}, \%h);
 			if ($o) {
+				$o->{Dir} ||= $h{Dir};
+				$o->{Wind} ||= $h{Wind};
+				$o->{Dir} += 0;
+				$o->{Wind} += 0;
 				$s = genstr($ts, 'r', $o);
+				push @last10minsr, $s;
+				shift @last10minsr while @last10minsr > ($windmins * $updatepermin);
 			}
 			else {
 				dbg "loop rec not changed" if isdbg 'chan';
@@ -498,7 +547,7 @@ sub genstr
 	my $h = shift;
 	
 	my $j =  $json->encode($h);
-	my $tm = clocktime($ts, $let eq 'r' ? 1 : 0);
+	my $tm = clocktime($ts, 1);
 	return qq|{"tm":"$tm","t":$ts,"$let":$j}|;
 }
 
@@ -715,21 +764,23 @@ sub cycle_loop_data_files
 	copy $datafn, "$datafn.o";
 }
 
-sub send_history
+sub grab_history
 {
-	my $c = shift;
 	my $lg = shift;
-	my $tnow = shift;
+	my $let = shift;
+	my $start = shift || time - 86400;
 	my $dayno = shift;
+	my @out;
+	
 	if ($lg->open($dayno, 'r+')) {
 		while (my $l = $lg->read) {
-			next unless $l =~ /,"h":/;
+			next unless $l =~ /,"$let":/;
 			my ($t) = $l =~ /"t":(\d+)/;
-			if ($t && $t >= $tnow-86400) {
-				$c->send($l);
-#				dbg "sending: $l";
+			if ($t && $t >= $start) {
+				push @out, $l;
 			}
 		}
 		$lg->close;
 	}
+	return @out;
 }