From ac257bab48e1dc29a3a837286fb4fcfd71e02aaf Mon Sep 17 00:00:00 2001
From: Jon Schlueter <jschlueter@redhat.com>
Date: Wed, 7 Oct 2015 20:47:31 -0400
Subject: better handling of type 6 unhandled FID entries

When there are unknown FID values in type 6 messages for DAC values that
have some known FIDs (DAC 200, 235 and 250), the data is not read (and
thus printed as all zeros). I have added some example AIVDM messages
which exhibit this problem, some that did not have the problem in the
existing version and a patch for the problem.

Added sample

!AIVDM,1,1,,A,601uEPprEH2@<P<j00,4*32
-{"class":"AIS","device":"stdin","type":6,"repeat":0,"mmsi":2053507,"scaled":true,"seqno":2,"dest_mmsi":244670500,"retransmit":false,"dac":200,"fid":3,"data":"16:0000"}
+{"class":"AIS","device":"stdin","type":6,"repeat":0,"mmsi":2053507,"scaled":true,"seqno":2,"dest_mmsi":244670500,"retransmit":false,"dac":200,"fid":3,"data":"16:3200"}

adjusted loop logic to allow it to continue to process other types

Identified by: 	Stefan Roels <sroels-gpsd-dev@42solutions.nl>
---
 test/sample.aivdm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'test/sample.aivdm')

diff --git a/test/sample.aivdm b/test/sample.aivdm
index 61e000fd..2f16aa72 100644
--- a/test/sample.aivdm
+++ b/test/sample.aivdm
@@ -1056,3 +1056,6 @@ AIVDM,2,2,1,B,00000000000,2*26
 !AIVDM,2,1,7,B,802`m000BkGTp0b<j59?000000000000000O,0*14
 !AIVDM,2,2,7,B,p0000000000<0000000@000,2*1C
 #{"class":"AIS","device":"stdin","type":8,"repeat":0,"mmsi":2766080,"scaled":true,"dac":1,"fid":11,"lat":58.867,"lon":23.047,"timestamp":"20T18:30Z","wspeed":0,"wgust":0,"wdir":0,"wgustdir":0,"humidity":0,"airtemp":-60.0,"dewpoint":-20.0,"pressure":800,"pressuretend":"steady","visibility":0.0,"waterlevel":-10.0,"leveltrend":"steady","cspeed":25.5,"cdir":0,"cspeed2":0.0,"cdir2":0,"cdepth2":0,"cspeed3":0.0,"cdir3":0,"cdepth3":0,"waveheight":0.0,"waveperiod":3,"wavedir":0,"swellheight":0.0,"swellperiod":0,"swelldir":0,"seastate":0,"watertemp":429496729.6,"preciptype":0,"preciptype_text":"reserved","salinity":0.0,"ice":0,"ice_text":"no"}
+# type 6 with unhandled type
+!AIVDM,1,1,,A,601uEPprEH2@<P<j00,4*32
+#{"class":"AIS","device":"stdin","type":6,"repeat":0,"mmsi":2053507,"scaled":true,"seqno":2,"dest_mmsi":244670500,"retransmit":false,"dac":200,"fid":3,"data":"16:3200"}
-- 
cgit v1.2.1