X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=loop.pl;h=a9b7f2d3245a9f62a5bdb675964ce2bc29eee074;hb=3ee0d470f845169079eb0628c5eace53f3c9b843;hp=8a33ba72ce797146e6b6c81e7c1de65c4c35687e;hpb=9a9679bb16f6676d568db58d46ac0bbe85da2a4c;p=dweather.git

diff --git a/loop.pl b/loop.pl
index 8a33ba7..a9b7f2d 100755
--- a/loop.pl
+++ b/loop.pl
@@ -6,19 +6,33 @@ use v5.10.1;
 use Serial;
 use Mojo::IOLoop;
 use Mojo::IOLoop::Stream;
-use Mojo::JSON  qw(decode_json encode_json);
+#use Mojo::JSON  qw(decode_json encode_json);
+use JSON;
 use Debug;
 use SMGLog;
 
 my $devname = "/dev/davis";
-my $rain_mult = 0.1;    			# 0.1 or 0.2 mm or 0.01 inches
+my $rain_mult = 0.2;    			# 0.1 or 0.2 mm or 0.01 inches
 my $tid;
 my $rid;
-my $count;
+our $did;
+my $nlcount;
 my $state = "ready";
 my $buf;
 my $dbg;
 my $last_reading;
+my $ser;							# the serial port Mojo::IOLoop::Stream
+our $ending = 0;
+
+our $json = JSON->new->canonical(1);
+
+our $last_min = int(time/60)*60;
+our $last_hour = 0;
+our $last_rain_hour;
+our $last_rain_min;
+our $last_rain;
+
+our $loop_count;				# how many LOOPs we have done, used as start indicator
 
 our	@crc_table = (
 				  0x0, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
@@ -65,40 +79,58 @@ $bar_trend{0} = "Steady";
 $bar_trend{20} = "Rising Slowly";
 $bar_trend{60} = "Rising Rapidly";
 
-#$SIG{TERM} = $SIG{INT} = sub {Mojo::IOLoop->stop if Mojo::IOLoop->is_running && !$DB::VERSION};
+our $ending = 0;
 
-my $dlog = SMGLog->new("day");
-$dlog->mode('a');
+$SIG{TERM} = $SIG{INT} = sub {++$ending; Mojo::IOLoop->stop;};
+$SIG{HUP} = 'IGNORE';
+
+dbginit();
+if (@ARGV) {
+	dbgadd(@ARGV);
+} 
+dbgadd('chan');
 
-my $s = do_open($devname);
-start_loop();
+dbg '***';
+dbg "*** starting $0";
+dbg '***';
 
-Mojo::IOLoop->recurring(0.1 => sub { $dlog->flushall });
+dbg scalar gmtime($last_min);
+dbg scalar gmtime($last_hour);
 
-Mojo::IOLoop->start unless Mojo::IOLoop->is_running;
+my $dlog = SMGLog->new("day");
+$did = Mojo::IOLoop->recurring(1 => sub {$dlog->flushall});
+
+do_reopen($devname);
+
+dbg '***';
+dbg "*** ending $0";
+dbg '***';
 
 exit 0;
 
 sub on_read
 {
-	my ($str, $d) = @_;
+	my ($ser, $d) = @_;
 	$buf .= $d;
 	$d =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; 
-#	say "read added '$d' buf lth=" . length $buf if $dbg;
+	dbg "read added '$d' buf lth=" . length $buf if isdbg 'raw';
 	if ($state eq 'waitnl' && $buf =~ /[\cJ\cM]+/) {
-		Mojo::IOLoop->remove($tid);
+		dbg "Got \\n" if isdbg 'state';
+		Mojo::IOLoop->remove($tid) if $tid;
+		undef $tid;
 		undef $buf;
-		$s->write("LPS 1 1\n");
+		$nlcount = 0;
+		$ser->write("LPS 1 1\n");
 		chgstate("waitloop");
 	} elsif ($state eq "waitloop") {
 		if ($buf =~ /\x06/) {
+			dbg "Got ACK 0x06" if isdbg 'state';
 			chgstate('waitlooprec');
 			undef $buf;
 		}
 	} elsif ($state eq 'waitlooprec') {
 		if (length $buf >= 99) {
-			say "got loop record\n" if $dbg;
-			
+			dbg "got loop record" if isdbg 'chan';
 			chgstate('');
 			process($buf);
 			undef $buf;
@@ -108,147 +140,224 @@ sub on_read
 
 sub start_loop
 {
-	say "writing \\n" if $dbg;
-	
-	$s->write("\n");
-	$tid = Mojo::IOLoop->recurring(0.6 => sub {say "writing \\n" if $dbg; $s->write("\n")});
-	
+	$nlcount = 1;
+	dbg "start_loop writing $nlcount \\n" if isdbg 'state';
+	$ser->write("\n");
+	Mojo::IOLoop->remove($tid) if $tid;
+	undef $tid;
+	$tid = Mojo::IOLoop->recurring(0.6 => sub {
+									   if (++$nlcount > 10) {
+										   dbg "\\n count > 10, closing connection" if isdbg 'chan';
+										   do_reopen($devname);
+										   return;
+									   }
+									   dbg "writing $nlcount \\n" if isdbg 'state'; 
+									   $ser->write("\n");
+								   });
 	chgstate("waitnl");
 }
 
 sub chgstate
 {
-	say "state '$state' -> '$_[0]'" if $dbg;
-	
+	dbg "state '$state' -> '$_[0]'" if isdbg 'state';
 	$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;
+	}
+}
+
 sub do_open
 {
 	my $name = shift;
+
+	$ser->close if $ser;
+	undef $ser;
+
 	my $ob = Serial->new($name, 19200) || die "$name $!\n";
-	say "streaming $name fileno(", fileno($ob), ")" if $dbg;
+	dbg "streaming $name fileno(" . fileno($ob) . ")" if isdbg 'chan';
 	
-	my $str = Mojo::IOLoop::Stream->new($ob);
-	$str->on(error=>sub {say "serial $_[1]"; undef $s; Mojo::IOLoop->reset;});
-	
-	$str->on(close=>sub {say "serial closing"; undef $s;  Mojo::IOLoop->reset;});
-	$str->on(timeout=>sub {say "serial timeout";});
-	$str->on(read=>sub {on_read(@_)});
-	$str->start;
-
+	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(read=>sub {on_read(@_)});
+	$ser->start;
+
+	Mojo::IOLoop->remove($tid) if $tid;
+	undef $tid;
+	Mojo::IOLoop->remove($rid) if $rid;
+	undef $rid;
 	$rid = Mojo::IOLoop->recurring(2.5 => sub {
-									   start_loop() if !$state || $state eq "waitnl";
+									   start_loop() if !$state;
 								   });
-
-	return $str;
+	chgstate('');
+	$nlcount = 0;
+	
+	return $ser;
 }
 
-my $last_time;
+my @min;
+my @hour;
 
 sub process
 {
 	my $blk = shift;
 	my $loo =  substr $blk,0,3;
 	unless ( $loo eq 'LOO') {
-		say "Block invalid loo -> $loo" if $dbg; return;
+		dbg "Block invalid loo -> $loo" if isdbg 'chan'; return;
 	}
 
-	my $t;
+	my $tmp;
+	my $rain;
 	my %h;
 
 	# Common ones
-	$h{Pressure_Trend}    = unpack("C", substr $blk,3,1);
-	$h{Pressure_Trend_txt} = $bar_trend{$h{'Pressure_Trend'}};
-	$t = unpack("s", substr $blk,7,2) / 1000;
-	$h{Pressure} = sprintf("%.0f",in2mb($t))+0;
+	$tmp = unpack("s", substr $blk,7,2) / 1000;
+	$h{Pressure} = sprintf("%.0f",in2mb($tmp))+0;
 
-	$t = unpack("s", substr $blk,9,2) / 10;
-	$h{Temp_In} = sprintf("%.1f", f2c($t))+0;
+	$tmp = unpack("s", substr $blk,9,2) / 10;
+	$h{Temp_In} = sprintf("%.1f", f2c($tmp))+0;
 	
-	$t  = unpack("s", substr $blk,12,2) / 10;
-	$h{Temp_Out}  = sprintf("%.1f", f2c($t))+0;
+	$tmp  = unpack("s", substr $blk,12,2) / 10;
+	$h{Temp_Out}  = sprintf("%.1f", f2c($tmp))+0;
 
-	$t = unpack("C", substr $blk,14,1);
-	$h{Wind} = sprintf("%.1f",mph2mps($t))+0;
+	$tmp = unpack("C", substr $blk,14,1);
+	$h{Wind} = sprintf("%.1f",mph2mps($tmp))+0;
 	$h{Dir}     = unpack("s", substr $blk,16,2)+0;
 
+	my $wind = {w => $h{Wind}, d => $h{Dir}};
+	push @min, $wind;
 
-	$h{'Humidity_Out'} = unpack("C", substr $blk,33,1)+0;
-	$h{'Humidity_In'}  = unpack("C", substr $blk,11,1)+0;
+	$h{Humidity_Out} = unpack("C", substr $blk,33,1)+0;
+	$h{Humidity_In}  = unpack("C", substr $blk,11,1)+0;
 
-	$t = unpack("C", substr $blk,43,1)+0;
-	$h{'UV'} = $t unless $t >= 255;
-	$t = unpack("s", substr $blk,44,2)+0;	# watt/m**2
-	$h{'Solar'} = $t unless $t >= 32767;
+	$tmp = unpack("C", substr $blk,43,1)+0;
+	$h{UV} = $tmp unless $tmp >= 255;
+	$tmp = unpack("s", substr $blk,44,2)+0;	# watt/m**2
+	$h{Solar} = $tmp unless $tmp >= 32767;
 
-	$h{'Rain_Rate'}  = sprintf("%0.1f",unpack("s", substr $blk,41,2) * $rain_mult)+0;
-	$h{'Rain_Day'}   = sprintf("%0.1f", unpack("s", substr $blk,50,2) * $rain_mult)+0;
+#	$h{Rain_Rate}  = sprintf("%0.1f",unpack("s", substr $blk,41,2) * $rain_mult)+0;
+	$rain = $h{Rain_Day}   = sprintf("%0.1f", unpack("s", substr $blk,50,2) * $rain_mult)+0;
+	$h{Rain} = ($rain >= $last_rain ? $rain - $last_rain : $rain) if $loop_count;
+	$last_rain = $rain;
 
 	# what sort of packet is it?
 
-	$t =  unpack("C", substr $blk,4,1);
-	if ($t) {
+	my $sort =  unpack("C", substr $blk,4,1);
+	if ($sort) {
 
 		# Newer LOOP2 packet
-		$t = unpack("C", substr $blk,18,2);
-		$h{Wind_Avg_10} = sprintf("%.1f",mph2mps($t/10))+0;
-		$t = unpack("C", substr $blk,20,2);
-		$h{Wind_Avg_2} = sprintf("%.1f",mph2mps($t/10))+0;
-		$t = unpack("C", substr $blk,22,2);
-		$h{Wind_Gust_10} = sprintf("%.1f",mph2mps($t/10))+0;
-	   
-		$h{Dir_Avg_10} = unpack("C", substr $blk,24,2)+0;
-		$t = unpack("C", substr $blk,30,2);
-		$h{Dew_Point} = sprintf("%0.1f", f2c($t))+0;
+		$tmp = unpack("C", substr $blk,18,2);
+#		$h{Wind_Avg_10} = sprintf("%.1f",mph2mps($tmp/10))+0;
+		$tmp = unpack("C", substr $blk,20,2);
+#		$h{Wind_Avg_2} = sprintf("%.1f",mph2mps($tmp/10))+0;
+		$tmp = unpack("C", substr $blk,22,2);
+#		$h{Wind_Gust_10} = sprintf("%.1f",mph2mps($tmp/10))+0;
+
+#		$h{Dir_Avg_10} = unpack("C", substr $blk,24,2)+0;
+		$tmp = unpack("C", substr $blk,30,2);
+		$h{Dew_Point} = sprintf("%0.1f", f2c($tmp))+0;
 
 	} else {
-		
+
 		# Older LOOP packet
-		$t = unpack("C", substr $blk,15,1);
-		$h{Wind_Avg_10} = sprintf("%.1f",mph2mps($t))+0;
-		$h{'Dew_Point'}  = sprintf("%0.1f", dew_point($h{Temp_Out}, $h{'Humidity_Out'}))+0;
-
-		$h{'Rain_Month'}  = sprintf("%0.1f", unpack("s", substr $blk,52,2) * $rain_mult)+0;
-		$h{'Rain_Year'}  = sprintf("%0.1f", unpack("s", substr $blk,54,2) * $rain_mult)+0;
-
-
-		$h{'Batt_TX_OK'}  = (unpack("C", substr $blk,86,1)+0) ^ 1;
-		$h{'Batt_Console'}  = sprintf("%0.2f", unpack("s", substr $blk,87,2) * 0.005859375)+0;
-		$h{'Forecast_Icon'}  = unpack("C", substr $blk,89,1);
-		$h{'Forecast_Rule'}  = unpack("C", substr $blk,90,1);
-		
-		$h{'Sunrise'}  = sprintf( "%04d", unpack("S", substr $blk,91,2) );
-		$h{'Sunrise'}  =~ s/(\d{2})(\d{2})/$1:$2/;
-		$h{'Sunset'}   = sprintf( "%04d", unpack("S", substr $blk,93,2) );
-		$h{'Sunset'}  =~ s/(\d{2})(\d{2})/$1:$2/;
+		$tmp = unpack("C", substr $blk,15,1);
+#		$h{Wind_Avg_10} = sprintf("%.1f",mph2mps($tmp))+0;
+		$h{Dew_Point}  = sprintf("%0.1f", dew_point($h{Temp_Out}, $h{Humidity_Out}))+0;
+		$h{Rain_Month}  = sprintf("%0.1f", unpack("s", substr $blk,52,2) * $rain_mult)+0;
+		$h{Rain_Year}  = sprintf("%0.1f", unpack("s", substr $blk,54,2) * $rain_mult)+0;
+
 	}
 
-	my $crc = unpack "%n", substr($blk,97,2);
 	my $crc_calc = CRC_CCITT($blk);
 
 	if ($crc_calc==0) {
-		my $o = gen_hash_diff($last_reading, \%h);
-		$last_reading = \%h;
-		my $t = time;
+		my $ts = time;
 		my $j;
 		my $s;
-		if ($t >= $last_time + 60) {
-			$j = encode_json(\%h);
-			$s = qq|{"t":$t,"m":$j}|;
-			$last_time = $t;
-		} elsif ($o) {
-			$j = encode_json($o);
-			$s = qq|{"t":$t,"r":$j}|;
-		}
-		if ($s) {
-			say $s;
-			$dlog->writenow($s);
+		if ($ts >= $last_hour + 3600) {
+			$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;
+			$h{Batt_Console}  = sprintf("%0.2f", unpack("s", substr $blk,87,2) * 0.005859375)+0;
+			$h{Forecast_Icon}  = unpack("C", substr $blk,89,1);
+			$h{Forecast_Rule}  = unpack("C", substr $blk,90,1);
+			$h{Sunrise}  = sprintf( "%04d", unpack("S", substr $blk,91,2) );
+			$h{Sunrise}  =~ s/(\d{2})(\d{2})/$1:$2/;
+			$h{Sunset}   = sprintf( "%04d", unpack("S", substr $blk,93,2) );
+			$h{Sunset}  =~ s/(\d{2})(\d{2})/$1:$2/;
+
+			if ($loop_count) {	# i.e not the first
+				my $a = average(scalar @hour ? @hour : {w => $h{Wind}, d => $h{Dir}});
+
+				$h{Wind_1h} = sprintf("%0.1f", $a->{w})+0;
+				$h{Dir_1h} = sprintf("%0.0f", $a->{d})+0;
+				$h{Rain_1h} = $rain >= $last_rain_hour ? $rain - $last_rain_hour : $rain;
+
+				$h{Wind_1m} = sprintf("%0.1f", $a->{w})+0;
+				$h{Dir_1m} = sprintf("%0.0f", $a->{d})+0;
+				$h{Rain_1m} = $rain >= $last_rain_min ? $rain - $last_rain_min : $rain;
+			}
+			$last_rain_min = $last_rain_hour = $rain;
+
+			$j = $json->encode(\%h);
+			$s = qq|{"t":$ts,"h":$j}|;
+			$last_hour = int($ts/3600)*3600;
+			$last_min = int($ts/60)*60;
+			@hour = ();
+			@min = ();
+		} elsif ($ts >= $last_min + 60) {
+			my $a = average(@min);
+			my %save;
+
+			push @hour, $a;
+
+			if ($loop_count) {	# i.e not the first
+				$h{Wind_1m} = sprintf("%0.1f", $a->{w})+0;
+				$h{Dir_1m} = sprintf("%0.0f", $a->{d})+0;
+				$h{Rain_1h} = $rain >= $last_rain_hour ? $rain - $last_rain_hour : $rain; # this is the rate for this hour, so far
+				$h{Rain_1m} = $rain >= $last_rain_min ? $rain - $last_rain_min : $rain;
+			}
+			$last_rain_min = $rain;
+
+			$j = $json->encode(\%h);
+			$s = qq|{"t":$ts,"m":$j}|;
+			$last_min = int($ts/60)*60;
+			@min = ();
+		} else {
+			my $o = gen_hash_diff($last_reading, \%h);
+			if ($o) {
+				$j = $json->encode($o);
+				$s = qq|{"t":$ts,"r":$j}|;
+			} else {
+				dbg "loop rec not changed" if isdbg 'chan';
+			}
 		}
+		output_str($s) if $s;
+		$last_reading = \%h;
+		++$loop_count;
 	} else {
-		say "CRC check failed for LOOP data!";
-		return 1;
+		dbg "CRC check failed for LOOP data!";
 	}
+	return;
+}
+
+sub output_str
+{
+	my $s = shift;
+	dbg $s;
+#	say $s;
+	$dlog->writenow($s);
 }
 
 sub gen_hash_diff
@@ -325,3 +434,21 @@ sub in2mb
 {
 	return $_[0] * 33.8637526;
 }
+
+sub average
+{
+	my %out;
+	my $count;
+	
+	foreach my $r (@_) {
+		while (my ($k, $v) = each %$r) {
+			$out{$k} += $v;
+		}
+		++$count;
+	}
+	while (my ($k, $v) = each %out) {
+		$out{$k} /= $count;
+	}
+
+	return \%out;
+}