diff options
| -rw-r--r-- | driver_ais.c | 2 | ||||
| -rw-r--r-- | test/daemon/ais-nmea-sample.log.chk | 1 | ||||
| -rw-r--r-- | test/sample.aivdm | 4 | ||||
| -rw-r--r-- | test/sample.aivdm.chk | 1 | ||||
| -rw-r--r-- | test/sample.aivdm.js.chk | 1 | ||||
| -rw-r--r-- | test/sample.aivdm.ju.chk | 1 |
6 files changed, 9 insertions, 1 deletions
diff --git a/driver_ais.c b/driver_ais.c index cbeb3700..80c0c888 100644 --- a/driver_ais.c +++ b/driver_ais.c @@ -809,7 +809,7 @@ bool ais_binary_decode(const struct gpsd_errout_t *errout, } break; case 16: /* Assigned Mode Command */ - RANGE_CHECK(96, 144); + RANGE_CHECK(96, 168); ais->type16.mmsi1 = UBITS(40, 30); ais->type16.offset1 = UBITS(70, 12); ais->type16.increment1 = UBITS(82, 10); diff --git a/test/daemon/ais-nmea-sample.log.chk b/test/daemon/ais-nmea-sample.log.chk index 2b168f83..20b05e23 100644 --- a/test/daemon/ais-nmea-sample.log.chk +++ b/test/daemon/ais-nmea-sample.log.chk @@ -2334,6 +2334,7 @@ !AIVDM,1,1,,A,13`vAs@P00PW@MLN`6w6O?vR25Ip,0*65
{"class":"AIS","type":1,"repeat":0,"mmsi":244290029,"scaled":false,"status":0,"status_text":"Under way using engine","turn":-128,"speed":0,"accuracy":true,"lon":5145518,"lat":32114428,"course":1660,"heading":511,"second":17,"maneuver":0,"raim":true,"radio":22136}
!AIVDM,1,1,,B,@6STUk004lQ206bCKNOBAb6SJ@5s,0*74
+{"class":"AIS","type":16,"repeat":0,"mmsi":439952844,"scaled":false,"mmsi1":315920,"offset1":2049,"increment1":681,"mmsi2":230137673,"offset2":424,"increment2":419}
!AIVDM,1,1,,A,1>qc9ww000OkfS@MMI5004RR0D0B,0*2D
{"class":"AIS","type":1,"repeat":0,"mmsi":999999999,"scaled":false,"status":15,"status_text":"Not defined","turn":0,"speed":0,"accuracy":false,"lon":-1608600,"lat":30890260,"course":0,"heading":145,"second":17,"maneuver":0,"raim":false,"radio":81938}
!AIVDM,1,1,,B,133m?CPP00PDGe8MDMP;w?vT20S;,0*24
diff --git a/test/sample.aivdm b/test/sample.aivdm index 947b8cbc..d0cca57a 100644 --- a/test/sample.aivdm +++ b/test/sample.aivdm @@ -1079,3 +1079,7 @@ AIVDM,2,2,1,B,00000000000,2*26 # has data length of 368 !AIVDM,2,1,8,B,E03l90w4Q1h3h1:WdPOwwwwwwwwlQdn`:e55020@@@gP0000000000000000,0*47\x0d\x0a !AIVDM,2,2,8,B,00,4*19\x0d\x0a +# +# type 16 168 bits long +# +!AIVDM,1,1,,B,@6STUk004lQ206bCKNOBAb6SJ@5s,0*74 diff --git a/test/sample.aivdm.chk b/test/sample.aivdm.chk index 684d496a..7801eb5d 100644 --- a/test/sample.aivdm.chk +++ b/test/sample.aivdm.chk @@ -89,3 +89,4 @@ 8|0|002391100|1|16|240:0000e56a780022b4440a903c3bbf00000130ac568022bab80ad35f803f00
8|0|002711009|1|16|720:00025e8d136025bd890d5520b2ff0ac000000070202580430d4bbf003f000001027cc3302597b60d4b15003f000000c5c4a9802584cf0d3f45803f000000f47ba58025cdf40d4391003f0000010272bb00258e5f0d44f7c9ff0a
21|0|004000003|30|IBC G BUOY|1|75943336|22448680|2|2|2|2|1|31|0|0x0|0|0
+16|0|439952844|315920|2049|681|230137673|424|419
diff --git a/test/sample.aivdm.js.chk b/test/sample.aivdm.js.chk index ce8b7b1e..a5005353 100644 --- a/test/sample.aivdm.js.chk +++ b/test/sample.aivdm.js.chk @@ -89,3 +89,4 @@ {"class":"AIS","device":"stdin","type":8,"repeat":0,"mmsi":2391100,"scaled":true,"dac":1,"fid":16,"data":"240:0000e56a780022b4440a903c3bbf00000130ac568022bab80ad35f803f00"}
{"class":"AIS","device":"stdin","type":8,"repeat":0,"mmsi":2711009,"scaled":true,"dac":1,"fid":16,"data":"720:00025e8d136025bd890d5520b2ff0ac000000070202580430d4bbf003f000001027cc3302597b60d4b15003f000000c5c4a9802584cf0d3f45803f000000f47ba58025cdf40d4391003f0000010272bb00258e5f0d44f7c9ff0a"}
{"class":"AIS","device":"stdin","type":21,"repeat":0,"mmsi":4000003,"scaled":true,"aid_type":30,"aid_type_text":"Special Mark","name":"IBC G BUOY","lon":126.5722,"lat":37.4145,"accuracy":true,"to_bow":2,"to_stern":2,"to_port":2,"to_starboard":2,"epfd":1,"epfd_text":"GPS","second":31,"regional":0,"off_position":false,"raim":false,"virtual_aid":false}
+{"class":"AIS","device":"stdin","type":16,"repeat":0,"mmsi":439952844,"scaled":true,"mmsi1":315920,"offset1":2049,"increment1":681,"mmsi2":230137673,"offset2":424,"increment2":419}
diff --git a/test/sample.aivdm.ju.chk b/test/sample.aivdm.ju.chk index d8057c35..42eb3540 100644 --- a/test/sample.aivdm.ju.chk +++ b/test/sample.aivdm.ju.chk @@ -89,3 +89,4 @@ {"class":"AIS","device":"stdin","type":8,"repeat":0,"mmsi":2391100,"scaled":false,"dac":1,"fid":16,"data":"240:0000e56a780022b4440a903c3bbf00000130ac568022bab80ad35f803f00"}
{"class":"AIS","device":"stdin","type":8,"repeat":0,"mmsi":2711009,"scaled":false,"dac":1,"fid":16,"data":"720:00025e8d136025bd890d5520b2ff0ac000000070202580430d4bbf003f000001027cc3302597b60d4b15003f000000c5c4a9802584cf0d3f45803f000000f47ba58025cdf40d4391003f0000010272bb00258e5f0d44f7c9ff0a"}
{"class":"AIS","device":"stdin","type":21,"repeat":0,"mmsi":4000003,"scaled":false,"aid_type":30,"aid_type_text":"Special Mark","name":"IBC G BUOY","accuracy":true,"lon":75943336,"lat":22448680,"to_bow":2,"to_stern":2,"to_port":2,"to_starboard":2,"epfd":1,"epfd_text":"GPS","second":31,"regional":0,"off_position":false,"raim":false,"virtual_aid":false}
+{"class":"AIS","device":"stdin","type":16,"repeat":0,"mmsi":439952844,"scaled":false,"mmsi1":315920,"offset1":2049,"increment1":681,"mmsi2":230137673,"offset2":424,"increment2":419}
|