diff options
| -rw-r--r-- | driver_ais.c | 10 | ||||
| -rw-r--r-- | test/sample.aivdm.chk | 2 | ||||
| -rw-r--r-- | test/sample.aivdm.js.chk | 2 | ||||
| -rw-r--r-- | test/sample.aivdm.ju.chk | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/driver_ais.c b/driver_ais.c index b1d1bc27..6b5dbba6 100644 --- a/driver_ais.c +++ b/driver_ais.c @@ -879,11 +879,11 @@ bool ais_binary_decode(const int debug, ais->type19.to_stern = UBITS(280, 9); ais->type19.to_port = UBITS(289, 6); ais->type19.to_starboard = UBITS(295, 6); - ais->type19.epfd = UBITS(299, 4); - ais->type19.raim = UBITS(302, 1)!=0; - ais->type19.dte = UBITS(305, 1)!=0; - ais->type19.assigned = UBITS(306, 1)!=0; - //ais->type19.spare = UBITS(307, 5); + ais->type19.epfd = UBITS(301, 4); + ais->type19.raim = UBITS(305, 1)!=0; + ais->type19.dte = UBITS(306, 1)!=0; + ais->type19.assigned = UBITS(307, 1)!=0; + //ais->type19.spare = UBITS(308, 4); break; case 20: /* Data Link Management Message */ if (bitlen < 72 || bitlen > 160) { diff --git a/test/sample.aivdm.chk b/test/sample.aivdm.chk index 426ab7d2..51923be1 100644 --- a/test/sample.aivdm.chk +++ b/test/sample.aivdm.chk @@ -41,7 +41,7 @@ 18|0|338087471|0|1|0|-44443279|24410724|796|511|49|0x0|1|0|1|1|1|1|0xe0006
18|0|338088483|0|0|0|-42486718|25869335|1716|511|20|0x0|1|0|1|1|1|1|0xe0006
18|0|368161000|0|51|1|-43340309|23688555|349|511|17|0x0|1|0|1|1|0|1|0xe0006
-19|0|367059850|248|87|0|-53286235|17726217|3359|511|46|0x4|CAPT.J.RIMES|70|5|21|4|4|0|0|0|0
+19|0|367059850|248|87|0|-53286235|17726217|3359|511|46|0x4|CAPT.J.RIMES|70|5|21|4|4|1|0|0|0
20|3|003669705|2182|5|7|225|0|0|0|0|0|0|0|0|0|0|0|0
20|0|003160097|47|1|7|250|2250|1|7|1125|856|5|7|1125|0|0|0|0
21|0|123456789|20|CHINA ROSE MURPHY EXPRESS ALERT|0|-73619155|28752371|5|5|5|5|1|50|165|0x0|0|0
diff --git a/test/sample.aivdm.js.chk b/test/sample.aivdm.js.chk index 46820cd3..02325ae5 100644 --- a/test/sample.aivdm.js.chk +++ b/test/sample.aivdm.js.chk @@ -41,7 +41,7 @@ {"class":"AIS","device":"stdin","type":18,"repeat":0,"mmsi":338087471,"scaled":true,"reserved":0,"speed":0.1,"accuracy":false,"lon":-74.0721,"lat":40.6845,"course":79.6,"heading":511,"second":49,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
{"class":"AIS","device":"stdin","type":18,"repeat":0,"mmsi":338088483,"scaled":true,"reserved":0,"speed":0.0,"accuracy":false,"lon":-70.8112,"lat":43.1156,"course":171.6,"heading":511,"second":20,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
{"class":"AIS","device":"stdin","type":18,"repeat":0,"mmsi":368161000,"scaled":true,"reserved":0,"speed":5.1,"accuracy":true,"lon":-72.2338,"lat":39.4809,"course":34.9,"heading":511,"second":17,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":false,"raim":true,"radio":917510}
-{"class":"AIS","device":"stdin","type":19,"repeat":0,"mmsi":367059850,"scaled":true,"reserved":248,"speed":8.7,"accuracy":false,"lon":-88.8104,"lat":29.5437,"course":335.9,"heading":511,"second":46,"regional":4,"shipname":"CAPT.J.RIMES","shiptype":70,"shiptype_text":"Cargo - all ships of this type","to_bow":5,"to_stern":21,"to_port":4,"to_starboard":4,"epfd":0,"epfd_text":"Undefined","raim":false,"dte":0,"assigned":false}
+{"class":"AIS","device":"stdin","type":19,"repeat":0,"mmsi":367059850,"scaled":true,"reserved":248,"speed":8.7,"accuracy":false,"lon":-88.8104,"lat":29.5437,"course":335.9,"heading":511,"second":46,"regional":4,"shipname":"CAPT.J.RIMES","shiptype":70,"shiptype_text":"Cargo - all ships of this type","to_bow":5,"to_stern":21,"to_port":4,"to_starboard":4,"epfd":1,"epfd_text":"GPS","raim":false,"dte":0,"assigned":false}
{"class":"AIS","device":"stdin","type":20,"repeat":3,"mmsi":3669705,"scaled":true,"offset1":2182,"number1":5,"timeout1":7,"increment1":225,"offset2":0,"number2":0,"timeout2":0,"increment2":0,"offset3":0,"number3":0,"timeout3":0,"increment3":0,"offset4":0,"number4":0,"timeout4":0,"increment4":0}
{"class":"AIS","device":"stdin","type":20,"repeat":0,"mmsi":3160097,"scaled":true,"offset1":47,"number1":1,"timeout1":7,"increment1":250,"offset2":2250,"number2":1,"timeout2":7,"increment2":1125,"offset3":856,"number3":5,"timeout3":7,"increment3":1125,"offset4":0,"number4":0,"timeout4":0,"increment4":0}
{"class":"AIS","device":"stdin","type":21,"repeat":0,"mmsi":123456789,"scaled":true,"aid_type":20,"aid_type_text":"INVALID NAVAID TYPE","name":"CHINA ROSE MURPHY EXPRESS ALERT","lon":-122.6986,"lat":47.9206,"accuracy":false,"to_bow":5,"to_stern":5,"to_port":5,"to_starboard":5,"epfd"1,"epfd_text":"GPS","second":50,"regional":165,"off_position":false,"raim":false,"virtual_aid":false}
diff --git a/test/sample.aivdm.ju.chk b/test/sample.aivdm.ju.chk index dbc14214..8086a40b 100644 --- a/test/sample.aivdm.ju.chk +++ b/test/sample.aivdm.ju.chk @@ -41,7 +41,7 @@ {"class":"AIS","device":"stdin","type":18,"repeat":0,"mmsi":338087471,"scaled":false,"reserved":0,"speed":1,"accuracy":false,"lon":-44443279,"lat":24410724,"course":796,"heading":511,"second":49,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
{"class":"AIS","device":"stdin","type":18,"repeat":0,"mmsi":338088483,"scaled":false,"reserved":0,"speed":0,"accuracy":false,"lon":-42486718,"lat":25869335,"course":1716,"heading":511,"second":20,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":true,"raim":true,"radio":917510}
{"class":"AIS","device":"stdin","type":18,"repeat":0,"mmsi":368161000,"scaled":false,"reserved":0,"speed":51,"accuracy":true,"lon":-43340309,"lat":23688555,"course":349,"heading":511,"second":17,"regional":0,"cs":true,"display":false,"dsc":true,"band":true,"msg22":false,"raim":true,"radio":917510}
-{"class":"AIS","device":"stdin","type":19,"repeat":0,"mmsi":367059850,"scaled":false,"reserved":248,"speed":87,"accuracy":false,"lon":-53286235,"lat":17726217,"course":3359,"heading":511,"second":46,"regional":4,"shipname":"CAPT.J.RIMES","shiptype":70,"shiptype_text":"Cargo - all ships of this type","to_bow":5,"to_stern":21,"to_port":4,"to_starboard":4,"epfd":0,"epfd_text":"Undefined","raim":false,"dte":0,"assigned":false}
+{"class":"AIS","device":"stdin","type":19,"repeat":0,"mmsi":367059850,"scaled":false,"reserved":248,"speed":87,"accuracy":false,"lon":-53286235,"lat":17726217,"course":3359,"heading":511,"second":46,"regional":4,"shipname":"CAPT.J.RIMES","shiptype":70,"shiptype_text":"Cargo - all ships of this type","to_bow":5,"to_stern":21,"to_port":4,"to_starboard":4,"epfd":1,"epfd_text":"GPS","raim":false,"dte":0,"assigned":false}
{"class":"AIS","device":"stdin","type":20,"repeat":3,"mmsi":3669705,"scaled":false,"offset1":2182,"number1":5,"timeout1":7,"increment1":225,"offset2":0,"number2":0,"timeout2":0,"increment2":0,"offset3":0,"number3":0,"timeout3":0,"increment3":0,"offset4":0,"number4":0,"timeout4":0,"increment4":0}
{"class":"AIS","device":"stdin","type":20,"repeat":0,"mmsi":3160097,"scaled":false,"offset1":47,"number1":1,"timeout1":7,"increment1":250,"offset2":2250,"number2":1,"timeout2":7,"increment2":1125,"offset3":856,"number3":5,"timeout3":7,"increment3":1125,"offset4":0,"number4":0,"timeout4":0,"increment4":0}
{"class":"AIS","device":"stdin","type":21,"repeat":0,"mmsi":123456789,"scaled":false,"aid_type":20,"aid_type_text":"INVALID NAVAID TYPE","name":"CHINA ROSE MURPHY EXPRESS ALERT","accuracy":false,"lon":-73619155,"lat":28752371,"to_bow":5,"to_stern":5,"to_port":5,"to_starboard":5,"epfd":1,"epfd_text":"GPS","second":50,"regional":165,"off_position":false,"raim":false,"virtual_aid":false}
|