diff --git a/Firmware/RTK_Surveyor/Begin.ino b/Firmware/RTK_Surveyor/Begin.ino index 50ea11bb5..e92934206 100644 --- a/Firmware/RTK_Surveyor/Begin.ino +++ b/Firmware/RTK_Surveyor/Begin.ino @@ -287,8 +287,6 @@ void beginSD() online.microSD = false; gotSemaphore = false; - log_d("settings.enableSD: %d", settings.enableSD); - while (settings.enableSD == true) { //Setup SD card access semaphore @@ -305,7 +303,7 @@ void beginSD() if (USE_SPI_MICROSD) { - systemPrintln("Initializing microSD - using SPI, SdFat and SdFile"); + log_d("Initializing microSD - using SPI, SdFat and SdFile"); pinMode(pin_microSD_CS, OUTPUT); digitalWrite(pin_microSD_CS, HIGH); //Be sure SD is deselected diff --git a/Firmware/RTK_Surveyor/Buttons.ino b/Firmware/RTK_Surveyor/Buttons.ino index ba157bed5..f5f9b6001 100644 --- a/Firmware/RTK_Surveyor/Buttons.ino +++ b/Firmware/RTK_Surveyor/Buttons.ino @@ -8,7 +8,7 @@ void powerOnCheck() if (digitalRead(pin_powerSenseAndControl) == LOW) delay(500); - if (ENABLE_DEVELOPER) + if (ENABLE_DEVELOPER == false) { if (pin_powerSenseAndControl >= 0) if (digitalRead(pin_powerSenseAndControl) != LOW) diff --git a/Firmware/RTK_Surveyor/RTK_Surveyor.ino b/Firmware/RTK_Surveyor/RTK_Surveyor.ino index 034cd4cc8..87dbc0475 100644 --- a/Firmware/RTK_Surveyor/RTK_Surveyor.ino +++ b/Firmware/RTK_Surveyor/RTK_Surveyor.ino @@ -19,12 +19,6 @@ Settings are loaded from microSD if available otherwise settings are pulled from ESP32's file system LittleFS. */ -//This is passed in from compiler extra flags -#ifndef POINTPERFECT_TOKEN -#define FIRMWARE_VERSION_MAJOR 99 -#define FIRMWARE_VERSION_MINOR 99 -#endif - #define COMPILE_WIFI //Comment out to remove WiFi functionality #define COMPILE_AP //Requires WiFi. Comment out to remove Access Point functionality #define COMPILE_ESPNOW //Requires WiFi. Comment out to remove ESP-Now functionality. @@ -35,7 +29,13 @@ //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 +#define ENABLE_DEVELOPER true //This enable specials developer modes (don't check power button at startup). Passed in from compiler flags. +#endif + +//This is passed in from compiler extra flags +#ifndef POINTPERFECT_TOKEN +#define FIRMWARE_VERSION_MAJOR 99 +#define FIRMWARE_VERSION_MINOR 99 #endif //Define the RTK board identifier: