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

diff --git a/zph02.pl b/zph02.pl
index aeaaffb..00d8c2d 100755
--- a/zph02.pl
+++ b/zph02.pl
@@ -6,10 +6,8 @@ use Device::SerialPort;
 use Time::HiRes;
 use Data::Dump qw(dump);
 
-my $port = shift @ARGV || '/dev/ttyUSB1';
-$port = '/dev/serial/by-path/pci-0000:00:1a.7-usb-0:5.4:1.0-port0';
-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);
@@ -23,6 +21,11 @@ $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);
@@ -42,8 +45,9 @@ while (1) {
 		my $pcnt = $v[3] + ( $v[4] / 100 );
 		if ( $v[0] == 0xff && $sum == $checksum ) {
 			my $influx = "zph02,dc=trnjanska pm25_pcnt=$pcnt $t";
-			print "$influx\n";
-			system "curl --silent -XPOST '$influx_url' --data-binary '$influx'"
+			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";
 		}
 	}