diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2011-05-26 05:15:39 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-05-26 05:15:39 -0400 |
| commit | 7ae3db2f62d5c5d84248041291defea5dd3da456 (patch) | |
| tree | 73eaca436639dfaffbe720ba1b32b5b80e908bce | |
| parent | 34e8c4a4534b57bb1a4bf81ac8a9a5c7a845d08a (diff) | |
| download | gpsd-7ae3db2f62d5c5d84248041291defea5dd3da456.tar.gz | |
Minor fixes to AIS tables and generation machinery.
| -rwxr-xr-x | devtools/tablegen.py | 2 | ||||
| -rw-r--r-- | www/AIVDM.txt | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/devtools/tablegen.py b/devtools/tablegen.py index 8a7db624..5d8badf1 100755 --- a/devtools/tablegen.py +++ b/devtools/tablegen.py @@ -112,7 +112,7 @@ def make_structure(wfp): continue if ftype == 'x' or not record: continue - if ftype == 'u' or ftype == 'e' or or ftype[0] == 'U': + if ftype == 'u' or ftype == 'e' or ftype[0] == 'U': decl = "unsigned int %s;\t/* %s */" % (name, description) elif ftype == 'i' or ftype[0] == 'I': decl = "signed int %s;\t/* %s */" % (name, description) diff --git a/www/AIVDM.txt b/www/AIVDM.txt index 9d69325a..543df12d 100644 --- a/www/AIVDM.txt +++ b/www/AIVDM.txt @@ -2023,7 +2023,7 @@ bits. This message is laid out identically in <<IMO236>> and 1 = id is the IMO number, 2 = id is the call sign, 3 = Other (default). -|58-99 | 42 |Target identifier |See below |u|Target ID data. +|58-99 | 42 |Target identifier |id |u|Target ID data. |100-103 | 4 |Spare | |x|Not used |104-127 | 24 |Latitude |lat |I3|Minutes * 0.001, 91000 = N/A (default), @@ -2037,10 +2037,10 @@ bits. This message is laid out identically in <<IMO236>> and |168-177 | 10 |Speed Over Ground |speed |u|0-254 in knots, 255 = N/A. |============================================================================== -The interpretation of the target identifier field depends on the ppreceding type -key. For type 2 and 3 it is 6-bit ASCII text, for 0 and 1 it is a big-endian -binary integer. An unkbnown target is expressed by type 3 and the string -"@@@@@@@". +The interpretation of the target identifier field depends on the +ppreceding type key. For 0 and 1 it is a big-endian unsigned binary +integer (as shown above). For type 2 and 3 it is 6-bit ASCII text. An +unknown target is expressed by type 3 and the string "@@@@@@@". <<IMO289>> says: "When MMSI or IMO number is used, the least significant bit should equal bit zero of the Target Identifier." It is |