Merge branch 'main' of https://github.com/uugear/GPSDRPP

Author: uugear

.gitattributes

@@ -0,0 +1,9 @@
+* text=auto eol=lf
+
+*.png binary
+*.jpg binary
+*.pdf binary
+*.zip binary
+*.exe binary
+
+*.bat text eol=crlf

.gitignore

@@ -0,0 +1,2 @@
+sink_modules/.DS_Store
+.DS_Store

README.md

@@ -1,4 +1,42 @@
 # GPSDR++ (GPSDRPP)
-GPSDR++ is the software for [VU GPSDR](https://www.uugear.com/product/vu-gpsdr/), and it is based on the open-source [SDR++](https://github.com/AlexandreRouma/SDRPlusPlus) project, originally created by Alexandre Rouma (ON5RYZ) and enriched by many talented contributors. We deeply appreciate their dedication and hard work, which form the foundation of this software.
+GPSDR++ is the software for [VU GPSDR](https://www.uugear.com/product/vu-gpsdr/), and it is based the open-source [SDR++](https://github.com/AlexandreRouma/SDRPlusPlus) project, originally created by Alexandre Rouma (ON5RYZ) and enriched by many talented contributors. We deeply appreciate their dedication and hard work, which form the foundation of this software.
+
+## Usage
+Start GPSDR++ from the Application menu, or just run "gpsdrpp" in the terminal. 
+
+![Run GPSDR++](https://www.uugear.com/wordpress/wp-content/uploads/2025/09/launch_gpsdrpp.jpg)
+
+GPSDR++ will start as a full-screen application, and its interface looks like this:
+
+![GPSDR++ Layout](https://www.uugear.com/wordpress/wp-content/uploads/2025/09/GPSDRPP_layout.jpg)
+
+The toolbar at the top contains controls for showing/adjusting SDR parameters (on/off, volume, frequency, tuning mode, SNR etc.). The SDR++ menu is hidden by default - you can tap the button in the upper-left corner to toggle the visibility of the menu and/or sidebar.
+
+The sidebar provides several functional pages, such as Radio, Mode S/ADS-B, GPS, and CLK OUT. You can switch between these pages using the two navigation buttons at the bottom of the sidebar.
+
+The main view contains two tabs: Waterfall and Map, and you can switch between them by tapping on the tab header.
+
+By default, when you are facing the screen:
+- The left encoder controls the zoom level of the waterfall view.
+- The right encoder controls the tuning frequency.
+
+You can change their functionality by pressing the buttons next to each encoder.
+
+On the radio page, you can turn AGC on/off, adjust the gain, and specify the demodulation mode.
+
+![GPSDR++ Radio](https://www.uugear.com/wordpress/wp-content/uploads/2025/09/radio_page.jpg)
+
+To enable ADS-B reception, go to the Mode S/ADS-B page and tick the checkbox at the top. When aircraft are detected, they will also appear in the Map tab within the main view.
+
+![GPSDR++ ADSB](https://www.uugear.com/wordpress/wp-content/uploads/2025/09/ADSB_page.jpg)
+
+To monitor GPS satellite signal strength, navigate to the GPS page. To show your surrounding geography, activate the Map tab.
+
+![GPSDR++ GPS](https://www.uugear.com/wordpress/wp-content/uploads/2025/09/GPS_page.jpg)
+
+To enable the clock signal output, go to the CLK OUT page and tick the checkbox at the top.
+
+![GPSDR++ CLK OUT](https://www.uugear.com/wordpress/wp-content/uploads/2025/09/CLKOUT_page.jpg)
+
 
 

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

@@ -8,14 +8,15 @@
 #include <linux/i2c-dev.h>
 #include <core.h>
 #include <rtl_sdr_source_interface.h>
+#include <utils/flog.h>
 
 
 bool DeviceRefreshWorker::checkI2CDevice(int bus, int address) {
     char filename[20];
     snprintf(filename, sizeof(filename), "/dev/i2c-%d", bus);
     int file = open(filename, O_RDWR);
     if (file < 0) {
-        std::cerr << "Failed to open I2C bus " << bus << std::endl;
+        flog::error("Failed to open I2C bus {0}", bus);
         return false;
     }
     bool deviceExists = (ioctl(file, I2C_SLAVE, address) >= 0);
@@ -30,7 +31,7 @@ void DeviceRefreshWorker::delay(int milliseconds) {
 int DeviceRefreshWorker::executeCommand(const char* command) {
     int result = system(command);
     if (result != 0) {
-        std::cerr << "Command failed: " << command << " (exit code: " << result << ")" << std::endl;
+        flog::error("Command failed: {0} (exit code: {1})", command, result);
     }
     return result;
 }
@@ -43,32 +44,37 @@ void DeviceRefreshWorker::workerLoop() {
 				core::modComManager.callInterface("RTL-SDR", RTL_SDR_SOURCE_IFACE_CMD_GET_DEVICE_COUNT, NULL, &count);
 				if (count == 0) {
 					if (checkI2CDevice(2, 0x0b)) {
-						std::cout << "VU GPSDR device found on I2C bus 2, make a power cycle now..." << std::endl;
+					    flog::info("VU GPSDR device found on I2C bus 2, make a power cycle now...");
 
 						executeCommand("vgp set 4B2 1");
 						delay(2000);
 
 						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
+                        try {
+                            core::configManager.acquire();
+                            bool lockToGpsFreq = core::configManager.conf["lockToGpsFreq"];
+                            core::configManager.release(true);
+                            core::gps.outputReferenceClock(lockToGpsFreq);
+                        } catch (const std::exception& e) {
+                            flog::error("GPS sendData failed: {0}", e.what());
+                        	delay(500);
+                        	continue;
+                        }
+                        delay(500);
 
 						// Initialize Si5351
 						try {
 							core::si5351.initialize();
 						} catch (const std::exception& e) {
-							std::cerr << "Si5351 initialize failed: " << e.what() << std::endl;
+							flog::error("Si5351 initialize failed: {0}", e.what());
+							delay(500);
+							continue;
 						}
 
-						std::cout << "Power cycle completed." << std::endl;
-						
+						flog::info("Power cycle completed.");
 						delay(500);
 
 						// Refresh device list
@@ -77,31 +83,30 @@ void DeviceRefreshWorker::workerLoop() {
 				}
 			}
         } catch (const std::exception& e) {
-            std::cerr << "Exception in worker thread: " << e.what() << std::endl;
+            flog::error("Exception in DeviceRefreshWorker thread: {0}", e.what());
         }
 		delay(2000);
     }
 
-    std::cout << "Worker thread stopped." << std::endl;
+    flog::info("DeviceRefreshWorker thread stopped.");
 }
 
 void DeviceRefreshWorker::start() {
     if (workerThread.joinable()) {
-        std::cerr << "Worker thread is already running!" << std::endl;
+        flog::error("DeviceRefreshWorker thread is already running!");
         return;
     }
-    
     shouldStop.store(false);
     workerThread = std::thread(&DeviceRefreshWorker::workerLoop, this);
-    std::cout << "Device refresh worker thread started." << std::endl;
+    flog::info("DeviceRefreshWorker thread started.");
 }
 
 void DeviceRefreshWorker::stop() {
     shouldStop.store(true);
 
     if (workerThread.joinable()) {
         workerThread.join();
-        std::cout << "Device refresh worker thread joined." << std::endl;
+        flog::info("DeviceRefreshWorker thread joined.");
     }
 }
 

core/src/gps.cpp

@@ -581,4 +581,9 @@ void Gps::readerLoop() {
 
 int32_t Gps::getProcessedNMEA() {
     return processedNMEA;
+}
+
+void Gps::outputReferenceClock(bool lockToGpsFreq) {
+    flog::info("Request GPS to output referernce clock, lockToGpsFreq={0}", 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.4"
+#define VERSION_STR "1.0.7"