fix some issues

include/networkConfig.h

@@ -55,7 +55,7 @@
 #ifdef NTRIP_RTK2GO
 #define NTRIP_HOST          "rtk2go.com"
 #define NTRIP_PORT          2101
-#define NTRIP_MOUNT_POINT   "uithuizermeeden"
+#define NTRIP_MOUNT_POINT   "GER-Papenburg"
 #define NTRIP_USER          "alklein1@gmx.de"
 #define NTRIP_PASSWORD      "none"
 #endif // NTRIP_RTK2GO

lib/Navigation/navigation.cpp

@@ -12,6 +12,7 @@
 #include "navigation.h"
 
 bool Navigation::outputStatusPrintPVTdata = false;
+bool Navigation::newData = false;
 uint32_t Navigation::ubxUpdateTimeStatic = 0;
 UBX_NAV_PVT_data_t* Navigation::ubxDataStatic = nullptr;
 
@@ -81,6 +82,11 @@ void Navigation::loop() {
     this->gps->checkUblox();
     this->gps->checkCallbacks();
 
+    if (Navigation::newData) {
+        this->updateCurrentLocation();
+        Navigation::newData = false;
+    }
+
     if (this->isNtripInit)
         this->ntripClient->loop();
 }
@@ -163,14 +169,11 @@ void Navigation::updateCurrentLocation() {
     Point p;
     p.lon = this->ubxData->lon;
     p.lat = this->ubxData->lat;
-    p.fixType = this->ubxData->fixType;
-    p.carrierSolution = this->ubxData->flags.all;
 
     this->currentPosition = p;
 }
 
 bool Navigation::nextPoint() { 
-    
     if (!this->navigationStarted)
         return false;
     return this->setTargetPoint(this->route->getNextPoint());
@@ -238,6 +241,7 @@ void Navigation::printPVTdata(UBX_NAV_PVT_data_t *ubxDataStruct) {
 void Navigation::savePVTdata(UBX_NAV_PVT_data_t *ubxDataStruct) {
     Navigation::printPVTdata(ubxDataStruct);
 
+    Navigation::newData = true;
     Navigation::ubxDataStatic = ubxDataStruct;
     Navigation::ubxUpdateTimeStatic = millis();
 }

lib/Navigation/navigation.h

@@ -214,6 +214,7 @@ class Navigation {
         static uint32_t ubxUpdateTimeStatic;
 
         static bool outputStatusPrintPVTdata;
+        static bool newData;
 };
 
 #endif // NAVIGATION_H

lib/Navigation/route.cpp

@@ -56,8 +56,9 @@ void Point::init(uint32_t horizontalAccuracy) {
     if (horizontalAccuracy > 9999)
         this->accuracy = PointAccuracy::fourDigOfCM;
     else if (horizontalAccuracy > 999)
-        this->accuracy = PointAccuracy::threeDigOfCM
+        this->accuracy = PointAccuracy::threeDigOfCM;
     else if (horizontalAccuracy > 99)
+        this->accuracy = PointAccuracy::twoDigOfCM;
         
 }
 

lib/Navigation/route.h

@@ -22,14 +22,6 @@
 #define ROUTE_DISTANCE_BETWEEN_LATITUDE 111300
 #define ROUTE_PI 3.14159265358979323846
 
-enum PointAccuracy {
-    none,
-    fourDigOfCM,
-    threeDigOfCM,
-    twoDigOfCM,
-    oneDigOfCM
-};
-
 /**
  * @brief A to handle points on the earth
  * 
@@ -38,6 +30,15 @@ enum PointAccuracy {
  */
 class Point{
     public:
+        enum PointAccuracy {
+            none,
+            fourDigOfCM,
+            threeDigOfCM,
+            twoDigOfCM,
+            oneDigOfCM
+        };
+
+
         /**
          * @brief Construct a new Point object
          * 

lib/NtripClient/ntripClient.cpp

@@ -109,10 +109,12 @@ void NTRIPClient::gpsConfiguration() {
 }
 
 bool NTRIPClient::setActivated(bool b) {
+    // std::cout << "NTRIPClient::setActivated: b - " << b << std::endl;
     if (b && this->state != NTRIPClientStates::notAvailable)
         this->activated = true;
     else if (b)
         return false;
+    else
         this->activated = false;
     return true;
 

src/SpecialMenus/GPS/menuGPS.cpp

@@ -201,7 +201,8 @@ void MenuGPS::printPage() const {
 
 void MenuGPS::runCommand() const {
     switch (this->currentPage) {
-        case 3:
+        case 3: {
+            // std::cout << "MenuGPS::runCommand " << this->ntripClient->getClientState() << std::endl;
             if (this->ntripClient->getClientState() == NTRIPClientStates::pushData)
                 this->ntripClient->setActivated(false);
             else if (this->ntripClient->getClientState() != NTRIPClientStates::notAvailable)
@@ -209,3 +210,4 @@ void MenuGPS::runCommand() const {
             break;
         }
     }
+}

src/main.cpp

@@ -67,7 +67,7 @@ void makeMenu(void);
 
 void setup() {
     Serial.begin(115200);
-    DebugTimes::setConsolOutput(true);
+    // DebugTimes::setConsolOutput(true);
     DebugTimes setupTime;
     char wifiIndicator = 'X';
 
@@ -130,7 +130,7 @@ void loop() {
         DebugTimes wifiTime;
         Network::checkWiFi();
         Network::checkMQTT();
-        wifiTime.stopConsol("WiFi-Time", 5);
+        wifiTime.stopConsol("WiFi-Time", 10);
     }
     driveManager->loop();