u-blox name cleanup. All regression tests pass, PPS is live.

9 files changed, 22 insertions, 22 deletions

diff --git a/SConstruct b/SConstruct
index 3cc44bf0..26b7bb50 100644
--- a/SConstruct
+++ b/SConstruct
@@ -110,7 +110,7 @@ boolopts = (
     ("tnt",           True,  "True North Technologies support"),
     ("tripmate",      True,  "DeLorme TripMate support"),
     ("tsip",          True,  "Trimble TSIP support"),
-    ("ubx",           True,  "UBX Protocol support"),
+    ("ublox",         True,  "u-blox Protocol support"),
     ("fury",          True,  "Jackson Labs Fury and Firefly support"),
     ("nmea2000",      True,  "NMEA2000/CAN support"),
     # Non-GPS protocols
diff --git a/driver_ubx.c b/driver_ubx.c
index e823ce05..461e86d4 100644
--- a/driver_ubx.c
+++ b/driver_ubx.c
@@ -26,7 +26,7 @@
 #endif /* S_SPLINT_S */
 
 #include "gpsd.h"
-#if defined(UBX_ENABLE) && defined(BINARY_ENABLE)
+#if defined(UBLOX_ENABLE) && defined(BINARY_ENABLE)
 #include "driver_ubx.h"
 
 #include "bits.h"
@@ -949,4 +949,4 @@ const struct gps_type_t ubx_binary = {
 #endif /* TIMEHINT_ENABLE */
 };
 /* *INDENT-ON* */
-#endif /* defined(UBX_ENABLE) && defined(BINARY_ENABLE) */
+#endif /* defined(UBLOX_ENABLE) && defined(BINARY_ENABLE) */
diff --git a/drivers.c b/drivers.c
index 1d747097..050a8602 100644
--- a/drivers.c
+++ b/drivers.c
@@ -217,14 +217,14 @@ static void nmea_event_hook(struct gps_device_t *session, event_t event)
 	    (void)nmea_send(session, "$PASHQ,RID");
 	    break;
 #endif /* ASHTECH_ENABLE */
-#ifdef UBX_ENABLE
+#ifdef UBLOX_ENABLE
 	case 7:
 	    /* probe for UBX -- query software version */
 	    gpsd_report(session->context->debug, LOG_PROG,
 			"=> Probing for UBX\n");
 	    (void)ubx_write(session, 0x0au, 0x04, NULL, 0);
 	    break;
-#endif /* UBX_ENABLE */
+#endif /* UBLOX_ENABLE */
 #ifdef MTK3301_ENABLE
 	case 8:
 	    /* probe for MTK-3301 -- expect $PMTK705 */
@@ -1557,9 +1557,9 @@ static const struct gps_type_t *gpsd_driver_array[] = {
 #ifdef TSIP_ENABLE
     &tsip_binary,
 #endif /* TSIP_ENABLE */
-#ifdef UBX_ENABLE
+#ifdef UBLOX_ENABLE
     &ubx_binary,
-#endif /* UBX_ENABLE */
+#endif /* UBLOX_ENABLE */
 #ifdef ZODIAC_ENABLE
     &zodiac_binary,
 #endif /* ZODIAC_ENABLE */
diff --git a/gpsd.h-tail b/gpsd.h-tail
index 68c8fe3c..28b0f0e5 100644
--- a/gpsd.h-tail
+++ b/gpsd.h-tail
@@ -76,7 +76,7 @@ typedef unsigned int speed_t;
 #ifdef EARTHMATE_ENABLE
 #define ZODIAC_ENABLE
 #endif
-#if defined(ZODIAC_ENABLE) || defined(SIRF_ENABLE) || defined(GARMIN_ENABLE) || defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(ITRAX_ENABLE) || defined(UBX_ENABLE) || defined(SUPERSTAR2_ENABLE) || defined(ONCORE_ENABLE) || defined(GEOSTAR_ENABLE) || defined(NAVCOM_ENABLE)
+#if defined(ZODIAC_ENABLE) || defined(SIRF_ENABLE) || defined(GARMIN_ENABLE) || defined(TSIP_ENABLE) || defined(EVERMORE_ENABLE) || defined(ITRAX_ENABLE) || defined(UBLOX_ENABLE) || defined(SUPERSTAR2_ENABLE) || defined(ONCORE_ENABLE) || defined(GEOSTAR_ENABLE) || defined(NAVCOM_ENABLE)
 #define BINARY_ENABLE
 #endif
 #if defined(TRIPMATE_ENABLE) || defined(BINARY_ENABLE)
@@ -608,12 +608,12 @@ struct gps_device_t {
 	    unsigned int Zv[ZODIAC_CHANNELS];	/* signal values (0-7) */
 	} zodiac;
 #endif /* ZODIAC_ENABLE */
-#ifdef UBX_ENABLE
+#ifdef UBLOX_ENABLE
 	struct {
 	    unsigned char sbas_in_use;
 	    bool user_switched;
     	} ubx;
-#endif /* UBX_ENABLE */
+#endif /* UBLOX_ENABLE */
 #ifdef NAVCOM_ENABLE
 	struct {
 	    uint8_t physical_port;
diff --git a/gpsmon.c b/gpsmon.c
index 95cc137c..f6e035fb 100644
--- a/gpsmon.c
+++ b/gpsmon.c
@@ -100,9 +100,9 @@ static const struct monitor_object_t *monitor_objects[] = {
 #if defined(SIRF_ENABLE) && defined(BINARY_ENABLE)
     &sirf_mmt,
 #endif /* defined(SIRF_ENABLE) && defined(BINARY_ENABLE) */
-#if defined(UBX_ENABLE) && defined(BINARY_ENABLE)
+#if defined(UBLOX_ENABLE) && defined(BINARY_ENABLE)
     &ubx_mmt,
-#endif /* defined(UBX_ENABLE) && defined(BINARY_ENABLE) */
+#endif /* defined(UBLOX_ENABLE) && defined(BINARY_ENABLE) */
 #if defined(ITRAX_ENABLE) && defined(BINARY_ENABLE)
     &italk_mmt,
 #endif /* defined(ITALK_ENABLE) && defined(BINARY_ENABLE) */
diff --git a/monitor_ubx.c b/monitor_ubx.c
index 865d8b37..a373e61d 100644
--- a/monitor_ubx.c
+++ b/monitor_ubx.c
@@ -9,7 +9,7 @@
 #include "bits.h"
 #include "gpsmon.h"
 
-#ifdef UBX_ENABLE
+#ifdef UBLOX_ENABLE
 #include "driver_ubx.h"
 extern const struct gps_type_t ubx_binary;
 static WINDOW *satwin, *navsolwin, *dopwin, *ppswin;
diff --git a/packet.c b/packet.c
index f1600b31..9942da05 100644
--- a/packet.c
+++ b/packet.c
@@ -266,12 +266,12 @@ static void nextstate(struct gps_packet_t *lexer, unsigned char c)
 	    break;
 	}
 #endif /* ZODIAC_ENABLE */
-#ifdef UBX_ENABLE
+#ifdef UBLOX_ENABLE
 	if (c == 0xb5) {
 	    lexer->state = UBX_LEADER_1;
 	    break;
 	}
-#endif /* UBX_ENABLE */
+#endif /* UBLOX_ENABLE */
 #ifdef ITRAX_ENABLE
 	if (c == '<') {
 	    lexer->state = ITALK_LEADER_1;
@@ -510,7 +510,7 @@ static void nextstate(struct gps_packet_t *lexer, unsigned char c)
 	    lexer->state = NMEA_DOLLAR;
 	else if (c == '!')
 	    lexer->state = NMEA_BANG;
-#ifdef UBX_ENABLE
+#ifdef UBLOX_ENABLE
 	else if (c == 0xb5)	/* LEA-5H can and will output NMEA and UBX back to back */
 	    lexer->state = UBX_LEADER_1;
 #endif
@@ -1014,7 +1014,7 @@ static void nextstate(struct gps_packet_t *lexer, unsigned char c)
 	    lexer->state = ZODIAC_RECOGNIZED;
 	break;
 #endif /* ZODIAC_ENABLE */
-#ifdef UBX_ENABLE
+#ifdef UBLOX_ENABLE
     case UBX_LEADER_1:
 	if (c == 0x62)
 	    lexer->state = UBX_LEADER_2;
@@ -1059,7 +1059,7 @@ static void nextstate(struct gps_packet_t *lexer, unsigned char c)
 	else
 	    lexer->state = GROUND_STATE;
 	break;
-#endif /* UBX_ENABLE */
+#endif /* UBLOX_ENABLE */
 #ifdef EVERMORE_ENABLE
     case EVERMORE_LEADER_1:
 	if (c == STX)
@@ -1853,7 +1853,7 @@ void packet_parse(struct gps_packet_t *lexer)
 	    break;
 	}
 #endif /* ZODIAC_ENABLE */
-#ifdef UBX_ENABLE
+#ifdef UBLOX_ENABLE
 	else if (lexer->state == UBX_RECOGNIZED) {
 	    /* UBX use a TCP like checksum */
 	    int n, len;
@@ -1884,7 +1884,7 @@ void packet_parse(struct gps_packet_t *lexer)
 	    packet_discard(lexer);
 	    break;
 	}
-#endif /* UBX_ENABLE */
+#endif /* UBLOX_ENABLE */
 #ifdef EVERMORE_ENABLE
 	else if (lexer->state == EVERMORE_RECOGNIZED) {
 	    unsigned int n, crc, checksum, len;
diff --git a/packet_states.h b/packet_states.h
index f7769f76..8077cbf1 100644
--- a/packet_states.h
+++ b/packet_states.h
@@ -115,7 +115,7 @@
    NAVCOM_RECOGNIZED,	/* found end of the Navcom packet */
 #endif /* NAVCOM_ENABLE */
 
-#ifdef UBX_ENABLE
+#ifdef UBLOX_ENABLE
    UBX_LEADER_1,        /* first constant leader byte found */
    UBX_LEADER_2,        /* second constant leader byte found */
    UBX_CLASS_ID,        /* classid read */
diff --git a/www/hardware-tail.html b/www/hardware-tail.html
index af13282e..9038e7a6 100644
--- a/www/hardware-tail.html
+++ b/www/hardware-tail.html
@@ -47,7 +47,7 @@ extract time information from the serial data accurate to about
 <td>sirfstar1 has raw data in message 5, sirfstar2 has raw data in message 28, sirfstar3 has some raw data in message 28 but carrier phase is not available. rumor has it that carrier phase is available as a premium feature in superstar3.</td>
 </tr>
 <tr>
-<td>ublox</td>
+<td>u-blox</td>
 <td align="center">Partial</td>
 <td>The RXM-RAW message contains raw data. This is implemented in all Antaris chips. This is only implemented in the timing versions of Antaris4. In ublox5 it is "only available with premium feature raw data".
 </td>