Merge branch 'master' of mjesec.ffzg.hr:/git/air-quality

[air-quality] / dsm501.pl

diff --git a/dsm501.pl b/dsm501.pl
index 41578a5..0032747 100755 (executable)
--- a/dsm501.pl
+++ b/dsm501.pl
@@ -6,9 +6,10 @@ use Device::SerialPort;
 use Time::HiRes;
 use Data::Dump qw(dump);
 
-my $port = shift @ARGV || '/dev/ttyUSB2';
+my $port = shift @ARGV || '/dev/ttyUSB4';
 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 $measurement = $ENV{MEASUREMENT} || 'dsm501';
 
 my $s = new Device::SerialPort( $port ) || die $!;
 $s->baudrate(115200);
@@ -16,8 +17,8 @@ $s->databits(8);
 $s->parity('none');
 $s->stopbits(1);
 $s->handshake('none');
-$s->read_char_time(5);
-$s->read_const_time(10);
+$s->read_char_time(0); # don't wait for each char
+$s->read_const_time(200); # ms for complete read
 
 
 while (1) {
@@ -26,11 +27,11 @@ while (1) {
        my $t = int( Time::HiRes::time() * 1_000_000_000 );
        die $! if ! defined($len);
        if ( $len > 0 ) {
-               warn "# len=$len ",dump($string);
+               #warn "# len=$len ",dump($string);
                if ( $string !~ m/^#/ ) {
                        $string =~ s/[\r\n]+$//;
                        $string =~ s/\s/,/g;
-                       my $influx = "dsm501,dc=trnjanska $string $t";
+                       my $influx = "$measurement,dc=trnjanska $string $t";
                        print "$influx\n";
                        system "curl --silent -XPOST '$influx_url' --data-binary '$influx'"
                } else {