Remove powerButtonFiltering setting. Use firmware version to determine test.

Author: nseidle

Firmware/RTK_Surveyor/Buttons.ino

@@ -8,7 +8,11 @@ void powerOnCheck()
         if (digitalRead(pin_powerSenseAndControl) == LOW)
             delay(500);
 
-    if (settings.powerButtonFiltering == true)
+    if (FIRMWARE_VERSION_MAJOR == 99)
+    {
+        // Do not check button if this is a locally compiled developer firmware
+    }
+    else
     {
         if (pin_powerSenseAndControl >= 0)
             if (digitalRead(pin_powerSenseAndControl) != LOW)
@@ -53,7 +57,8 @@ void powerDown(bool displayInfo)
         digitalWrite(pin_powerFastOff, LOW);
     }
 
-    if ((productVariant == RTK_FACET) || (productVariant == RTK_FACET_LBAND)  || (productVariant == RTK_FACET_LBAND_DIRECT) || (productVariant == REFERENCE_STATION))
+    if ((productVariant == RTK_FACET) || (productVariant == RTK_FACET_LBAND) ||
+        (productVariant == RTK_FACET_LBAND_DIRECT) || (productVariant == REFERENCE_STATION))
         digitalWrite(pin_peripheralPowerControl, LOW);
 
     while (1)

Firmware/RTK_Surveyor/NVM.ino

@@ -365,7 +365,6 @@ void recordSystemSettingsToFile(File *settingsFile)
     settingsFile->printf("%s=%d\r\n", "minCNO_F9P", settings.minCNO_F9P);
     settingsFile->printf("%s=%d\r\n", "shutdownNoChargeTimeout_s", settings.shutdownNoChargeTimeout_s);
     settingsFile->printf("%s=%d\r\n", "disableSetupButton", settings.disableSetupButton);
-    settingsFile->printf("%s=%d\r\n", "powerButtonFiltering", settings.powerButtonFiltering);
     settingsFile->printf("%s=%d\r\n", "useI2cForLbandCorrections", settings.useI2cForLbandCorrections);
     settingsFile->printf("%s=%d\r\n", "useI2cForLbandCorrectionsConfigured", settings.useI2cForLbandCorrectionsConfigured);
 
@@ -1315,8 +1314,6 @@ bool parseLine(char *str, Settings *settings)
         settings->shutdownNoChargeTimeout_s = d;
     else if (strcmp(settingName, "disableSetupButton") == 0)
         settings->disableSetupButton = d;
-    else if (strcmp(settingName, "powerButtonFiltering") == 0)
-        settings->powerButtonFiltering = d;
     else if (strcmp(settingName, "useI2cForLbandCorrections") == 0)
         settings->useI2cForLbandCorrections = d;
     else if (strcmp(settingName, "useI2cForLbandCorrectionsConfigured") == 0)

Firmware/RTK_Surveyor/menuSystem.ino

@@ -756,30 +756,26 @@ void menuOperation()
         else
             systemPrintln("Disabled - no resets");
 
-        // Power button
-        systemPrint("6) Power button filtering: ");
-        systemPrintf("%s\r\n", settings.powerButtonFiltering ? "Enabled" : "Disabled");
-
         // SPI
-        systemPrint("7) SPI/SD Interface Frequency: ");
+        systemPrint("6) SPI/SD Interface Frequency: ");
         systemPrint(settings.spiFrequency);
         systemPrintln(" MHz");
 
         // SPP
-        systemPrint("8) SPP RX Buffer Size: ");
+        systemPrint("7) SPP RX Buffer Size: ");
         systemPrintln(settings.sppRxQueueSize);
 
-        systemPrint("9) SPP TX Buffer Size: ");
+        systemPrint("8) SPP TX Buffer Size: ");
         systemPrintln(settings.sppTxQueueSize);
 
         // UART
-        systemPrint("10) UART Receive Buffer Size: ");
+        systemPrint("9) UART Receive Buffer Size: ");
         systemPrintln(settings.uartReceiveBufferSize);
 
         // ZED
-        systemPrintln("11) Mirror ZED-F9x's UART1 settings to USB");
+        systemPrintln("10) Mirror ZED-F9x's UART1 settings to USB");
 
-        systemPrint("12) Use I2C for L-Band Corrections: ");
+        systemPrint("11) Use I2C for L-Band Corrections: ");
         systemPrintf("%s\r\n", settings.useI2cForLbandCorrections ? "Enabled" : "Disabled");
 
         systemPrintln("----  Interrupts  ----");
@@ -886,8 +882,6 @@ void menuOperation()
             }
         }
         else if (incoming == 6)
-            settings.powerButtonFiltering ^= 1;
-        else if (incoming == 7)
         {
             systemPrint("Enter SPI frequency in MHz (1 to 16): ");
             int freq = getNumber(); // Returns EXIT, TIMEOUT, or long
@@ -899,7 +893,7 @@ void menuOperation()
                     settings.spiFrequency = freq; // Recorded to NVM and file at main menu exit
             }
         }
-        else if (incoming == 8)
+        else if (incoming == 7)
         {
             systemPrint("Enter SPP RX Queue Size in Bytes (32 to 16384): ");
             int queSize = getNumber(); // Returns EXIT, TIMEOUT, or long
@@ -911,7 +905,7 @@ void menuOperation()
                     settings.sppRxQueueSize = queSize; // Recorded to NVM and file at main menu exit
             }
         }
-        else if (incoming == 9)
+        else if (incoming == 8)
         {
             systemPrint("Enter SPP TX Queue Size in Bytes (32 to 16384): ");
             int queSize = getNumber(); // Returns EXIT, TIMEOUT, or long
@@ -923,7 +917,7 @@ void menuOperation()
                     settings.sppTxQueueSize = queSize; // Recorded to NVM and file at main menu exit
             }
         }
-        else if (incoming == 10)
+        else if (incoming == 9)
         {
             systemPrintln("Warning: changing the Receive Buffer Size will restart the RTK. Enter 0 to abort");
             systemPrint("Enter UART Receive Buffer Size in Bytes (32 to 16384): ");
@@ -940,7 +934,7 @@ void menuOperation()
                 }
             }
         }
-        else if (incoming == 11)
+        else if (incoming == 10)
         {
             bool response = setMessagesUSB(MAX_SET_MESSAGES_RETRIES);
 
@@ -949,7 +943,7 @@ void menuOperation()
             else
                 systemPrintln(F("USB messages successfully enabled"));
         }
-        else if (incoming == 12)
+        else if (incoming == 11)
         {
             settings.useI2cForLbandCorrectionsConfigured = true; //Record that the user has manually modified the settings.
             settings.useI2cForLbandCorrections ^= 1;

Firmware/RTK_Surveyor/settings.h

@@ -979,7 +979,6 @@ typedef struct
     uint8_t i2cInterruptsCore = 1; // Core where hardware is started and interrupts are assigned to, 0=core, 1=Arduino
     uint32_t shutdownNoChargeTimeout_s = 0; // If > 0, shut down unit after timeout if not charging
     bool disableSetupButton = false;                  // By default, allow setup through the overlay button(s)
-    bool powerButtonFiltering = true; //Set to false during firmware development to prevent device power down when new firmware is loaded
     bool useI2cForLbandCorrections = true; //Set to false to stop I2C callback. Corrections will require direct ZED to NEO UART2 connections.
     bool useI2cForLbandCorrectionsConfigured = false; //If a user sets useI2cForLbandCorrections, this goes true.