X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=serial.pl;h=06197a0e1ee4945f73d302d2e8ce394eb7b089a8;hb=5e8218dc133a5fd6687e98b7a09e22f65bbc314b;hp=a45c9ac5da3f569b595a6fd84e9d103e39b62ccb;hpb=54e54f1f7fa271f1d194a752271aa06333cbc418;p=vaillant-thermostat

diff --git a/serial.pl b/serial.pl
index a45c9ac..06197a0 100755
--- a/serial.pl
+++ b/serial.pl
@@ -32,7 +32,7 @@ sub _mqtt_pub {
 	my ( $t, $m ) = @_;
 	my $cmd = "mosquitto_pub -h rpi2 -t '$t' -m '$m'";
 	#warn "# _mqtt_pub [$t] = [$m]\n";
-	warn "## $cmd";
+	#warn "## $cmd";
 	system $cmd;
 }
 
@@ -45,8 +45,9 @@ while (1) {
 		my $hex = unpack('H*',$string);
 		$hex =~ s/(..)/$1 /g;
 
-		my $temp = `curl localhost:3000/temp.txt`;
+		my $temp = `curl -q localhost:3000/temp.txt`;
 		$temp =~ s/\s+/ /gs;
+		$temp =~ s/^\s+//;
 
 		#printf "%s %2d  %s\n", time(), $len, $hex;
 		printf "%8.4f %6.2f %2d  %s | %s\n", $ts, $ts - $t, $len, $hex, $temp;
@@ -67,6 +68,12 @@ while (1) {
 			_mqtt_pub "stat/boiler/" . chr(ord('a') + $_) => $d[$_] foreach 0 .. $#d;
 		}
 
+		my @v = split(/\s+/, $temp, 3);
+		my @n = qw( DS18B20/temperature DHT22/temperature DHT22/humidity );
+		foreach (@v) {
+			_mqtt_pub "stat/boiler/" . shift(@n) => $_;
+		}
+
 	}
 }