diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2010-05-10 17:29:13 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2010-05-10 17:29:13 -0400 |
| commit | 521f76730e5879831bea76d9123dc0c2c7354349 (patch) | |
| tree | 2c63c4fac20de6a82fc4280d68e8ac69f3f37c59 /devtools/ais.py | |
| parent | c348dbdb04843b452664427c36e666997d0e0dcd (diff) | |
| download | gpsd-521f76730e5879831bea76d9123dc0c2c7354349.tar.gz | |
In AIS message types 6 and 8, split app_id into DAC and FID per ITU-1371.
Wire protocol and API minor versions get bumped. All changes are as
documented in AIVDM.txt, which now describes known message 6 and 8
subtypes.
Involved rebuilding a couple of AIS regression tests. All regression
tests pass.
Also includes various typo fixes for AIVDM.txt discovered by Baylink while
we were reviewing these changes.
Diffstat (limited to 'devtools/ais.py')
| -rwxr-xr-x | devtools/ais.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/devtools/ais.py b/devtools/ais.py index c1ca3704..3afc304d 100755 --- a/devtools/ais.py +++ b/devtools/ais.py @@ -316,7 +316,8 @@ type6 = ( bitfield("dest_mmsi", 30, 'unsigned', None, "Destination MMSI"), bitfield("retransmit", 1, 'unsigned', None, "Retransmit flag"), spare(1), - bitfield("application_id", 16, 'unsigned', 0, "Application ID"), + bitfield("dac", 10, 'unsigned', 0, "DAC"), + bitfield("fid", 6, 'unsigned', 0, "Functional ID"), bitfield("data", 920, 'raw', None, "Data"), ) @@ -334,8 +335,9 @@ type7 = ( type8 = ( spare(2), - bitfield("application_id", 16, 'unsigned', 0, "Application ID"), - bitfield("data", 952, 'raw', None, "Data"), + bitfield("dac", 10, 'unsigned', 0, "DAC"), + bitfield("fid", 6, 'unsigned', 0, "Functional ID"), + bitfield("data", 952, 'raw', None, "Data"), ) def type9_alt_format(n): |