diff options
| author | Andre Naujoks <nautsch2@googlemail.com> | 2011-02-13 05:52:59 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-02-13 05:52:59 -0500 |
| commit | 2ad085cf59eeb49e833cc0512a5fad80b06d3f19 (patch) | |
| tree | b8a49320c2952e30b9dd920751e4113014be4bd8 /net_ntrip.c | |
| parent | a4950ec0cce35824485c3ba9afcf2677526ff653 (diff) | |
| download | gpsd-2ad085cf59eeb49e833cc0512a5fad80b06d3f19.tar.gz | |
Bug fixes and improvements for the NTRIP code.
The first thing I had to do to make RTCM work at all, was to remove
the separate poll for the socket (the change in gpsd.c). The same
stuff is done in consume_packet, so there is no loss here. In fact the
duplicated read caused constant lock losses on the RTCM stream because
of missing data, which was already read by the now removed read.
Add RTCM2 passthrough to the UBX driver: versions of the firmware since 7.0
can handle this.
The change in net_ntrip.c adds another string to the valid strings for
rtcm2 to be recognized. See:
http://www.sapos-ni-ntrip.de:2101/sourcetable.htm for the sourcetable
of the server. The mountpoint I am using is EPS_NI. The problem is
the RTCM1_ data format. The people from sapos confirmed, that this is
a RTCM2 stream and so far it works.
All regression tests pass.
Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
Diffstat (limited to 'net_ntrip.c')
| -rw-r--r-- | net_ntrip.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net_ntrip.c b/net_ntrip.c index 636b5f06..ae5f40fd 100644 --- a/net_ntrip.c +++ b/net_ntrip.c @@ -115,6 +115,9 @@ static void ntrip_str_parse(char *str, size_t len, hold->format = fmt_rtcm2_2; else if (strcasecmp("RTCM 2.3", s) == 0) hold->format = fmt_rtcm2_3; + /* required for the SAPOS derver in Gemany, confirmed as RTCM2.3 */ + else if (strcasecmp("RTCM1_", s) == 0) + hold->format = fmt_rtcm2_3; else if (strcasecmp("RTCM 3.0", s) == 0) hold->format = fmt_rtcm3; else |