Merge pull request #420 from sparkfun/release_candidate

nseidle · web-flow · commit e3c3f24c667b · 2023-03-08T13:34:37.000-07:00
Enable developer settings based on github action
diff --git a/.github/workflows/compile-rtk-firmware.yml b/.github/workflows/compile-rtk-firmware.yml
@@ -19,6 +19,24 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
+      #File_Name_v3_1.bin
+      #File_Name_RC-Jan_26_2023.bin
+      - name: Create file ending and compiler flags based on branch
+        run: |
+          if [[ $BRANCH == 'main' ]]; then
+              echo "FILE_ENDING_UNDERSCORE=_v${{ env.FIRMWARE_VERSION_MAJOR }}_${{ env.FIRMWARE_VERSION_MINOR }}" >> "$GITHUB_ENV"
+              echo "FILE_ENDING_NOUNDERSCORE=_v${{ env.FIRMWARE_VERSION_MAJOR }}.${{ env.FIRMWARE_VERSION_MINOR }}" >> "$GITHUB_ENV"
+              echo "JSON_ENDING=" >> "$GITHUB_ENV"
+              echo "JSON_FILE_NAME=RTK-Firmware.json" >> "$GITHUB_ENV"
+              echo "ENABLE_DEVELOPER=false" >> "$GITHUB_ENV"
+          else
+              echo "FILE_ENDING_UNDERSCORE=_RC-${{ steps.date.outputs.date }}" >> "$GITHUB_ENV"
+              echo "FILE_ENDING_NOUNDERSCORE=_RC-${{ steps.dateNoScores.outputs.dateNoScores }}" >> "$GITHUB_ENV"
+              echo "JSON_ENDING=-${{ steps.dateNoScores.outputs.dateNoScores }}" >> "$GITHUB_ENV"
+              echo "JSON_FILE_NAME=RTK-RC-Firmware.json" >> "$GITHUB_ENV"
+              echo "ENABLE_DEVELOPER=true" >> "$GITHUB_ENV"
+          fi
+
       - name: Setup Arduino CLI
         uses: arduino/setup-arduino-cli@v1
 
@@ -64,7 +82,7 @@ jobs:
         run: arduino-cli compile --fqbn esp32:esp32:esp32 ./Firmware/RTK_Surveyor/RTK_Surveyor.ino
           --build-property build.partitions=partitions
           --build-property upload.maximum_size=3145728 
-          --build-property "compiler.cpp.extra_flags=\"-DPOINTPERFECT_TOKEN=$POINTPERFECT_TOKEN\" \"-DFIRMWARE_VERSION_MAJOR=$FIRMWARE_VERSION_MAJOR\" \"-DFIRMWARE_VERSION_MINOR=$FIRMWARE_VERSION_MINOR\""
+          --build-property "compiler.cpp.extra_flags=\"-DPOINTPERFECT_TOKEN=$POINTPERFECT_TOKEN\" \"-DFIRMWARE_VERSION_MAJOR=$FIRMWARE_VERSION_MAJOR\" \"-DFIRMWARE_VERSION_MINOR=$FIRMWARE_VERSION_MINOR\""  \"-DENABLE_DEVELOPER=${{ env.ENABLE_DEVELOPER }}\""
           --export-binaries
 
       - name: Get current date
@@ -78,22 +96,6 @@ jobs:
       - name: Extract branch name
         run: echo "BRANCH=${{github.ref_name}}" >> $GITHUB_ENV
 
-      #File_Name_v3_1.bin
-      #File_Name_RC-Jan_26_2023.bin
-      - name: Create file ending based on branch
-        run: |
-          if [[ $BRANCH == 'main' ]]; then
-              echo "FILE_ENDING_UNDERSCORE=_v${{ env.FIRMWARE_VERSION_MAJOR }}_${{ env.FIRMWARE_VERSION_MINOR }}" >> "$GITHUB_ENV"
-              echo "FILE_ENDING_NOUNDERSCORE=_v${{ env.FIRMWARE_VERSION_MAJOR }}.${{ env.FIRMWARE_VERSION_MINOR }}" >> "$GITHUB_ENV"
-              echo "JSON_ENDING=" >> "$GITHUB_ENV"
-              echo "JSON_FILE_NAME=RTK-Firmware.json" >> "$GITHUB_ENV"
-          else
-              echo "FILE_ENDING_UNDERSCORE=_RC-${{ steps.date.outputs.date }}" >> "$GITHUB_ENV"
-              echo "FILE_ENDING_NOUNDERSCORE=_RC-${{ steps.dateNoScores.outputs.dateNoScores }}" >> "$GITHUB_ENV"
-              echo "JSON_ENDING=-${{ steps.dateNoScores.outputs.dateNoScores }}" >> "$GITHUB_ENV"
-              echo "JSON_FILE_NAME=RTK-RC-Firmware.json" >> "$GITHUB_ENV"
-          fi
-
       - name: Rename binary
         run: |
           cd Firmware/RTK_Surveyor/build/esp32.esp32.esp32/
diff --git a/Firmware/RTK_Surveyor/Begin.ino b/Firmware/RTK_Surveyor/Begin.ino
@@ -529,8 +529,8 @@ void pinUART2Task( void *pvParameters )
 //Note: ESP32 2.0.6 does some strange auto-bauding thing here which takes 20s to complete if there is no data for it to auto-baud.
 //      That's fine for most RTK products, but causes the Ref Stn to stall for 20s. However, it doesn't stall with ESP32 2.0.2...
 //      Uncomment these lines to prevent the stall if/when we upgrade to ESP32 ~2.0.6.
-//#if defined(ENABLE_DEVELOPER) && defined(REF_STN_GNSS_DEBUG)
-//  if (productVariant == REFERENCE_STATION)
+//#if defined(REF_STN_GNSS_DEBUG)
+//  if (ENABLE_DEVELOPER && productVariant == REFERENCE_STATION)
 //#else
 //  if (USE_I2C_GNSS)
 //#endif
diff --git a/Firmware/RTK_Surveyor/Buttons.ino b/Firmware/RTK_Surveyor/Buttons.ino
@@ -8,12 +8,13 @@ void powerOnCheck()
     if (digitalRead(pin_powerSenseAndControl) == LOW)
       delay(500);
 
-#ifndef ENABLE_DEVELOPER
-  if (pin_powerSenseAndControl >= 0)
-    if (digitalRead(pin_powerSenseAndControl) != LOW)
-      powerDown(false); //Power button tap. Returning to off state.
-#endif
-
+  if (ENABLE_DEVELOPER)
+  {
+    if (pin_powerSenseAndControl >= 0)
+      if (digitalRead(pin_powerSenseAndControl) != LOW)
+        powerDown(false); //Power button tap. Returning to off state.
+  }
+  
   powerPressedStartTime = 0; //Reset var to return to normal 'on' state
 }
 
diff --git a/Firmware/RTK_Surveyor/Display.ino b/Firmware/RTK_Surveyor/Display.ino
@@ -522,11 +522,11 @@ void displaySplash()
 
     yPos = yPos + fontHeight + 7;
     char unitFirmware[50];
-#ifdef ENABLE_DEVELOPER
-    snprintf(unitFirmware, sizeof(unitFirmware), "v%d.%d-DEV", FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR);
-#else
-    snprintf(unitFirmware, sizeof(unitFirmware), "v%d.%d", FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR);
-#endif
+    if (ENABLE_DEVELOPER)
+      snprintf(unitFirmware, sizeof(unitFirmware), "v%d.%d-DEV", FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR);
+    else
+      snprintf(unitFirmware, sizeof(unitFirmware), "v%d.%d", FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR);
+
     printTextCenter(unitFirmware, yPos, QW_FONT_5X7, 1, false);
 
     oled.display();
diff --git a/Firmware/RTK_Surveyor/RTK_Surveyor.ino b/Firmware/RTK_Surveyor/RTK_Surveyor.ino
@@ -31,9 +31,13 @@
 #define COMPILE_BT //Comment out to remove Bluetooth functionality
 #define COMPILE_L_BAND //Comment out to remove L-Band functionality
 #define COMPILE_SD_MMC //Comment out to remove REFERENCE_STATION microSD SD_MMC support
-#define ENABLE_DEVELOPER //Uncomment this line to enable special developer modes (don't check power button at startup)
 //#define REF_STN_GNSS_DEBUG //Uncomment this line to output GNSS library debug messages on serialGNSS. Ref Stn only. Needs ENABLE_DEVELOPER
 
+//Always define ENABLE_DEVELOPER to enable its use in conditional statements
+#ifndef ENABLE_DEVELOPER
+#define ENABLE_DEVELOPER true //This enable specials developer modes (don't check power button at startup). Passed in from compiler flags
+#endif
+
 //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 stored in flash (LittleFS) are correct for this version of the RTK
diff --git a/Firmware/RTK_Surveyor/System.ino b/Firmware/RTK_Surveyor/System.ino
@@ -10,8 +10,8 @@ bool configureUbloxModule()
   //Turn on/off debug messages
   if (settings.enableI2Cdebug)
   {
-#if defined(ENABLE_DEVELOPER) && defined(REF_STN_GNSS_DEBUG)
-    if (productVariant == REFERENCE_STATION)
+#if defined(REF_STN_GNSS_DEBUG)
+    if (ENABLE_DEVELOPER && productVariant == REFERENCE_STATION)
       theGNSS.enableDebugging(serialGNSS); //Output all debug messages over serialGNSS
     else
 #endif
diff --git a/Firmware/RTK_Surveyor/menuBase.ino b/Firmware/RTK_Surveyor/menuBase.ino
@@ -197,11 +197,12 @@ void menuBase()
     {
       systemPrint("Enter the number of meters for survey-in required position accuracy (1.0 to 5.0m): ");
       float observationPositionAccuracy = getDouble();
-#ifdef ENABLE_DEVELOPER
-      if (observationPositionAccuracy < 1.0 || observationPositionAccuracy > 10.0) //Arbitrary 1m minimum
-#else
-      if (observationPositionAccuracy < 1.0 || observationPositionAccuracy > 5.0) //Arbitrary 1m minimum
-#endif
+
+      float maxObservationPositionAccuracy = 5.0;
+      if (ENABLE_DEVELOPER)
+        maxObservationPositionAccuracy = 10.0;
+
+      if (observationPositionAccuracy < 1.0 || observationPositionAccuracy > maxObservationPositionAccuracy) //Arbitrary 1m minimum
         systemPrintln("Error: Observation positional accuracy requirement out of range");
       else
         settings.observationPositionAccuracy = observationPositionAccuracy; //Recorded to NVM and file at main menu exit
@@ -422,9 +423,9 @@ bool getFileLineSD(const char* fileName, int lineToFind, char* lineData, int lin
           log_d("File %s not found", fileName);
           break;
         }
-  
+
         int lineNumber = 0;
-  
+
         while (file.available())
         {
           //Get the next line from the file
@@ -442,26 +443,26 @@ bool getFileLineSD(const char* fileName, int lineToFind, char* lineData, int lin
               break;
             }
           }
-  
+
           if (strlen(lineData) > 0) //Ignore single \n or \r
             lineNumber++;
         }
-  
+
         file.close();
       }
 #ifdef COMPILE_SD_MMC
       else
       {
         File file = SD_MMC.open(fileName, FILE_READ);
-        
+
         if (!file)
         {
           log_d("File %s not found", fileName);
           break;
         }
-  
+
         int lineNumber = 0;
-  
+
         while (file.available())
         {
           //Get the next line from the file
@@ -479,12 +480,12 @@ bool getFileLineSD(const char* fileName, int lineToFind, char* lineData, int lin
               break;
             }
           }
-  
+
           if (strlen(lineData) > 0) //Ignore single \n or \r
             lineNumber++;
         }
-  
-        file.close();        
+
+        file.close();
       }
 #endif
       break;
@@ -554,7 +555,7 @@ bool removeFileSD(const char* fileName)
           log_d("Removing from SD: %s", fileName);
           SD_MMC.remove(fileName);
           removed = true;
-        }        
+        }
       }
 #endif
 
diff --git a/Firmware/RTK_Surveyor/menuMain.ino b/Firmware/RTK_Surveyor/menuMain.ino
@@ -26,11 +26,10 @@ void menuMain()
   while (1)
   {
     systemPrintln();
-#ifdef ENABLE_DEVELOPER
-    systemPrintf("SparkFun RTK %s v%d.%d-RC-%s\r\n", platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR, __DATE__);
-#else
-    systemPrintf("SparkFun RTK %s v%d.%d-%s\r\n", platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR, __DATE__);
-#endif
+    if (ENABLE_DEVELOPER)
+      systemPrintf("SparkFun RTK %s v%d.%d-RC-%s\r\n", platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR, __DATE__);
+    else
+      systemPrintf("SparkFun RTK %s v%d.%d-%s\r\n", platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR, __DATE__);
 
 #ifdef COMPILE_BT
     systemPrint("** Bluetooth broadcasting as: ");
@@ -242,7 +241,7 @@ void menuUserProfiles()
           else
           {
             if (SD_MMC.exists(settingsFileName))
-              SD_MMC.remove(settingsFileName);            
+              SD_MMC.remove(settingsFileName);
           }
 #endif
         }
@@ -331,15 +330,15 @@ void factoryReset()
       {
         //Remove this specific settings file. Don't remove the other profiles.
         sd->remove(settingsFileName);
-  
+
         sd->remove(stationCoordinateECEFFileName); //Remove station files
         sd->remove(stationCoordinateGeodeticFileName);
       }
 #ifdef COMPILE_SD_MMC
       else
       {
         SD_MMC.remove(settingsFileName);
-  
+
         SD_MMC.remove(stationCoordinateECEFFileName); //Remove station files
         SD_MMC.remove(stationCoordinateGeodeticFileName);
       }
@@ -404,11 +403,12 @@ void menuRadio()
 
       systemPrintln("2) Pair radios");
       systemPrintln("3) Forget all radios");
-#ifdef ENABLE_DEVELOPER
-      systemPrintln("4) Add dummy radio");
-      systemPrintln("5) Send dummy data");
-      systemPrintln("6) Broadcast dummy data");
-#endif
+      if (ENABLE_DEVELOPER)
+      {
+        systemPrintln("4) Add dummy radio");
+        systemPrintln("5) Send dummy data");
+        systemPrintln("6) Broadcast dummy data");
+      }
     }
 
     systemPrintln("x) Exit");
@@ -439,8 +439,7 @@ void menuRadio()
         systemPrintln("Radios forgotten");
       }
     }
-#ifdef ENABLE_DEVELOPER
-    else if (settings.radioType == RADIO_ESPNOW && incoming == 4)
+    else if (ENABLE_DEVELOPER && settings.radioType == RADIO_ESPNOW && incoming == 4)
     {
       uint8_t peer1[] = {0xB8, 0xD6, 0x1A, 0x0D, 0x8F, 0x9C}; //Random MAC
       if (esp_now_is_peer_exist(peer1) == true)
@@ -459,18 +458,17 @@ void menuRadio()
 
       espnowSetState(ESPNOW_PAIRED);
     }
-    else if (settings.radioType == RADIO_ESPNOW && incoming == 5)
+    else if (ENABLE_DEVELOPER && settings.radioType == RADIO_ESPNOW && incoming == 5)
     {
       uint8_t espnowData[] = "This is the long string to test how quickly we can send one string to the other unit. I am going to need a much longer sentence if I want to get a long amount of data into one transmission. This is nearing 200 characters but needs to be near 250.";
       esp_now_send(0, (uint8_t *) &espnowData, sizeof(espnowData)); //Send packet to all peers
     }
-    else if (settings.radioType == RADIO_ESPNOW && incoming == 6)
+    else if (ENABLE_DEVELOPER && settings.radioType == RADIO_ESPNOW && incoming == 6)
     {
       uint8_t espnowData[] = "This is the long string to test how quickly we can send one string to the other unit. I am going to need a much longer sentence if I want to get a long amount of data into one transmission. This is nearing 200 characters but needs to be near 250.";
       uint8_t broadcastMac[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
       esp_now_send(broadcastMac, (uint8_t *) &espnowData, sizeof(espnowData)); //Send packet to all peers
     }
-#endif
 
     else if (incoming == INPUT_RESPONSE_GETNUMBER_EXIT)
       break;
diff --git a/Firmware/RTK_Surveyor/menuPP.ino b/Firmware/RTK_Surveyor/menuPP.ino
@@ -126,10 +126,11 @@ void menuPointPerfectKeys()
         settings.pointPerfectNextKeyStart = settings.pointPerfectCurrentKeyStart + settings.pointPerfectCurrentKeyDuration + 1; //Next key starts after current key
         settings.pointPerfectNextKeyDuration = settings.pointPerfectCurrentKeyDuration;
 
-#ifdef ENABLE_DEVELOPER
-        systemPrintf("  settings.pointPerfectNextKeyStart: %lld\r\n", settings.pointPerfectNextKeyStart);
-        systemPrintf("  settings.pointPerfectNextKeyDuration: %lld\r\n", settings.pointPerfectNextKeyDuration);
-#endif
+        if (ENABLE_DEVELOPER)
+        {
+          systemPrintf("  settings.pointPerfectNextKeyStart: %lld\r\n", settings.pointPerfectNextKeyStart);
+          systemPrintf("  settings.pointPerfectNextKeyDuration: %lld\r\n", settings.pointPerfectNextKeyDuration);
+        }
       }
     }
     else if (incoming == 4)
@@ -659,12 +660,13 @@ void dateToKeyStartDuration(uint8_t expDay, uint8_t expMonth, uint16_t expYear,
   long long unixEpoch = thingstreamEpochToGPSEpoch(*settingsKeyStart, *settingsKeyDuration);
   unixEpochToWeekToW(unixEpoch, &keyGPSWeek, &keyGPSToW);
 
-#ifdef ENABLE_DEVELOPER
-  systemPrintf("  KeyStart: %lld\r\n", *settingsKeyStart);
-  systemPrintf("  KeyDuration: %lld\r\n", *settingsKeyDuration);
-  systemPrintf("  keyGPSWeek: %d\r\n", keyGPSWeek);
-  systemPrintf("  keyGPSToW: %d\r\n", keyGPSToW);
-#endif
+  if (ENABLE_DEVELOPER)
+  {
+    systemPrintf("  KeyStart: %lld\r\n", *settingsKeyStart);
+    systemPrintf("  KeyDuration: %lld\r\n", *settingsKeyDuration);
+    systemPrintf("  keyGPSWeek: %d\r\n", keyGPSWeek);
+    systemPrintf("  keyGPSToW: %d\r\n", keyGPSToW);
+  }
 }
 
 /*
diff --git a/Firmware/RTK_Surveyor/menuSystem.ino b/Firmware/RTK_Surveyor/menuSystem.ino

Original file line number	Diff line number	Diff line change
`@@ -197,11 +197,12 @@ void menuBase()`
`197`	`197`	`{`
`198`	`198`	`systemPrint("Enter the number of meters for survey-in required position accuracy (1.0 to 5.0m): ");`
`199`	`199`	`float observationPositionAccuracy = getDouble();`
`200`		`-#ifdef ENABLE_DEVELOPER`
`201`		`- if (observationPositionAccuracy < 1.0 \|\| observationPositionAccuracy > 10.0) //Arbitrary 1m minimum`
`202`		`-#else`
`203`		`- if (observationPositionAccuracy < 1.0 \|\| observationPositionAccuracy > 5.0) //Arbitrary 1m minimum`
`204`		`-#endif`
	`200`	`+`
	`201`	`+ float maxObservationPositionAccuracy = 5.0;`
	`202`	`+ if (ENABLE_DEVELOPER)`
	`203`	`+ maxObservationPositionAccuracy = 10.0;`
	`204`	`+`
	`205`	`+ if (observationPositionAccuracy < 1.0 \|\| observationPositionAccuracy > maxObservationPositionAccuracy) //Arbitrary 1m minimum`
`205`	`206`	`systemPrintln("Error: Observation positional accuracy requirement out of range");`
`206`	`207`	`else`
`207`	`208`	`settings.observationPositionAccuracy = observationPositionAccuracy; //Recorded to NVM and file at main menu exit`
`@@ -422,9 +423,9 @@ bool getFileLineSD(const char* fileName, int lineToFind, char* lineData, int lin`
`422`	`423`	`log_d("File %s not found", fileName);`
`423`	`424`	`break;`
`424`	`425`	`}`
`425`		`-`
	`426`	`+`
`426`	`427`	`int lineNumber = 0;`
`427`		`-`
	`428`	`+`
`428`	`429`	`while (file.available())`
`429`	`430`	`{`
`430`	`431`	`//Get the next line from the file`
`@@ -442,26 +443,26 @@ bool getFileLineSD(const char* fileName, int lineToFind, char* lineData, int lin`
`442`	`443`	`break;`
`443`	`444`	`}`
`444`	`445`	`}`
`445`		`-`
	`446`	`+`
`446`	`447`	`if (strlen(lineData) > 0) //Ignore single \n or \r`
`447`	`448`	`lineNumber++;`
`448`	`449`	`}`
`449`		`-`
	`450`	`+`
`450`	`451`	`file.close();`
`451`	`452`	`}`
`452`	`453`	`#ifdef COMPILE_SD_MMC`
`453`	`454`	`else`
`454`	`455`	`{`
`455`	`456`	`File file = SD_MMC.open(fileName, FILE_READ);`
`456`		`-`
	`457`	`+`
`457`	`458`	`if (!file)`
`458`	`459`	`{`
`459`	`460`	`log_d("File %s not found", fileName);`
`460`	`461`	`break;`
`461`	`462`	`}`
`462`		`-`
	`463`	`+`
`463`	`464`	`int lineNumber = 0;`
`464`		`-`
	`465`	`+`
`465`	`466`	`while (file.available())`
`466`	`467`	`{`
`467`	`468`	`//Get the next line from the file`
`@@ -479,12 +480,12 @@ bool getFileLineSD(const char* fileName, int lineToFind, char* lineData, int lin`
`479`	`480`	`break;`
`480`	`481`	`}`
`481`	`482`	`}`
`482`		`-`
	`483`	`+`
`483`	`484`	`if (strlen(lineData) > 0) //Ignore single \n or \r`
`484`	`485`	`lineNumber++;`
`485`	`486`	`}`
`486`		`-`
`487`		`- file.close();`
	`487`	`+`
	`488`	`+ file.close();`
`488`	`489`	`}`
`489`	`490`	`#endif`
`490`	`491`	`break;`
`@@ -554,7 +555,7 @@ bool removeFileSD(const char* fileName)`
`554`	`555`	`log_d("Removing from SD: %s", fileName);`
`555`	`556`	`SD_MMC.remove(fileName);`
`556`	`557`	`removed = true;`
`557`		`- }`
	`558`	`+ }`
`558`	`559`	`}`
`559`	`560`	`#endif`
`560`	`561`
Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,10 @@ void menuMain()`
`26`	`26`	`while (1)`
`27`	`27`	`{`
`28`	`28`	`systemPrintln();`
`29`		`-#ifdef ENABLE_DEVELOPER`
`30`		`- systemPrintf("SparkFun RTK %s v%d.%d-RC-%s\r\n", platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR, __DATE__);`
`31`		`-#else`
`32`		`- systemPrintf("SparkFun RTK %s v%d.%d-%s\r\n", platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR, __DATE__);`
`33`		`-#endif`
	`29`	`+ if (ENABLE_DEVELOPER)`
	`30`	`+ systemPrintf("SparkFun RTK %s v%d.%d-RC-%s\r\n", platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR, __DATE__);`
	`31`	`+ else`
	`32`	`+ systemPrintf("SparkFun RTK %s v%d.%d-%s\r\n", platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR, __DATE__);`
`34`	`33`
`35`	`34`	`#ifdef COMPILE_BT`
`36`	`35`	`systemPrint("** Bluetooth broadcasting as: ");`
`@@ -242,7 +241,7 @@ void menuUserProfiles()`
`242`	`241`	`else`
`243`	`242`	`{`
`244`	`243`	`if (SD_MMC.exists(settingsFileName))`
`245`		`- SD_MMC.remove(settingsFileName);`
	`244`	`+ SD_MMC.remove(settingsFileName);`
`246`	`245`	`}`
`247`	`246`	`#endif`
`248`	`247`	`}`
`@@ -331,15 +330,15 @@ void factoryReset()`
`331`	`330`	`{`
`332`	`331`	`//Remove this specific settings file. Don't remove the other profiles.`
`333`	`332`	`sd->remove(settingsFileName);`
`334`		`-`
	`333`	`+`
`335`	`334`	`sd->remove(stationCoordinateECEFFileName); //Remove station files`
`336`	`335`	`sd->remove(stationCoordinateGeodeticFileName);`
`337`	`336`	`}`
`338`	`337`	`#ifdef COMPILE_SD_MMC`
`339`	`338`	`else`
`340`	`339`	`{`
`341`	`340`	`SD_MMC.remove(settingsFileName);`
`342`		`-`
	`341`	`+`
`343`	`342`	`SD_MMC.remove(stationCoordinateECEFFileName); //Remove station files`
`344`	`343`	`SD_MMC.remove(stationCoordinateGeodeticFileName);`
`345`	`344`	`}`
`@@ -404,11 +403,12 @@ void menuRadio()`
`404`	`403`
`405`	`404`	`systemPrintln("2) Pair radios");`
`406`	`405`	`systemPrintln("3) Forget all radios");`
`407`		`-#ifdef ENABLE_DEVELOPER`
`408`		`- systemPrintln("4) Add dummy radio");`
`409`		`- systemPrintln("5) Send dummy data");`
`410`		`- systemPrintln("6) Broadcast dummy data");`
`411`		`-#endif`
	`406`	`+ if (ENABLE_DEVELOPER)`
	`407`	`+ {`
	`408`	`+ systemPrintln("4) Add dummy radio");`
	`409`	`+ systemPrintln("5) Send dummy data");`
	`410`	`+ systemPrintln("6) Broadcast dummy data");`
	`411`	`+ }`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`systemPrintln("x) Exit");`
`@@ -439,8 +439,7 @@ void menuRadio()`
`439`	`439`	`systemPrintln("Radios forgotten");`
`440`	`440`	`}`
`441`	`441`	`}`
`442`		`-#ifdef ENABLE_DEVELOPER`
`443`		`- else if (settings.radioType == RADIO_ESPNOW && incoming == 4)`
	`442`	`+ else if (ENABLE_DEVELOPER && settings.radioType == RADIO_ESPNOW && incoming == 4)`
`444`	`443`	`{`
`445`	`444`	`uint8_t peer1[] = {0xB8, 0xD6, 0x1A, 0x0D, 0x8F, 0x9C}; //Random MAC`
`446`	`445`	`if (esp_now_is_peer_exist(peer1) == true)`
`@@ -459,18 +458,17 @@ void menuRadio()`
`459`	`458`
`460`	`459`	`espnowSetState(ESPNOW_PAIRED);`
`461`	`460`	`}`
`462`		`- else if (settings.radioType == RADIO_ESPNOW && incoming == 5)`
	`461`	`+ else if (ENABLE_DEVELOPER && settings.radioType == RADIO_ESPNOW && incoming == 5)`
`463`	`462`	`{`
`464`	`463`	`uint8_t espnowData[] = "This is the long string to test how quickly we can send one string to the other unit. I am going to need a much longer sentence if I want to get a long amount of data into one transmission. This is nearing 200 characters but needs to be near 250.";`
`465`	`464`	`esp_now_send(0, (uint8_t *) &espnowData, sizeof(espnowData)); //Send packet to all peers`
`466`	`465`	`}`
`467`		`- else if (settings.radioType == RADIO_ESPNOW && incoming == 6)`
	`466`	`+ else if (ENABLE_DEVELOPER && settings.radioType == RADIO_ESPNOW && incoming == 6)`
`468`	`467`	`{`
`469`	`468`	`uint8_t espnowData[] = "This is the long string to test how quickly we can send one string to the other unit. I am going to need a much longer sentence if I want to get a long amount of data into one transmission. This is nearing 200 characters but needs to be near 250.";`
`470`	`469`	`uint8_t broadcastMac[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};`
`471`	`470`	`esp_now_send(broadcastMac, (uint8_t *) &espnowData, sizeof(espnowData)); //Send packet to all peers`
`472`	`471`	`}`
`473`		`-#endif`
`474`	`472`
`475`	`473`	`else if (incoming == INPUT_RESPONSE_GETNUMBER_EXIT)`
`476`	`474`	`break;`