ubxtool: Fix output of UBX-COMMS portId.

2 files changed, 11 insertions, 3 deletions

diff --git a/driver_nmea0183.c b/driver_nmea0183.c
index a6c46cc8..ba9e0c68 100644
--- a/driver_nmea0183.c
+++ b/driver_nmea0183.c
@@ -1386,10 +1386,10 @@ static gps_mask_t processGSV(int count, char *field[],
 	session->gpsdata.satellites_visible++;
     }
 
-#if __UNUSED
+#if 1  /* FUCK */
     /* debug code */
     gpsd_log(&session->context->errout, LOG_ERROR,
-        "x%cGSV: vis %d gagsv %d bdgsv %d glgsv %d qzzss %d\n",
+        "x%cGSV: vis %d gagsv %d bdgsv %d glgsv %d qzss %d\n",
 	GSV_TALKER,
 	session->gpsdata.satellites_visible,
 	session->nmea.seen_gagsv,
@@ -1450,6 +1450,14 @@ static gps_mask_t processGSV(int count, char *field[],
         && GSV_TALKER == 'P')
 	return ONLINE_SET;
 
+#if 1  /* FUCK */
+    /* debug code */
+    gpsd_log(&session->context->errout, LOG_ERROR,
+        "x%cGSV: set skyview_time %.2f frac_time %.2f\n", GSV_TALKER,
+	session->gpsdata.skyview_time,
+	session->nmea.this_frac_time);
+#endif
+
     /* clear computed DOPs so they get recomputed. */
     /* FIXME: this kills GPS reported dops... */
     session->gpsdata.dop.xdop = NAN;
diff --git a/ubxtool b/ubxtool
index 77448fb0..6d457e7f 100755
--- a/ubxtool
+++ b/ubxtool
@@ -2192,7 +2192,7 @@ class ubx(object):
                 name = "%#x (UNK)" % u[0]
             if 0 < i:
                 s += "\n"
-            s += ('  Port: %u (%s)\n' % (u[1], name))
+            s += '  Port: %s\n' % name
             s += ('   txPending %u txBytes %u txUsage %u txPeakUsage %u\n'
                   '   rxPending %u rxBytes %u rxUsage %u rxPeakUsage %u\n'
                   '   overrunErrs %u msgs %u/%u/%u/%u reserved %x %x '