Add blinking base LED

Author: nseidle

Firmware/RTK_Surveyor/Buttons.ino

@@ -17,9 +17,6 @@ void checkSetupButton()
       //Configure for base mode
       Serial.println(F("Base Mode"));
 
-      //Configure for base mode
-      Serial.println(F("Base Mode"));
-
       //Restart Bluetooth with 'Base' name
       //We start BT regardless of Ntrip Server in case user wants to transmit survey-in stats over BT
       beginBluetooth();
@@ -52,6 +49,7 @@ void checkSetupButton()
         }
       }
 
+      digitalWrite(baseStatusLED, HIGH);
       displayBaseSuccess();
       delay(500);
     }
@@ -87,9 +85,9 @@ void checkSetupButton()
 
       beginBluetooth(); //Restart Bluetooth with 'Rover' name
 
-      digitalWrite(baseStatusLED, LOW);
-
       changeState(STATE_ROVER_NO_FIX);
+
+      digitalWrite(baseStatusLED, LOW);
       displayRoverSuccess();
       delay(500);
     }

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -42,9 +42,9 @@
 const int FIRMWARE_VERSION_MAJOR = 1;
 const int FIRMWARE_VERSION_MINOR = 2;
 
-//Define the RTK Surveyor board identifier:
-//  This is an int which is unique to this variant of the RTK Surveyor and which allows us
-//  to make sure that the settings in EEPROM are correct for this version of the RTK Surveyor
+//Define the RTK board identifier:
+//  This is an int which is unique to this variant of the RTK Surveyor hardware which allows us
+//  to make sure that the settings in EEPROM are correct for this version of the RTK
 //  (sizeOfSettings is not necessarily unique and we want to avoid problems when swapping from one variant to another)
 //  It is the sum of:
 //    the major firmware version * 0x10
@@ -222,8 +222,6 @@ const byte menuTimeout = 15; //Menus will exit/timeout after this number of seco
 bool inTestMode = false; //Used to re-route BT traffic while in test sub menu
 long systemTime_minutes = 0; //Used to test if logging is less than max minutes
 
-//uint32_t lastRoverUpdate = 0;
-//uint32_t lastBaseUpdate = 0;
 uint32_t lastBattUpdate = 0;
 uint32_t lastDisplayUpdate = 0;
 uint32_t lastSystemStateUpdate = 0;
@@ -247,7 +245,7 @@ uint32_t casterResponseWaitStartTime = 0; //Used to detect if caster service tim
 
 uint32_t maxSurveyInWait_s = 60L * 15L; //Re-start survey-in after X seconds
 
-bool setupByPowerButton = false; //We can change setup via tapping power button
+uint32_t lastBaseLEDupdate = 0; //Controls the blinking of the Base LED
 
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 

Firmware/RTK_Surveyor/States.ino

@@ -54,6 +54,13 @@ void updateSystemState()
       //Wait for horz acc of 5m or less before starting survey in
       case (STATE_BASE_TEMP_SURVEY_NOT_STARTED):
         {
+          //Blink base LED slowly while we wait for first fix
+          if (millis() - lastBaseLEDupdate > 1000)
+          { 
+            lastBaseLEDupdate = millis();
+            digitalWrite(baseStatusLED, !digitalRead(baseStatusLED));
+          }
+
           //Check for <5m horz accuracy
           uint32_t accuracy = i2cGNSS.getHorizontalAccuracy();
 
@@ -64,7 +71,7 @@ void updateSystemState()
 
           if (f_accuracy > 0.0 && f_accuracy < settings.surveyInStartingAccuracy)
           {
-            displaySurveyStart(); //Show 'Survey'
+            displaySurveyStart(); //Show 'Survey Started'
             if (configureUbloxModuleBase() == true)
             {
               if (surveyIn() == true) //Begin survey
@@ -80,9 +87,17 @@ void updateSystemState()
       //Check survey status until it completes or 15 minutes elapses and we go back to rover
       case (STATE_BASE_TEMP_SURVEY_STARTED):
         {
+          //Blink base LED quickly during survey in
+          if (millis() - lastBaseLEDupdate > 500)
+          { 
+            lastBaseLEDupdate = millis();
+            digitalWrite(baseStatusLED, !digitalRead(baseStatusLED));
+          }
+
           if (i2cGNSS.getFixType() == 5) //We have a TIME fix which is survey in complete
           {
             Serial.println(F("Base survey complete! RTCM now broadcasting."));
+            digitalWrite(baseStatusLED, HIGH); //Indicate survey complete
             changeState(STATE_BASE_TEMP_TRANSMITTING);
           }
           else
@@ -116,6 +131,7 @@ void updateSystemState()
 
               beginBluetooth(); //Restart Bluetooth with 'Rover' name
 
+              digitalWrite(baseStatusLED, LOW); //Indicate rover mode
               changeState(STATE_ROVER_NO_FIX);
               displayRoverSuccess();
             }

Firmware/RTK_Surveyor/System.ino

@@ -508,17 +508,9 @@ void updateBattLEDs()
 //And outputs a serial message to USB
 void checkBatteryLevels()
 {
-  //long startTime = millis();
-
-  //Check I2C semaphore
-  //  if (xSemaphoreTake(xI2CSemaphore, i2cSemaphore_maxWait) == pdPASS)
-  //  {
   battLevel = lipo.getSOC();
   battVoltage = lipo.getVoltage();
   battChangeRate = lipo.getChangeRate();
-  //    xSemaphoreGive(xI2CSemaphore);
-  //  }
-  //Serial.printf("Batt time to update: %d\n", millis() - startTime);
 
   Serial.printf("Batt (%d%%): Voltage: %0.02fV", battLevel, battVoltage);