diff options
| author | tegzed <tegzed@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-18 18:39:51 +0000 |
|---|---|---|
| committer | tegzed <tegzed@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-01-18 18:39:51 +0000 |
| commit | 9fd942c42b897adc338446edab50de0c219d70f4 (patch) | |
| tree | d162578fc20ebb7c634d7fda4a2d44c431ee6460 /navit/vehicle/gpsd/vehicle_gpsd.c | |
| parent | 0b55f321aec49e7867faa98f75a3d2028802d4eb (diff) | |
| download | navit-9fd942c42b897adc338446edab50de0c219d70f4.tar.gz | |
Fix:vehicle/gpsd:Fixed nmea logging for gpsd vehicle
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3940 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/vehicle/gpsd/vehicle_gpsd.c')
| -rw-r--r-- | navit/vehicle/gpsd/vehicle_gpsd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/navit/vehicle/gpsd/vehicle_gpsd.c b/navit/vehicle/gpsd/vehicle_gpsd.c index 5d72760b9..4923514fa 100644 --- a/navit/vehicle/gpsd/vehicle_gpsd.c +++ b/navit/vehicle/gpsd/vehicle_gpsd.c @@ -87,7 +87,11 @@ vehicle_gpsd_callback(struct gps_data_t *data, char *buf, size_t len, buffer[len+1]='\0'; memcpy(buffer, buf, len); pos=strchr(buffer,'\n'); + if(!pos) { + pos=strchr(buffer,'\r'); + } if (pos) { + *pos ='\n'; *++pos='\0'; if (!priv->nmea_data_buf || strlen(priv->nmea_data_buf) < 65536) { nmea_data_buf=g_strconcat(priv->nmea_data_buf ? priv->nmea_data_buf : "", buffer, NULL); @@ -217,7 +221,7 @@ vehicle_gpsd_try_open(gpointer *data) g_free(source); #ifdef HAVE_LIBGPS19 - gps_stream(priv->gps, WATCH_ENABLE | WATCH_NEWSTYLE, NULL); + gps_stream(priv->gps, WATCH_ENABLE|WATCH_NMEA|WATCH_JSON, NULL); #else gps_query(priv->gps, priv->gpsd_query); #endif |