Add RX Clock Drift reporting

Author: PaulZC

Firmware/GNSSDO_Firmware/Begin.ino

@@ -633,6 +633,7 @@ int64_t getFrequencyControlWord()
 void updateTCXOClockBias()
 {
     tcxoClockBias_ms = gnssClockBias_ms; // Default to the PVTGeodetic RxClkBias
+    tcxoClockDrift_ppm = gnssClockDrift_ppm;
     snprintf(rxClkBiasSource, sizeof(rxClkBiasSource), "PVT");
 
     if (settings.preferNonCompositeGPSBias || settings.preferNonCompositeGalileoBias) // These are mutex
@@ -641,6 +642,7 @@ void updateTCXOClockBias()
         if (fugroTimeSystems[index].updated) // If we have the preferred non-composite bias, use that
         {
             tcxoClockBias_ms = fugroTimeSystems[index].RxClkBias_ms;
+            tcxoClockDrift_ppm = fugroTimeSystems[index].RxClkDrift_ppm;
             fugroTimeSystems[index].updated = false;
             snprintf(rxClkBiasSource, sizeof(rxClkBiasSource), fugroTimeSystems[index].name);
         }

Firmware/GNSSDO_Firmware/GNSSDO_Firmware.ino

@@ -140,6 +140,7 @@ float gnssAltitude_m = 0.0;
 uint8_t gnssTimeSys = 255; // Unknown
 uint8_t gnssError = 255; // Unknown
 double gnssClockBias_ms = 0.0;
+float gnssClockDrift_ppm = 0.0;
 
 // IPStatus 4058
 uint8_t ethernetMACAddress[6] = { 0,0,0,0,0,0 }; // Display this address in the system menu

Firmware/GNSSDO_Firmware/Tasks.ino

@@ -628,6 +628,11 @@ void processConsumerMessage(PARSE_STATE *parse, uint8_t type)
                 uint64_t unsigned64;
             } dblUnsigned64;
 
+            union {
+                float flt;
+                uint32_t unsigned32;
+            } fltUnsigned32;
+
             dblUnsigned64.unsigned64 = 0;
             for (int i = 0; i < 8; i++)
                 dblUnsigned64.unsigned64 |= ((uint64_t)parse->buffer[16 + i]) << (i * 8);
@@ -658,6 +663,15 @@ void processConsumerMessage(PARSE_STATE *parse, uint8_t type)
             if (gnssClockBias_ms > 999.999)
                 gnssClockBias_ms = 999.999;
 
+            fltUnsigned32.unsigned32 = 0;
+            for (int i = 0; i < 4; i++)
+                fltUnsigned32.unsigned32 |= ((uint32_t)parse->buffer[68 + i]) << (i * 8);
+            gnssClockDrift_ppm = fltUnsigned32.flt;
+            if (gnssClockDrift_ppm < -999999.999)
+                gnssClockDrift_ppm = -999999.999;
+            if (gnssClockDrift_ppm > 999999.999)
+                gnssClockDrift_ppm = 999999.999;
+
             gnssTimeSys = parse->buffer[72];
         }
         else if ((parse->message & 0x1FFF) == 4058) // IPStatus
@@ -686,21 +700,35 @@ void processConsumerMessage(PARSE_STATE *parse, uint8_t type)
                 uint8_t SysUsage = parse->buffer[20 + (b * SBLength) + 0];
                 uint8_t TimeSystem = parse->buffer[20 + (b * SBLength) + 2];
 
+                // Convert uint64_t to double
                 union {
                     double dbl;
                     uint64_t unsigned64;
                 } dblUnsigned64;
 
+                // Extract RxClkBias_ms
                 dblUnsigned64.unsigned64 = 0;
                 for (int i = 0; i < 8; i++)
                     dblUnsigned64.unsigned64 |= ((uint64_t)parse->buffer[20 + (b * SBLength) + 4 + i]) << (i * 8);
 
+                // Convert uint32_t to float
+                union {
+                    float flt;
+                    uint32_t unsigned32;
+                } fltUnsigned32;
+
+                // Extract RxClkDrift_ppm
+                fltUnsigned32.unsigned32 = 0;
+                for (int i = 0; i < 4; i++)
+                    fltUnsigned32.unsigned32 |= ((uint32_t)parse->buffer[20 + (b * SBLength) + 12 + i]) << (i * 8);
+    
                 // If this block contains a non-composite clock indicator, store it
                 for (int TS = 0; TS < NUM_FUGRO_CLK_BIASES; TS++)
                 {
                     if (fugroTimeSystems[TS].SysUsage == SysUsage)
                     {
                         fugroTimeSystems[TS].RxClkBias_ms = dblUnsigned64.dbl;
+                        fugroTimeSystems[TS].RxClkDrift_ppm = fltUnsigned32.flt;
                         fugroTimeSystems[TS].updated = true;
                         break;
                     }

Firmware/GNSSDO_Firmware/menuSystem.ino

@@ -584,7 +584,7 @@ void printCurrentConditions(bool CSV)
         {
             if (firstTime)
             {
-                systemPrintln("YYYY/MM/DD,HH:MM:SS,Epoch,Lat,Lon,Alt,TimeSys,Error,Fine,PPS,Bias,Source,TCXO,Pk,Ik");
+                systemPrintln("YYYY/MM/DD,HH:MM:SS,Epoch,Lat,Lon,Alt,TimeSys,Error,Fine,PPS,Bias,Drift,Source,TCXO,Pk,Ik");
                 firstTime = false;
             }
 
@@ -620,6 +620,8 @@ void printCurrentConditions(bool CSV)
 
             systemPrintf(",%.3e", tcxoClockBias_ms / 1000.0); // Display clock bias in seconds
 
+            systemPrintf(",%.3e", tcxoClockDrift_ppm / 1000000.0); // Display clock drift in parts
+
             systemPrint(",");
             systemPrint((const char *)rxClkBiasSource),
 
@@ -669,6 +671,8 @@ void printCurrentConditions(bool CSV)
                 systemPrintf(", Bias: %.3fns",
                     (float)(tcxoClockBias_ms * 1000000.0));
 
+            systemPrintf(", Drift: %.3e", tcxoClockDrift_ppm / 1000000.0);
+
             systemPrint(", Source: ");
             systemPrint((const char *)rxClkBiasSource),
 

Firmware/GNSSDO_Firmware/settings.h

@@ -84,6 +84,7 @@ typedef struct {
     const uint8_t SysUsage;
     const char name[8];
     double RxClkBias_ms;
+    float RxClkDrift_ppm;
     bool updated;
 } fugroTimeSystem;
 
@@ -131,6 +132,7 @@ uint8_t mosaicTimeSystemIndexFromName(const char *name)
     return 0; // This should never happen
 }
 double tcxoClockBias_ms; // Updated by updateTCXOClockBias
+float tcxoClockDrift_ppm;
 char rxClkBiasSource[8];
 
 const char *const mosaicPVTErrorTable[] = {