driver_nmea0183: Be more paranoid in merge_ddmmyy()

Check for properly formatted ddmmyy string.

2 files changed, 6 insertions, 2 deletions

diff --git a/test/daemon/april6_2019.log b/test/daemon/april6_2019.log
index 6e33f3d1..c2abd321 100644
--- a/test/daemon/april6_2019.log
+++ b/test/daemon/april6_2019.log
@@ -3,7 +3,11 @@
 # Submitter: Gary E. Miller <gem@rellim.com>
 # Date: 2019-3-14
 # Location: 48 29.0005 N, 000 22.0016 E
-# Note: Bad year at moment of 2nd GPS epoch roll over
+# Note: Bad year at moment of 1st GPS epoch roll over on:
+#       "1999-08-22T00:02:31.420Z"
+#       99 becomes -1
+#       1999 shown as 2099
+#       GPRMC hhmmss goes backwards!
 #       From the Telit App note:
 # https://rutronik-tec.com/wp-content/uploads/2019/02/Telit_Cellular_WeekRollover_Application_Note_r0.pdf
 #
diff --git a/test/daemon/april6_2019.log.chk b/test/daemon/april6_2019.log.chk
index a0f5cadc..f529e996 100644
--- a/test/daemon/april6_2019.log.chk
+++ b/test/daemon/april6_2019.log.chk
@@ -2,4 +2,4 @@ $GPRMC,,V,,,,,,,,,,N*53
 $GPRMC,000231.42,A,4829.0005,N,00022.0016,E,0.16,212.28,220899,,,A*59
 {"class":"TPV","mode":2,"time":"2099-08-22T00:02:31.420Z","ept":0.005,"lat":48.483341667,"lon":0.366693333,"track":212.2800,"speed":0.082}

 $GPRMC,000231.099,A,4829.0005,N,00022.0015,E,0.15,212.28,2208-1,,,A*73
-{"class":"TPV","mode":2,"time":"1971-08-22T00:02:31.099Z","ept":0.005,"lat":48.483341667,"lon":0.366691667,"track":212.2800,"speed":0.077}

+{"class":"TPV","mode":2,"time":"2099-08-22T00:02:31.420Z","ept":0.005,"lat":48.483341667,"lon":0.366691667,"track":212.2800,"speed":0.077}