summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2010-03-08 21:10:15 +0000
committerEric S. Raymond <esr@thyrsus.com>2010-03-08 21:10:15 +0000
commitb3fa9fcfb62f8694cae959c5c9f79957f3de2381 (patch)
treef9e48387906ea4ac6f8f740325e87ca8d414fcc9
parent1b20c0cdd58f4dadea3b81e8d30bc58986d3c975 (diff)
downloadgpsd-b3fa9fcfb62f8694cae959c5c9f79957f3de2381.tar.gz
Move some declarations from jsongen.py to jsongen.py.in, where they need to be.
-rw-r--r--contrib/README8
-rw-r--r--jsongen.py.in29
2 files changed, 33 insertions, 4 deletions
diff --git a/contrib/README b/contrib/README
index 1465e734..79c71c81 100644
--- a/contrib/README
+++ b/contrib/README
@@ -8,10 +8,10 @@ conveniences, examples or rudimetary starting points for other development
efforts.
binlog and binreplay are probably only useful for people developing
-new protocols, when gpsfake does not yet know what to do with a log
-file. These utilities are not particularly clever - they merely slurp
-a tty's output into a file, or spray the contents of a file out of a
-tty.
+drivers for new protocols, when gpsfake does not yet know what to do
+with a log file. These utilities are not particularly clever - they
+merely slurp a tty's output into a file, or spray the contents of a
+file out of a tty.
skyview.php is used to generate pictures of your skyview, and may be
used to help determine if a given antenna placement is appropriate for
diff --git a/jsongen.py.in b/jsongen.py.in
index a993cc3a..2bd2610f 100644
--- a/jsongen.py.in
+++ b/jsongen.py.in
@@ -360,6 +360,35 @@ ais_specs = (
('dim.to_starboard', 'uinteger', '0'), # Part B
),
},
+ {
+ "initname" : "json_ais25",
+ "header": "\tAIS_HEADER,",
+ "structname": "ais->type25",
+ "fieldmap":(
+ # fieldname type default
+ ('addressed', 'boolean', 'false'),
+ ('structured', 'boolean', 'false'),
+ ('dest_mmsi', 'uinteger', '0'),
+ ('app_id', 'uinteger', '0'),
+ ('data', 'string', None),
+ ),
+ "stringbuffered":("data",),
+ },
+ {
+ "initname" : "json_ais26",
+ "header": "\tAIS_HEADER,",
+ "structname": "ais->type26",
+ "fieldmap":(
+ # fieldname type default
+ ('addressed', 'boolean', 'false'),
+ ('structured', 'boolean', 'false'),
+ ('dest_mmsi', 'uinteger', '0'),
+ ('app_id', 'uinteger', '0'),
+ ('data', 'string', None),
+ ('radio', 'uinteger', '0'),
+ ),
+ "stringbuffered":("data",),
+ },
)