X-Git-Url: http://git.rot13.org/?p=air-quality;a=blobdiff_plain;f=zph02.pl;h=00d8c2d5a95830f0036125a298e74486b9099c91;hp=42336609b724bc830e428b33c8d60234d6403d33;hb=59b28a41e509a3d933d3dac493ad78e60561e1d9;hpb=a18f9c9581e10c5c0f5b27bb6a8f9da2079093d6

diff --git a/zph02.pl b/zph02.pl
index 4233660..00d8c2d 100755
--- a/zph02.pl
+++ b/zph02.pl
@@ -3,11 +3,11 @@ use warnings;
 use strict;
 # sudo apt install libdevice-serialport-perl libdata-dump-perl
 use Device::SerialPort;
+use Time::HiRes;
 use Data::Dump qw(dump);
 
-my $port = shift @ARGV || '/dev/ttyUSB0';
-my $influx_url = shift @ARGV || 'http://10.13.37.229:8186/write?db=telegraf';
-$influx_url = 'http://10.13.37.92:8086/write?db=rot13';
+my $port = shift @ARGV || '/dev/serial/by-path/platform-3f980000.usb-usb-0:1.5:1.0';
+my $influx_url = shift @ARGV || 'http://10.60.0.92:8086/write?consistency=any&db=rot13';
 
 my $s = new Device::SerialPort( $port ) || die $!;
 $s->baudrate(9600);
@@ -21,7 +21,14 @@ $s->read_const_time(10);
 
 while (1) {
 
+	alarm 3;
+	# Usb serial which I'm using is buggy and blocks from time to time.
+	# This will ensure that we have passed here every 3 seconds
+	# or we will be killed and systemd will restart us
+
 	my ($len, $string) = $s->read(9);
+	my $t = int( Time::HiRes::time() * 1_000_000_000 );
+	die $! if ! defined($len);
 	if ( $len > 0 ) {
 		my @v = unpack('C*', $string);
 		#warn "# $len ",dump($string), dump( @v ), $/;
@@ -37,9 +44,10 @@ while (1) {
 		my $checksum = $v[8];
 		my $pcnt = $v[3] + ( $v[4] / 100 );
 		if ( $v[0] == 0xff && $sum == $checksum ) {
-			my $influx = "zph02,dc=trnjanska pm25_pcnt=$pcnt";
-			print "$influx\n";
-			system "curl --silent -XPOST '$influx_url' --data-binary '$influx'"
+			my $influx = "zph02,dc=trnjanska pm25_pcnt=$pcnt $t";
+			print "$influx\n" if -e '/dev/shm/air-debug';
+			system "curl --max-time 2 --silent -XPOST '$influx_url' --data-binary '$influx'";
+			system "mosquitto_pub -h rpi2 -t 'air/zph02/pm25' -m $pcnt";
 		}
 	}