- remove NtripReconnect from Autopilot and CaptureRoute

- shiftet moveControl States in the class namespace
- added auto reconeect to NtripClient
- a lot of refactor

src/driveModi/Modi/CaptureRoute/captureRoute.cpp

@@ -15,31 +15,28 @@ CaptureRoute::CaptureRoute(MoveControl* moveControl, const ControlPadInput *inpu
     : ManualControl(moveControl, input) {
         this->navigation = navigation;
         this->navigation->getRoute()->clear();
+        this->navigation->getNTRIPClient()->setAutoReconnect(true);
         this->routeInfo = navigation->getRouteInfo();
 }
 
 CaptureRoute::~CaptureRoute() {
-    this->navigation->getNTRIPClient()->setActivated(false);
+    // this->navigation->getNTRIPClient()->setActivated(false);
 }
 
 void CaptureRoute::loop() {
     ManualControl::loop();
 
-    if (millis() - this->lastMillis < this->delay) {
+    if (millis() - this->lastMillis < this->delay)
         return;
-    }
+    
     this->runCaptureRoute();
     this->lastMillis = millis();
 }
 
 void CaptureRoute::runCaptureRoute() {
-    this->checkNtrip();
-
-    if (this->state != NtripState::Enabled)
-        return;
-
     if (ControlPadButton::isControlPadButtonPressed(this->input, ControlPadButton::PadButton::Action)) {
-        if (this->navigation->addCurrentPosToRoute()) {
+        this->status = this->navigation->addCurrentPosToRoute();
+        if (this->status == Navigation::Status::Updated) {
             this->lastSavedPoint = this->navigation->getCurrentPosition();
             this->routeInfo = navigation->getRouteInfo();
             this->updateDisplay = true;
@@ -60,27 +57,3 @@ bool CaptureRoute::shouldUpdate() {
     }
     return false;
 }
-
-void CaptureRoute::checkNtrip() {
-    NTRIPClient* client = this->navigation->getNTRIPClient();
-    NTRIPClientStates state = client->getClientState();
-    if (state == NTRIPClientStates::notAvailable) {
-        this->state = NtripState::NoNtrip;
-    } else if (state == NTRIPClientStates::pushData) {
-        this->ntripReconnectAttemps = 0;
-        this->state = NtripState::Enabled;
-    } else if (state ==NTRIPClientStates::wait) {
-        this->state = NtripState::Waiting;
-        if (millis() - this->reconnectNtripLastMillis < this->reconnectNtripDelayMillis)
-            return;
-
-        if (this->ntripReconnectAttemps > this->ntripReconnectMaxAttemps) {
-            this->state = NtripState::NoNtrip;
-            return;
-        }
-
-        this->reconnectNtripLastMillis = millis();
-        client->setActivated(true);
-        this->ntripReconnectAttemps++;
-    }
-}

src/driveModi/Modi/CaptureRoute/captureRoute.h

@@ -27,12 +27,6 @@
  */
 class CaptureRoute : public ManualControl {
     public:
-        enum NtripState {
-            NoNtrip,
-            Waiting,
-            Enabled
-        };
-
         /**
          * @brief Construct a new Capture Route object
          * 
@@ -76,6 +70,7 @@ class CaptureRoute : public ManualControl {
          * @return RouteInfo 
          */
         RouteInfo getRouteInfo() const { return this->routeInfo; }
+        Navigation::Status getLastStatus() const { return this->status; }
 
         /**
          * @brief Get the distance to the last saved oint
@@ -92,19 +87,13 @@ class CaptureRoute : public ManualControl {
          */
         bool shouldUpdate();
     private:
-        void checkNtrip();
-
         Navigation* navigation;
         RouteInfo routeInfo;
         Point lastSavedPoint;
-        NtripState state = NtripState::Waiting;
+        Navigation::Status status = Navigation::Status::Complete;
 
-        uint8_t ntripReconnectAttemps = 0;
-        uint8_t ntripReconnectMaxAttemps = 10;
-        uint16_t reconnectNtripDelayMillis = 1000;
         uint16_t delay = 200;
         uint32_t lastMillis = 0;
-        uint32_t reconnectNtripLastMillis = 0;
 
         bool updateDisplay = false;
 };