GPSDR++ V1.0.6

Add "Sync to 24MHz" option on GPS side page.
GPS postion fixing will no longer cause freezing with this option turned OFF.

Author: uugear

core/src/core.cpp

@@ -150,8 +150,8 @@ int gpsdrpp_main(int argc, char* argv[]) {
         return 0;
     }
 
-    // Tell GPS to output 24MHz timepulse, align to UTC if possible
-    core::gps.sendData((unsigned char *)Gps::UBX_CFG_TP5, Gps::UBX_CFG_TP5_SIZE);
+    // Tell GPS to output 24MHz timepulse
+    core::gps.outputReferenceClock(false);
 
     bool serverMode = (bool)core::args["server"];
 
@@ -205,6 +205,9 @@ int gpsdrpp_main(int argc, char* argv[]) {
     // Side Bar
     defConfig["selectedPage"] = 0;
 
+    // GPS Page
+    defConfig["lockToGpsFreq"] = false;
+    
     // CLK OUT Page
     defConfig["clkOut"] = true;
     defConfig["reg58"] = 0;

core/src/dev_refresh_worker.cpp

@@ -51,14 +51,14 @@ void DeviceRefreshWorker::workerLoop() {
 						executeCommand("vgp set 4B2 0");
 						delay(500);
 
-						// Tell GPS to output 24MHz
-						try {
-							core::gps.sendData((unsigned char *)Gps::UBX_CFG_TP5, Gps::UBX_CFG_TP5_SIZE);
-						} catch (const std::exception& e) {
-							std::cerr << "GPS sendData failed: " << e.what() << std::endl;
-						}
-						
-						delay(500);
+                        // Tell GPS to output 24MHz
+                        core::configManager.acquire();
+                        bool lockToGpsFreq = core::configManager.conf["lockToGpsFreq"];
+                        core::configManager.release(true);
+                        if (lockToGpsFreq) {
+                            core::gps.outputReferenceClock(lockToGpsFreq);
+                        }
+                        delay(500);
 
 						// Initialize Si5351
 						try {

core/src/gps.cpp

@@ -581,4 +581,8 @@ void Gps::readerLoop() {
 
 int32_t Gps::getProcessedNMEA() {
     return processedNMEA;
+}
+
+void Gps::outputReferenceClock(bool lockToGpsFreq) {
+    sendData((unsigned char *)(lockToGpsFreq ? UBX_CFG_TP5 : UBX_CFG_TP5_NO_SYNC), UBX_CFG_TP5_SIZE);
 }

core/src/gps.h

@@ -68,7 +68,14 @@ class Gps {
         0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 
         0x00, 0x00, 0x6F, 0x00, 0x00, 0x00, 0x43, 0x50
     };
-    
+    static constexpr unsigned char UBX_CFG_TP5_NO_SYNC[40] = {
+        0xB5, 0x62, 0x06, 0x31, 0x20, 0x00, 0x00, 0x01, 
+        0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x00, 0x36,
+        0x6E, 0x01, 0x00, 0x36, 0x6E, 0x01, 0x00, 0x00, 
+        0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x6D, 0x00, 0x00, 0x00, 0xC1, 0xC8
+    };
+
     uint8_t getUtcHour();
     uint8_t getUtcMinute();
     uint8_t getUtcSecond();
@@ -80,6 +87,8 @@ class Gps {
     uint8_t getFixQuality();
     uint8_t getUsedSatellites();
 
+    void outputReferenceClock(bool lockToGpsFreq);
+    
     int32_t processedNMEA = 0;
     std::vector<Satellite> getSatellites();
 

core/src/gui/widgets/gps_page.cpp

@@ -31,16 +31,26 @@ const char* GPSPage::getLabel() {
 }
 
 void GPSPage::init() {
-    
+    core::configManager.acquire();
+    lockToGpsFreq = core::configManager.conf["lockToGpsFreq"];
+    core::configManager.release(true);
+    if (lockToGpsFreq) {
+        core::gps.outputReferenceClock(lockToGpsFreq);
+    }
 }
 
 void GPSPage::deinit() {
-
+    core::configManager.acquire();
+    core::configManager.conf["lockToGpsFreq"] = lockToGpsFreq;
+	core::configManager.release(true);
 }
 
 void GPSPage::draw() {
     const float footer_height_to_reserve = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing() + 10;
     if (ImGui::BeginChild("GPS_Content", ImVec2(0, -footer_height_to_reserve), true)) {
+        if (ImGui::Checkbox("Sync to 24MHz", &lockToGpsFreq)) {
+            core::gps.outputReferenceClock(lockToGpsFreq);
+        }
         ImGui::Text("Status: ");
         ImGui::SameLine();
         if (core::gps.getFixQuality() != 0) {

core/src/gui/widgets/gps_page.h

@@ -21,6 +21,7 @@ class GPSPage : public SideBar::SidePage {
 
 private:
     void drawSatelliteTable();
-    
+
+    bool lockToGpsFreq = false;    
     LoadingAnimation loader;
 };

core/src/version.h

@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_STR "1.0.5"
+#define VERSION_STR "1.0.6"