From afeaba31ed180510d79db71633f90eeac16556ae Mon Sep 17 00:00:00 2001 From: Zilog80 Date: Tue, 20 Aug 2019 22:21:02 +0200 Subject: [PATCH] pos ->nmea/aprs: velocity update --- tools/pos2aprs.pl | 4 +++- tools/pos2nmea.pl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/pos2aprs.pl b/tools/pos2aprs.pl index ecedc80..33d95ce 100755 --- a/tools/pos2aprs.pl +++ b/tools/pos2aprs.pl @@ -71,7 +71,9 @@ while ($line = <$fpi>) { $date = $3*10000+$2*100+($1%100); } - if ($line =~ /vH:\ *(\d+\.\d+)\ +D:\ *(\d+\.\d+).*/) { + if ( ($line =~ /vH:\ *(\d+\.\d+)\ +D:\ *(\d+\.\d+).*/) + or ($line =~ /vH:\ *(\d+\.\d+)m\/s\ +D:\ *(\d+\.\d+).*/) ) + { $speed = $1*3.6/1.852; ## m/s -> knots $course = $2; } diff --git a/tools/pos2nmea.pl b/tools/pos2nmea.pl index 4d71cdb..2cf438f 100755 --- a/tools/pos2nmea.pl +++ b/tools/pos2nmea.pl @@ -77,7 +77,9 @@ while ($line = <$fpi>) { $date = $3*10000+$2*100+($1%100); } - if ($line =~ /vH:\ *(\d+\.\d+)\ +D:\ *(\d+\.\d+).*/) { + if ( ($line =~ /vH:\ *(\d+\.\d+)\ +D:\ *(\d+\.\d+).*/) + or ($line =~ /vH:\ *(\d+\.\d+)m\/s\ +D:\ *(\d+\.\d+).*/) ) + { $speed = $1*3.6/1.852; ## m/s -> knots $course = $2; }