From ba0353a1aa75d7550ec24818f553149bcd6b4d18 Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Sat, 3 Jun 2023 17:23:43 -1000 Subject: [PATCH] Add comments to the #else and #endif --- Firmware/RTK_Surveyor/Begin.ino | 12 +++---- Firmware/RTK_Surveyor/Display.ino | 46 ++++++++++++------------- Firmware/RTK_Surveyor/ESPNOW.ino | 26 +++++++------- Firmware/RTK_Surveyor/FileSdFatMMC.h | 32 ++++++++--------- Firmware/RTK_Surveyor/Form.ino | 40 ++++++++++----------- Firmware/RTK_Surveyor/NTRIPClient.h | 34 +++++++++--------- Firmware/RTK_Surveyor/NVM.ino | 4 +-- Firmware/RTK_Surveyor/NtripClient.ino | 24 ++++++------- Firmware/RTK_Surveyor/NtripServer.ino | 20 +++++------ Firmware/RTK_Surveyor/RTK_Surveyor.ino | 22 ++++++------ Firmware/RTK_Surveyor/States.ino | 16 ++++----- Firmware/RTK_Surveyor/System.ino | 4 +-- Firmware/RTK_Surveyor/Tasks.ino | 2 +- Firmware/RTK_Surveyor/W5500.ino | 2 +- Firmware/RTK_Surveyor/WiFi.ino | 10 +++--- Firmware/RTK_Surveyor/bluetoothSelect.h | 2 +- Firmware/RTK_Surveyor/menuBase.ino | 4 +-- Firmware/RTK_Surveyor/menuEthernet.ino | 16 ++++----- Firmware/RTK_Surveyor/menuFirmware.ino | 16 ++++----- Firmware/RTK_Surveyor/menuMain.ino | 22 ++++++------ Firmware/RTK_Surveyor/menuMessages.ino | 2 +- Firmware/RTK_Surveyor/menuPP.ino | 12 +++---- Firmware/RTK_Surveyor/menuSystem.ino | 8 ++--- Firmware/RTK_Surveyor/settings.h | 4 +-- 24 files changed, 190 insertions(+), 190 deletions(-) diff --git a/Firmware/RTK_Surveyor/Begin.ino b/Firmware/RTK_Surveyor/Begin.ino index 4016d35c1..68fce0441 100644 --- a/Firmware/RTK_Surveyor/Begin.ino +++ b/Firmware/RTK_Surveyor/Begin.ino @@ -445,13 +445,13 @@ void beginSD() } } } -#else +#else // COMPILE_SD_MMC else { log_d("SD_MMC not compiled"); break; // No SD available. } -#endif +#endif // COMPILE_SD_MMC if (createTestFile() == false) { @@ -490,7 +490,7 @@ void endSD(bool alreadyHaveSemaphore, bool releaseSemaphore) #ifdef COMPILE_SD_MMC else SD_MMC.end(); -#endif +#endif // COMPILE_SD_MMC online.microSD = false; systemPrintln("microSD: Offline"); @@ -573,9 +573,9 @@ void pinUART2Task(void *pvParameters) // ESP32 2.0.2... Uncomment these lines to prevent the stall if/when we upgrade to ESP32 ~2.0.6. // #if defined(REF_STN_GNSS_DEBUG) // if (ENABLE_DEVELOPER && productVariant == REFERENCE_STATION) - // #else + // #else // REF_STN_GNSS_DEBUG // if (USE_I2C_GNSS) - // #endif + // #endif // REF_STN_GNSS_DEBUG { serialGNSS.setRxBufferSize( settings.uartReceiveBufferSize); // TODO: work out if we can reduce or skip this when using SPI GNSS @@ -875,7 +875,7 @@ void beginInterrupts() pinMode(pin_Ethernet_Interrupt, INPUT_PULLUP); // Prepare the interrupt pin attachInterrupt(pin_Ethernet_Interrupt, ethernetISR, FALLING); // Attach the interrupt } -#endif +#endif // COMPILE_ETHERNET } // Set LEDs for output and configure PWM diff --git a/Firmware/RTK_Surveyor/Display.ino b/Firmware/RTK_Surveyor/Display.ino index b290859f3..586196c17 100644 --- a/Firmware/RTK_Surveyor/Display.ino +++ b/Firmware/RTK_Surveyor/Display.ino @@ -1016,9 +1016,9 @@ uint32_t setWiFiIcon_TwoRadios() { #ifdef COMPILE_WIFI int wifiRSSI = WiFi.RSSI(); -#else +#else // COMPILE_WIFI int wifiRSSI = -40; // Dummy -#endif +#endif // COMPILE_WIFI // Based on RSSI, select icon if (wifiRSSI >= -40) icons |= ICON_WIFI_SYMBOL_3_LEFT; @@ -1046,9 +1046,9 @@ uint32_t setWiFiIcon_TwoRadios() { #ifdef COMPILE_WIFI int wifiRSSI = WiFi.RSSI(); -#else +#else // COMPILE_WIFI int wifiRSSI = -40; // Dummy -#endif +#endif // COMPILE_WIFI // Based on RSSI, select icon if (wifiRSSI >= -40) icons |= ICON_WIFI_SYMBOL_3_LEFT; @@ -1103,9 +1103,9 @@ uint32_t setWiFiIcon_ThreeRadios() { #ifdef COMPILE_WIFI int wifiRSSI = WiFi.RSSI(); -#else +#else // COMPILE_WIFI int wifiRSSI = -40; // Dummy -#endif +#endif // COMPILE_WIFI // Based on RSSI, select icon if (wifiRSSI >= -40) icons |= ICON_WIFI_SYMBOL_3_RIGHT; @@ -1133,9 +1133,9 @@ uint32_t setWiFiIcon_ThreeRadios() { #ifdef COMPILE_WIFI int wifiRSSI = WiFi.RSSI(); -#else +#else // COMPILE_WIFI int wifiRSSI = -40; // Dummy -#endif +#endif // COMPILE_WIFI // Based on RSSI, select icon if (wifiRSSI >= -40) icons |= ICON_WIFI_SYMBOL_3_RIGHT; @@ -1583,9 +1583,9 @@ void paintLogging() loggingIconDisplayed %= 4; // Wrap #ifdef COMPILE_ETHERNET if ((online.logging == true) && (logIncreasing || ntpLogIncreasing)) -#else +#else // COMPILE_ETHERNET if ((online.logging == true) && (logIncreasing)) -#endif +#endif // COMPILE_ETHERNET { if (loggingType == LOGGING_STANDARD) { @@ -1656,9 +1656,9 @@ void paintLoggingNTP(bool noPulse) loggingIconDisplayed %= 4; // Wrap #ifdef COMPILE_ETHERNET // Some redundancy here. paintLoggingNTP should only be called if Ethernet is present if ((online.logging == true) && (logIncreasing || ntpLogIncreasing)) -#else +#else // COMPILE_ETHERNET if ((online.logging == true) && (logIncreasing)) -#endif +#endif // COMPILE_ETHERNET { if (loggingIconDisplayed == 0) displayBitmap(64 - Logging_0_Width, 48 - Logging_0_Height, Logging_0_Width, Logging_0_Height, Logging_0); @@ -1825,9 +1825,9 @@ void paintIPAddress() snprintf(ipAddress, sizeof(ipAddress), " %d.%d.%d.%d ", #ifdef COMPILE_ETHERNET Ethernet.localIP()[0], Ethernet.localIP()[1], Ethernet.localIP()[2], Ethernet.localIP()[3]); -#else +#else // COMPILE_ETHERNET 0, 0, 0, 0); -#endif +#endif // COMPILE_ETHERNET static uint8_t ipAddressPosition = 0; @@ -2037,9 +2037,9 @@ void displayWiFiConfig() snprintf(mySSID, sizeof(mySSID), "%s", "RTK Config"); else snprintf(mySSID, sizeof(mySSID), "%s", WiFi.SSID().c_str()); -#else +#else // COMPILE_WIFI snprintf(mySSID, sizeof(mySSID), "%s", "!Compiled"); -#endif +#endif // COMPILE_WIFI char mySSIDFront[displayMaxCharacters + 1]; // 1 for null terminator char mySSIDBack[displayMaxCharacters + 1]; // 1 for null terminator @@ -2094,9 +2094,9 @@ void displayWiFiConfig() else printTextCenter(myIPBack, yPos, QW_FONT_5X7, 1, false); -#else +#else // COMPILE_AP printTextCenter("!Compiled", yPos, QW_FONT_5X7, 1, false); -#endif +#endif // COMPILE_AP } // When user does a factory reset, let us know @@ -3307,11 +3307,11 @@ void displayConfigViaEthernet() oled.display(); } -#else +#else // COMPILE_ETHERNET uint8_t fontHeight = 15; uint8_t yPos = oled.getHeight() / 2 - fontHeight; printTextCenter("!Compiled", yPos, QW_FONT_5X7, 1, false); -#endif +#endif // COMPILE_ETHERNET } const uint8_t *getMacAddress() @@ -3321,14 +3321,14 @@ const uint8_t *getMacAddress() #ifdef COMPILE_BT if (bluetoothState != BT_OFF) return btMACAddress; -#endif +#endif // COMPILE_BT #ifdef COMPILE_WIFI if (wifiState != WIFI_OFF) return wifiMACAddress; -#endif +#endif // COMPILE_WIFI #ifdef COMPILE_ETHERNET if ((online.ethernetStatus >= ETH_STARTED_CHECK_CABLE) && (online.ethernetStatus <= ETH_CONNECTED)) return ethernetMACAddress; -#endif +#endif // COMPILE_ETHERNET return zero; } diff --git a/Firmware/RTK_Surveyor/ESPNOW.ino b/Firmware/RTK_Surveyor/ESPNOW.ino index 9d34b6b49..4ca5f0f22 100644 --- a/Firmware/RTK_Surveyor/ESPNOW.ino +++ b/Firmware/RTK_Surveyor/ESPNOW.ino @@ -32,7 +32,7 @@ void espnowOnDataSent(const uint8_t *mac_addr, esp_now_send_status_t status) // else // systemPrintln("Delivery Fail"); } -#endif +#endif // COMPILE_ESPNOW // Callback when data is received void espnowOnDataReceived(const uint8_t *mac, const uint8_t *incomingData, int len) @@ -73,7 +73,7 @@ void espnowOnDataReceived(const uint8_t *mac, const uint8_t *incomingData, int l espnowIncomingRTCM = true; lastEspnowRssiUpdate = millis(); } -#endif +#endif // COMPILE_ESPNOW } // Callback for all RX Packets @@ -88,7 +88,7 @@ void promiscuous_rx_cb(void *buf, wifi_promiscuous_pkt_type_t type) const wifi_promiscuous_pkt_t *ppkt = (wifi_promiscuous_pkt_t *)buf; packetRSSI = ppkt->rx_ctrl.rssi; } -#endif +#endif // COMPILE_ESPNOW // If WiFi is already enabled, simply add the LR protocol // If the radio is off entirely, start the radio, turn on only the LR protocol @@ -188,7 +188,7 @@ void espnowStart() } systemPrintln("ESP-Now Started"); -#endif +#endif // COMPILE_ESPNOW } // If WiFi is already enabled, simply remove the LR protocol @@ -247,7 +247,7 @@ void espnowStop() wifiStart(); // Force WiFi to restart } -#endif +#endif // COMPILE_ESPNOW } // Start ESP-Now if needed, put ESP-Now into broadcast state @@ -300,7 +300,7 @@ bool espnowIsPaired() espnowSetState(ESPNOW_PAIRED); return (true); } -#endif +#endif // COMPILE_ESPNOW return (false); } @@ -321,9 +321,9 @@ esp_err_t espnowSendPairMessage(uint8_t *sendToMac) pairMessage.crc += wifiMACAddress[x]; return (esp_now_send(sendToMac, (uint8_t *)&pairMessage, sizeof(pairMessage))); // Send packet to given MAC -#else +#else // COMPILE_ESPNOW return (ESP_OK); -#endif +#endif // COMPILE_ESPNOW } // Add a given MAC address to the peer list @@ -349,9 +349,9 @@ esp_err_t espnowAddPeer(uint8_t *peerMac, bool encrypt) log_d("Failed to add peer: 0x%02X%02X%02X%02X%02X%02X", peerMac[0], peerMac[1], peerMac[2], peerMac[3], peerMac[4], peerMac[5]); return (result); -#else +#else // COMPILE_ESPNOW return (ESP_OK); -#endif +#endif // COMPILE_ESPNOW } // Remove a given MAC address from the peer list @@ -363,9 +363,9 @@ esp_err_t espnowRemovePeer(uint8_t *peerMac) log_d("Failed to remove peer: %s", esp_err_to_name(response)); return (response); -#else +#else // COMPILE_ESPNOW return (ESP_OK); -#endif +#endif // COMPILE_ESPNOW } // Update the state of the ESP Now state machine @@ -428,7 +428,7 @@ void espnowProcessRTCM(byte incoming) espnowOutgoingRTCM = true; } } -#endif +#endif // COMPILE_ESPNOW } // A blocking function that is used to pair two devices diff --git a/Firmware/RTK_Surveyor/FileSdFatMMC.h b/Firmware/RTK_Surveyor/FileSdFatMMC.h index ce284a624..f1eec63d6 100644 --- a/Firmware/RTK_Surveyor/FileSdFatMMC.h +++ b/Firmware/RTK_Surveyor/FileSdFatMMC.h @@ -7,11 +7,11 @@ class FileSdFatMMC : public SdFile, public File -#else +#else // COMPILE_SD_MMC class FileSdFatMMC : public SdFile -#endif +#endif // COMPILE_SD_MMC { public: @@ -22,7 +22,7 @@ class FileSdFatMMC : public SdFile #ifdef COMPILE_SD_MMC else _file = new File; -#endif +#endif // COMPILE_SD_MMC }; ~FileSdFatMMC() @@ -40,7 +40,7 @@ class FileSdFatMMC : public SdFile // if (_file) //operator bool // delete _file; } -#endif +#endif // COMPILE_SD_MMC }; operator bool() @@ -50,7 +50,7 @@ class FileSdFatMMC : public SdFile #ifdef COMPILE_SD_MMC else return _file; -#endif +#endif // COMPILE_SD_MMC return false; // Keep the compiler happy }; @@ -61,7 +61,7 @@ class FileSdFatMMC : public SdFile #ifdef COMPILE_SD_MMC else return _file->println(printMe); -#endif +#endif // COMPILE_SD_MMC return 0; // Keep the compiler happy }; @@ -86,7 +86,7 @@ class FileSdFatMMC : public SdFile return true; return false; } -#endif +#endif // COMPILE_SD_MMC return false; // Keep the compiler happy }; @@ -97,7 +97,7 @@ class FileSdFatMMC : public SdFile #ifdef COMPILE_SD_MMC else return _file->size(); -#endif +#endif // COMPILE_SD_MMC return 0; // Keep the compiler happy }; @@ -108,7 +108,7 @@ class FileSdFatMMC : public SdFile #ifdef COMPILE_SD_MMC else return _file->position(); -#endif +#endif // COMPILE_SD_MMC return 0; // Keep the compiler happy }; @@ -119,7 +119,7 @@ class FileSdFatMMC : public SdFile #ifdef COMPILE_SD_MMC else return _file->available(); -#endif +#endif // COMPILE_SD_MMC return 0; // Keep the compiler happy }; @@ -130,7 +130,7 @@ class FileSdFatMMC : public SdFile #ifdef COMPILE_SD_MMC else return _file->read(buf, nbyte); -#endif +#endif // COMPILE_SD_MMC return 0; // Keep the compiler happy }; @@ -141,7 +141,7 @@ class FileSdFatMMC : public SdFile #ifdef COMPILE_SD_MMC else return _file->write(buf, size); -#endif +#endif // COMPILE_SD_MMC return 0; // Keep the compiler happy }; @@ -152,7 +152,7 @@ class FileSdFatMMC : public SdFile #ifdef COMPILE_SD_MMC else _file->close(); -#endif +#endif // COMPILE_SD_MMC }; void flush() @@ -162,7 +162,7 @@ class FileSdFatMMC : public SdFile #ifdef COMPILE_SD_MMC else _file->flush(); -#endif +#endif // COMPILE_SD_MMC }; void updateFileAccessTimestamp() @@ -205,7 +205,7 @@ class FileSdFatMMC : public SdFile #ifdef COMPILE_SD_MMC else return _file->size(); -#endif +#endif // COMPILE_SD_MMC return 0; // Keep the compiler happy }; @@ -213,7 +213,7 @@ class FileSdFatMMC : public SdFile SdFile *_sdFile; #ifdef COMPILE_SD_MMC File *_file; -#endif +#endif // COMPILE_SD_MMC }; // Update the file access and write time with date and time obtained from GNSS diff --git a/Firmware/RTK_Surveyor/Form.ino b/Firmware/RTK_Surveyor/Form.ino index ea1b69b84..3d40c589f 100644 --- a/Firmware/RTK_Surveyor/Form.ino +++ b/Firmware/RTK_Surveyor/Form.ino @@ -288,8 +288,8 @@ void stopWebServer() log_d("Web Server Stopped"); reportHeapNow(); -#endif -#endif +#endif // COMPILE_AP +#endif // COMPILE_WIFI } #ifdef COMPILE_WIFI @@ -300,8 +300,8 @@ void notFound(AsyncWebServerRequest *request) systemPrintln(logmessage); request->send(404, "text/plain", "Not found"); } -#endif -#endif +#endif // COMPILE_AP +#endif // COMPILE_WIFI // Handler for firmware file downloads #ifdef COMPILE_WIFI @@ -332,7 +332,7 @@ static void handleFileManager(AsyncWebServerRequest *request) { fileExists = SD_MMC.exists(slashFileName); } -#endif +#endif // COMPILE_SD_MMC if (fileExists == false) { @@ -410,7 +410,7 @@ static void handleFileManager(AsyncWebServerRequest *request) #ifdef COMPILE_SD_MMC else SD_MMC.remove(slashFileName); -#endif +#endif // COMPILE_SD_MMC request->send(200, "text/plain", "Deleted File: " + String(fileName)); } else @@ -426,8 +426,8 @@ static void handleFileManager(AsyncWebServerRequest *request) request->send(400, "text/plain", "ERROR: name and action params required"); } } -#endif -#endif +#endif // COMPILE_AP +#endif // COMPILE_WIFI // Handler for firmware file upload #ifdef COMPILE_WIFI @@ -517,8 +517,8 @@ static void handleFirmwareFileUpload(AsyncWebServerRequest *request, String file } } } -#endif -#endif +#endif // COMPILE_AP +#endif // COMPILE_WIFI // Events triggered by web sockets #ifdef COMPILE_WIFI @@ -557,8 +557,8 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp else log_d("onWsEvent: unrecognised AwsEventType %d", type); } -#endif -#endif +#endif // COMPILE_AP +#endif // COMPILE_WIFI // Create a csv string with current settings void createSettingsString(char *newSettings) @@ -729,7 +729,7 @@ void createSettingsString(char *newSettings) #ifdef COMPILE_L_BAND int daysRemaining = daysFromEpoch(settings.pointPerfectNextKeyStart + settings.pointPerfectNextKeyDuration + 1); snprintf(apDaysRemaining, sizeof(apDaysRemaining), "%d", daysRemaining); -#endif +#endif // COMPILE_L_BAND } else snprintf(apDaysRemaining, sizeof(apDaysRemaining), "No Keys"); @@ -965,7 +965,7 @@ void createSettingsString(char *newSettings) strcat(newSettings, "\0"); systemPrintf("newSettings len: %d\r\n", strlen(newSettings)); systemPrintf("newSettings: %s\r\n", newSettings); -#endif +#endif // COMPILE_AP } // Create a csv string with the dynamic data to update (current coordinates, battery level, etc) @@ -1026,7 +1026,7 @@ void createDynamicDataString(char *settingsCSV) } strcat(settingsCSV, "\0"); -#endif +#endif // COMPILE_AP } // Given a settingName, and string value, update a given setting @@ -1588,7 +1588,7 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr systemPrintf("Unknown '%s': %0.3lf\r\n", settingName, settingValue); } } // End last strcpy catch -#endif +#endif // COMPILE_AP } // Add record with int @@ -1702,7 +1702,7 @@ bool parseIncomingSettings() log_d("Sending receipt confirmation of settings"); #ifdef COMPILE_AP websocket->textAll("confirmDataReceipt,1,"); -#endif +#endif // COMPILE_AP } return (true); @@ -1780,7 +1780,7 @@ void getFileList(String &returnText) root.close(); } -#endif +#endif // COMPILE_SD_MMC xSemaphoreGive(sdCardSemaphore); } @@ -1942,5 +1942,5 @@ void handleUpload(AsyncWebServerRequest *request, String filename, size_t index, } } -#endif -#endif +#endif // COMPILE_AP +#endif // COMPILE_WIFI diff --git a/Firmware/RTK_Surveyor/NTRIPClient.h b/Firmware/RTK_Surveyor/NTRIPClient.h index e2eb2d03c..fb907d65e 100644 --- a/Firmware/RTK_Surveyor/NTRIPClient.h +++ b/Firmware/RTK_Surveyor/NTRIPClient.h @@ -2,7 +2,7 @@ // Remove all of NTRIPClient.h -#else +#else // COMPILE_WIFI || COMPILE_ETHERNET // Define a hybrid class which can support both WiFiClient and EthernetClient // Build the Class according to WiFi and Ethernet compile guards @@ -19,7 +19,7 @@ class NTRIPClient : public EthernetClient class NTRIPClient : public WiFiClient -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET { public: @@ -45,7 +45,7 @@ class NTRIPClient : public WiFiClient { _ntripClientWiFi = new WiFiClient; } -#endif +#endif // COMPILE_ETHERNET || COMPILE_WIFI }; ~NTRIPClient() @@ -74,7 +74,7 @@ class NTRIPClient : public WiFiClient // EthernetClient does not have a destructor. It is virtual. delete _ntripClientWiFi; _ntripClientWiFi = nullptr; -#endif +#endif // COMPILE_ETHERNET || COMPILE_WIFI }; operator bool() @@ -91,7 +91,7 @@ class NTRIPClient : public WiFiClient return false; #elif defined(COMPILE_WIFI) return _ntripClientWiFi; -#endif +#endif // COMPILE_ETHERNET || COMPILE_WIFI }; int connect(const char *host, uint16_t port) @@ -108,7 +108,7 @@ class NTRIPClient : public WiFiClient return 0; #elif defined(COMPILE_WIFI) return _ntripClientWiFi->connect(host, port); -#endif +#endif // COMPILE_ETHERNET || COMPILE_WIFI }; size_t write(uint8_t b) @@ -125,7 +125,7 @@ class NTRIPClient : public WiFiClient return 0; #elif defined(COMPILE_WIFI) return _ntripClientWiFi->write(b); -#endif +#endif // COMPILE_ETHERNET || COMPILE_WIFI }; size_t write(const uint8_t *buf, size_t size) @@ -142,7 +142,7 @@ class NTRIPClient : public WiFiClient return 0; #elif defined(COMPILE_WIFI) return _ntripClientWiFi->write(buf, size); -#endif +#endif // COMPILE_ETHERNET || COMPILE_WIFI }; int available() @@ -159,7 +159,7 @@ class NTRIPClient : public WiFiClient return 0; #elif defined(COMPILE_WIFI) return _ntripClientWiFi->available(); -#endif +#endif // COMPILE_ETHERNET || COMPILE_WIFI }; int read(uint8_t *buf, size_t size) @@ -176,7 +176,7 @@ class NTRIPClient : public WiFiClient return 0; #elif defined(COMPILE_WIFI) return _ntripClientWiFi->read(); -#endif +#endif // COMPILE_ETHERNET || COMPILE_WIFI }; int read() @@ -193,7 +193,7 @@ class NTRIPClient : public WiFiClient return 0; #elif defined(COMPILE_WIFI) return _ntripClientWiFi->read(); -#endif +#endif // COMPILE_ETHERNET || COMPILE_WIFI }; void stop() @@ -210,7 +210,7 @@ class NTRIPClient : public WiFiClient return; #elif defined(COMPILE_WIFI) _ntripClientWiFi->stop(); -#endif +#endif // COMPILE_ETHERNET || COMPILE_WIFI }; uint8_t connected() @@ -227,7 +227,7 @@ class NTRIPClient : public WiFiClient return 0; #elif defined(COMPILE_WIFI) return _ntripClientWiFi->connected(); -#endif +#endif // COMPILE_ETHERNET || COMPILE_WIFI }; size_t print(const char *printMe) @@ -244,17 +244,17 @@ class NTRIPClient : public WiFiClient return 0; #elif defined(COMPILE_WIFI) return _ntripClientWiFi->print(printMe); -#endif +#endif // COMPILE_ETHERNET || COMPILE_WIFI }; protected: bool _useWiFiNotEthernet; #if defined(COMPILE_WIFI) WiFiClient *_ntripClientWiFi; -#endif +#endif // COMPILE_WIFI #if defined(COMPILE_ETHERNET) EthernetClient *_ntripClientEthernet; -#endif +#endif // COMPILE_ETHERNET }; -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET diff --git a/Firmware/RTK_Surveyor/NVM.ino b/Firmware/RTK_Surveyor/NVM.ino index 98b6c8806..6e7c99f7c 100644 --- a/Firmware/RTK_Surveyor/NVM.ino +++ b/Firmware/RTK_Surveyor/NVM.ino @@ -137,7 +137,7 @@ void recordSystemSettingsToFileSD(char *fileName) settingsFile.close(); } -#endif +#endif // COMPILE_SD_MMC log_d("Settings recorded to SD: %s", fileName); } @@ -551,7 +551,7 @@ bool loadSystemSettingsFromFileSD(char *fileName, Settings *settings) status = true; break; } -#endif +#endif // COMPILE_SD_MMC } // End Semaphore check else { diff --git a/Firmware/RTK_Surveyor/NtripClient.ino b/Firmware/RTK_Surveyor/NtripClient.ino index af55c0764..d25499f07 100644 --- a/Firmware/RTK_Surveyor/NtripClient.ino +++ b/Firmware/RTK_Surveyor/NtripClient.ino @@ -64,7 +64,7 @@ static const int NTRIPCLIENT_MS_BETWEEN_GGA = 5000; // 5s between transmission o // The WiFi / Ethernet connection to the NTRIP caster to obtain RTCM data. #if defined(COMPILE_WIFI) || defined(COMPILE_ETHERNET) static NTRIPClient *ntripClient; -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET // Throttle the time between connection attempts // ms - Max of 4,294,967,295 or 4.3M seconds or 71,000 minutes or 1193 hours or 49 days between attempts @@ -157,9 +157,9 @@ bool ntripClientConnect() ntripClient->write((const uint8_t *)serverRequest, strlen(serverRequest)); ntripClientTimer = millis(); return true; -#else +#else //! COMPILE_WIFI || COMPILE_ETHERNET return false; -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET } // Determine if another connection is possible or if the limit has been reached @@ -198,9 +198,9 @@ int ntripClientReceiveDataAvailable() { #if defined(COMPILE_WIFI) || defined(COMPILE_ETHERNET) return ntripClient->available(); -#else +#else //! COMPILE_WIFI || COMPILE_ETHERNET return 0; -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET } // Read the response from the NTRIP client @@ -217,7 +217,7 @@ void ntripClientResponse(char *response, size_t maxLength) { *response++ = ntripClient->read(); } -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET // Zero terminate the response *response = '\0'; @@ -281,9 +281,9 @@ void ntripClientStart() } ntripClientConnectionAttempts = 0; -#else +#else //! COMPILE_WIFI || COMPILE_ETHERNET systemPrintln("NTRIP Client not available: Ethernet and WiFi not compiled"); -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET } // Stop the NTRIP client @@ -325,7 +325,7 @@ void ntripClientStop(bool wifiClientAllocated) ntripClientSetState((ntripClient && (wifiClientAllocated == false)) ? NTRIP_CLIENT_ON : NTRIP_CLIENT_OFF); online.ntripClient = false; wifiIncomingRTCM = false; -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET } // Determine if NTRIP Client is needed @@ -566,7 +566,7 @@ void ntripClientUpdate() ntripClientSetState(NTRIP_CLIENT_CONNECTED); } } -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET break; case NTRIP_CLIENT_CONNECTED: @@ -615,7 +615,7 @@ void ntripClientUpdate() systemPrintf("NTRIP Client received %d RTCM bytes, pushed to ZED\r\n", rtcmCount); } } -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET break; } } @@ -637,5 +637,5 @@ void pushGPGGA(NMEA_GGA_data_t *nmeaData) ntripClient->print((const char *)nmeaData->nmea); } } -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET } diff --git a/Firmware/RTK_Surveyor/NtripServer.ino b/Firmware/RTK_Surveyor/NtripServer.ino index 74b1357a2..f929b4c60 100644 --- a/Firmware/RTK_Surveyor/NtripServer.ino +++ b/Firmware/RTK_Surveyor/NtripServer.ino @@ -62,7 +62,7 @@ static const int MAX_NTRIP_SERVER_CONNECTION_ATTEMPTS = 30; // WiFi connection used to push RTCM to NTRIP caster over WiFi #if defined(COMPILE_WIFI) || defined(COMPILE_ETHERNET) static NTRIPClient *ntripServer; -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET // Count of bytes sent by the NTRIP server to the NTRIP caster uint32_t ntripServerBytesSent = 0; @@ -118,9 +118,9 @@ bool ntripServerConnectCaster() // Send the authorization credentials to the NTRIP caster ntripServer->write((const uint8_t *)serverBuffer, strlen(serverBuffer)); return true; -#else +#else // COMPILE_WIFI || COMPILE_ETHERNET return false; -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET } // Determine if the connection limit has been reached @@ -164,7 +164,7 @@ void ntripServerResponse(char *response, size_t maxLength) // Read bytes from the caster and store them while ((response < responseEnd) && ntripServer->available()) *response++ = ntripServer->read(); -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET // Zero terminate the response *response = '\0'; @@ -264,7 +264,7 @@ void ntripServerProcessRTCM(uint8_t incoming) ntripServerSetState(NTRIP_SERVER_CONNECTING); rtcmParsingState = RTCM_TRANSPORT_STATE_WAIT_FOR_PREAMBLE_D3; } -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET } // Start the NTRIP server @@ -289,9 +289,9 @@ void ntripServerStart() } ntripServerConnectionAttempts = 0; -#else +#else // COMPILE_WIFI || COMPILE_ETHERNET systemPrintln("NTRIP Server not available: Ethernet and WiFi not compiled"); -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET } // Stop the NTRIP server @@ -324,7 +324,7 @@ void ntripServerStop(bool wifiClientAllocated) // Determine the next NTRIP server state ntripServerSetState((ntripServer && (wifiClientAllocated == false)) ? NTRIP_SERVER_ON : NTRIP_SERVER_OFF); -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET online.ntripServer = false; } @@ -552,7 +552,7 @@ void ntripServerUpdate() ntripServerSetState(NTRIP_SERVER_CASTING); } } -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET break; // NTRIP server authorized to send RTCM correction data to NTRIP caster case NTRIP_SERVER_CASTING: @@ -575,7 +575,7 @@ void ntripServerUpdate() // All is well cyclePositionLEDs(); } -#endif +#endif // COMPILE_WIFI || COMPILE_ETHERNET break; } } diff --git a/Firmware/RTK_Surveyor/RTK_Surveyor.ino b/Firmware/RTK_Surveyor/RTK_Surveyor.ino index 296537533..32e8757a6 100644 --- a/Firmware/RTK_Surveyor/RTK_Surveyor.ino +++ b/Firmware/RTK_Surveyor/RTK_Surveyor.ino @@ -33,13 +33,13 @@ #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 +#endif // ENABLE_DEVELOPER // This is passed in from compiler extra flags #ifndef POINTPERFECT_TOKEN #define FIRMWARE_VERSION_MAJOR 99 #define FIRMWARE_VERSION_MINOR 99 -#endif +#endif // POINTPERFECT_TOKEN // Define the RTK board identifier: // This is an int which is unique to this variant of the RTK Surveyor hardware which allows us @@ -200,7 +200,7 @@ char logFileName[sizeof("SFE_Reference_Station_230101_120101.ubx_plusExtraSpace" #include "esp_wifi.h" //Needed for esp_wifi_set_protocol() -#endif +#endif // COMPILE_WIFI #include "base64.h" //Built-in. Needed for NTRIP Client credential encoding. @@ -382,7 +382,7 @@ float battChangeRate = 0.0; #ifdef COMPILE_BT // See bluetoothSelect.h for implemenation #include "bluetoothSelect.h" -#endif +#endif // COMPILE_BT char platformPrefix[55] = "Surveyor"; // Sets the prefix for broadcast names @@ -479,8 +479,8 @@ AsyncWebSocket *websocket = nullptr; char *settingsCSV = nullptr; // Push large array onto heap -#endif -#endif +#endif // COMPILE_AP +#endif // COMPILE_WIFI // Because the incoming string is longer than max len, there are multiple callbacks so we // use a global to combine the incoming @@ -495,7 +495,7 @@ unsigned long lastDynamicDataUpdate = 0; //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #if __has_include("tokens.h") #include "tokens.h" -#endif +#endif // __has_include("tokens.h") float lBandEBNO = 0.0; // Used on system status menu //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -515,7 +515,7 @@ uint8_t receivedMAC[6]; // Holds the broadcast MAC during pairing int packetRSSI = 0; unsigned long lastEspnowRssiUpdate = 0; -#endif +#endif // COMPILE_ESPNOW int espnowRSSI = 0; const uint8_t ESPNOW_MAX_PEERS = 5; // Maximum of 5 rovers @@ -547,7 +547,7 @@ uint32_t lastLoggedNTPRequest = 0; bool ntpLogIncreasing = false; #include "SparkFun_WebServer_ESP32_W5500.h" //http://librarymanager/All#SparkFun_WebServer_ESP32_W5500 v1.5.5 -#endif +#endif // COMPILE_ETHERNET unsigned long lastEthernetCheck = 0; // Prevents cable checking from continually happening volatile bool ethernetTcpConnected = false; @@ -753,7 +753,7 @@ void initializeGlobals() #ifdef COMPILE_ETHERNET ethernetNtpTv.tv_sec = 0; ethernetNtpTv.tv_usec = 0; -#endif +#endif // COMPILE_ETHERNET } //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -1195,7 +1195,7 @@ void updateRadio() espnowRSSI = -255; } } -#endif +#endif // COMPILE_ESPNOW } // Record who is holding the semaphore diff --git a/Firmware/RTK_Surveyor/States.ino b/Firmware/RTK_Surveyor/States.ino index b68e956ba..1cf05dfae 100644 --- a/Firmware/RTK_Surveyor/States.ino +++ b/Firmware/RTK_Surveyor/States.ino @@ -483,7 +483,7 @@ void updateSystemState() { marksFileExists = SD_MMC.exists(fileName); } -#endif +#endif // COMPILE_SD_MMC // Open the marks file FileSdFatMMC marksFile; @@ -678,8 +678,8 @@ void updateSystemState() websocket->textAll(settingsCSV); } } -#endif -#endif +#endif // COMPILE_AP +#endif // COMPILE_WIFI } break; @@ -941,9 +941,9 @@ void updateSystemState() espnowBeginPairing(); changeState(STATE_ESPNOW_PAIRING); -#else +#else // COMPILE_ESPNOW changeState(STATE_ROVER_NOT_STARTED); -#endif +#endif // COMPILE_ESPNOW } break; @@ -1098,8 +1098,8 @@ void updateSystemState() websocket->textAll(settingsCSV); } } -#endif -#endif +#endif // COMPILE_AP +#endif // COMPILE_WIFI } break; @@ -1115,7 +1115,7 @@ void updateSystemState() ESP.restart(); } break; -#endif +#endif // COMPILE_ETHERNET case (STATE_SHUTDOWN): { forceDisplayUpdate = true; diff --git a/Firmware/RTK_Surveyor/System.ino b/Firmware/RTK_Surveyor/System.ino index f80654d0e..87e86767b 100644 --- a/Firmware/RTK_Surveyor/System.ino +++ b/Firmware/RTK_Surveyor/System.ino @@ -15,7 +15,7 @@ bool configureUbloxModule() if (ENABLE_DEVELOPER && productVariant == REFERENCE_STATION) theGNSS.enableDebugging(serialGNSS); // Output all debug messages over serialGNSS else -#endif +#endif // REF_STN_GNSS_DEBUG theGNSS.enableDebugging(Serial, true); // Enable only the critical debug messages over Serial } else @@ -430,7 +430,7 @@ bool createTestFile() SD_MMC.remove(testFileName); return (!SD_MMC.exists(testFileName)); } -#endif +#endif // COMPILE_SD_MMC return (false); } diff --git a/Firmware/RTK_Surveyor/Tasks.ino b/Firmware/RTK_Surveyor/Tasks.ino index 01c331f73..8b56df1f9 100644 --- a/Firmware/RTK_Surveyor/Tasks.ino +++ b/Firmware/RTK_Surveyor/Tasks.ino @@ -1222,7 +1222,7 @@ void sdSizeCheckTask(void *e) sdCardSize = SD_MMC.cardSize(); sdFreeSpace = SD_MMC.totalBytes() - SD_MMC.usedBytes(); } -#endif +#endif // COMPILE_SD_MMC xSemaphoreGive(sdCardSemaphore); diff --git a/Firmware/RTK_Surveyor/W5500.ino b/Firmware/RTK_Surveyor/W5500.ino index 6ff9bead5..d4cb7ccd1 100644 --- a/Firmware/RTK_Surveyor/W5500.ino +++ b/Firmware/RTK_Surveyor/W5500.ino @@ -146,4 +146,4 @@ void w5500EnableSocketInterrupt(uint8_t sockIndex) w5500write(SPI, pin_Ethernet_CS, w5500SIMR, w5500CommonRegister, &SIMR, 1); // Enable the socket interrupt } -#endif +#endif // COMPILE_ETHERNET diff --git a/Firmware/RTK_Surveyor/WiFi.ino b/Firmware/RTK_Surveyor/WiFi.ino index 6f1928ea2..6bd7dfe88 100644 --- a/Firmware/RTK_Surveyor/WiFi.ino +++ b/Firmware/RTK_Surveyor/WiFi.ino @@ -379,9 +379,9 @@ bool wifiIsConnected() wifiPeriodicallyDisplayIpAddress(); return isConnected; -#else +#else // COMPILE_WIFI return false; -#endif +#endif // COMPILE_WIFI } // Attempts a connection to all provided SSIDs @@ -463,7 +463,7 @@ bool wifiConnect(unsigned long timeout) else systemPrintf("WiFi failed to connect: error #%d. ", wifiResponse); -#endif +#endif // COMPILE_WIFI return false; } @@ -741,7 +741,7 @@ void tcpUpdate() } } -#endif +#endif // COMPILE_WIFI } void wifiPrintNetworkInfo() @@ -771,7 +771,7 @@ void wifiPrintNetworkInfo() systemPrint(" DNS 3: "); systemPrintln(WiFi.dnsIP(2)); systemPrintln(); -#endif +#endif // COMPILE_WIFI } // Returns true if unit is in config mode diff --git a/Firmware/RTK_Surveyor/bluetoothSelect.h b/Firmware/RTK_Surveyor/bluetoothSelect.h index e465e5e44..fc13ccc69 100644 --- a/Firmware/RTK_Surveyor/bluetoothSelect.h +++ b/Firmware/RTK_Surveyor/bluetoothSelect.h @@ -162,4 +162,4 @@ class BTLESerial : public virtual BTSerialInterface, public BleSerial esp_spp_cb_t *connectionCallback; }; -#endif +#endif // COMPILE_BT diff --git a/Firmware/RTK_Surveyor/menuBase.ino b/Firmware/RTK_Surveyor/menuBase.ino index 77d8df9fa..97cb046fa 100644 --- a/Firmware/RTK_Surveyor/menuBase.ino +++ b/Firmware/RTK_Surveyor/menuBase.ino @@ -750,7 +750,7 @@ bool getFileLineSD(const char *fileName, int lineToFind, char *lineData, int lin file.close(); } -#endif +#endif // COMPILE_SD_MMC break; } // End Semaphore check else @@ -821,7 +821,7 @@ bool removeFileSD(const char *fileName) removed = true; } } -#endif +#endif // COMPILE_SD_MMC break; } // End Semaphore check diff --git a/Firmware/RTK_Surveyor/menuEthernet.ino b/Firmware/RTK_Surveyor/menuEthernet.ino index 2cb6ebdd6..ed9ae3af6 100644 --- a/Firmware/RTK_Surveyor/menuEthernet.ino +++ b/Firmware/RTK_Surveyor/menuEthernet.ino @@ -152,7 +152,7 @@ void beginEthernetNTPServer() w5500EnableSocketInterrupt(ntpSockIndex); // Enable the RECV interrupt for the desired socket index online.ethernetNTPServer = true; } -#endif +#endif // COMPILE_ETHERNET } void endEthernetNTPServer() @@ -218,7 +218,7 @@ void updateEthernet() // nothing happened break; } -#endif +#endif // COMPILE_ETHERNET } void updateEthernetNTPServer() @@ -295,7 +295,7 @@ void updateEthernetNTPServer() { ntpFileExists = SD_MMC.exists(fileName); } -#endif +#endif // COMPILE_SD_MMC // Open the NTP file FileSdFatMMC ntpFile; @@ -348,7 +348,7 @@ void updateEthernetNTPServer() if (millis() > (lastLoggedNTPRequest + 5000)) ntpLogIncreasing = false; -#endif +#endif // COMPILE_ETHERNET } // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -486,7 +486,7 @@ void tcpUpdateEthernet() online.tcpClientEthernet = false; } -#endif +#endif // COMPILE_ETHERNET } // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -509,14 +509,14 @@ void startEthernerWebServerESP32W5500() if (ETH.linkUp()) ESP32_W5500_waitForConnect(); -#endif +#endif // COMPILE_ETHERNET } void endEthernerWebServerESP32W5500() { #ifdef COMPILE_ETHERNET ETH.end(); // This is _really_ important. It undoes the low-level changes to SPI and interrupts -#endif +#endif // COMPILE_ETHERNET } // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- @@ -532,7 +532,7 @@ void ethernetISR() // Do it in updateEthernet gettimeofday((timeval *)ðernetNtpTv, NULL); // Record the time of the NTP interrupt } -#endif +#endif // COMPILE_ETHERNET void menuEthernet() { diff --git a/Firmware/RTK_Surveyor/menuFirmware.ino b/Firmware/RTK_Surveyor/menuFirmware.ino index 0647a7dcd..7a9e089b1 100644 --- a/Firmware/RTK_Surveyor/menuFirmware.ino +++ b/Firmware/RTK_Surveyor/menuFirmware.ino @@ -291,7 +291,7 @@ void scanForFirmware() tempFile = dir.openNextFile(); } } -#endif +#endif // COMPILE_SD_MMC } // Look for firmware file on SD card and update as needed @@ -343,7 +343,7 @@ void updateFromSD(const char *firmwareFileName) return; } } -#endif +#endif // COMPILE_SD_MMC FileSdFatMMC firmwareFile; firmwareFile.open(firmwareFileName, O_READ); @@ -438,7 +438,7 @@ void updateFromSD(const char *firmwareFileName) #ifdef COMPILE_SD_MMC else SD_MMC.remove(firmwareFileName); -#endif +#endif // COMPILE_SD_MMC theGNSS.factoryDefault(); // Reset everything: baud rate, I2C address, update rate, everything. And save // to BBR. @@ -533,7 +533,7 @@ bool otaCheckVersion(char *versionAvailable, uint8_t versionAvailableLength) if (gotVersion == true) log_d("Available OTA firmware version: %s\r\n", versionAvailable); -#endif +#endif // COMPILE_WIFI return (gotVersion); } @@ -571,7 +571,7 @@ void otaUpdate() #ifdef COMPILE_AP // Tell AP page to display reset info websocket->textAll("confirmReset,1,"); -#endif +#endif // COMPILE_AP } ESP.restart(); } @@ -597,7 +597,7 @@ void otaUpdate() if (previouslyConnected == false) wifiStop(); -#endif +#endif // COMPILE_WIFI } // Called while the OTA Pull update is happening @@ -628,7 +628,7 @@ void otaPullCallback(int bytesWritten, int totalLength) char myProgress[50]; snprintf(myProgress, sizeof(myProgress), "otaFirmwareStatus,%d,", percent); websocket->textAll(myProgress); -#endif +#endif // COMPILE_AP } previousPercent = percent; @@ -661,7 +661,7 @@ const char *otaPullErrorText(int code) return "Unexpected HTTP response code"; break; } -#endif +#endif // COMPILE_WIFI return "Unknown error"; } diff --git a/Firmware/RTK_Surveyor/menuMain.ino b/Firmware/RTK_Surveyor/menuMain.ino index 470c84e22..48f066602 100644 --- a/Firmware/RTK_Surveyor/menuMain.ino +++ b/Firmware/RTK_Surveyor/menuMain.ino @@ -37,9 +37,9 @@ void menuMain() systemPrint("** Bluetooth broadcasting as: "); systemPrint(deviceName); systemPrintln(" **"); -#else +#else // COMPILE_BT systemPrintln("** Bluetooth Not Compiled **"); -#endif +#endif // COMPILE_BT systemPrintln("Menu: Main"); @@ -58,9 +58,9 @@ void menuMain() #ifdef COMPILE_WIFI systemPrintln("6) Configure WiFi"); -#else +#else // COMPILE_WIFI systemPrintln("6) **WiFi Not Compiled**"); -#endif +#endif // COMPILE_WIFI #ifdef COMPILE_ETHERNET if (HAS_ETHERNET) @@ -68,15 +68,15 @@ void menuMain() systemPrintln("e) Configure Ethernet"); systemPrintln("n) Configure NTP"); } -#endif +#endif // COMPILE_ETHERNET systemPrintln("p) Configure User Profiles"); #ifdef COMPILE_ESPNOW systemPrintln("r) Configure Radios"); -#else +#else // COMPILE_ESPNOW systemPrintln("r) **ESP-Now Not Compiled**"); -#endif +#endif // COMPILE_ESPNOW if (online.lband == true) systemPrintln("P) Configure PointPerfect"); @@ -119,7 +119,7 @@ void menuMain() #ifdef COMPILE_ESPNOW else if (incoming == 'r') menuRadio(); -#endif +#endif // COMPILE_ESPNOW else if (incoming == 'f') menuFirmware(); else if (incoming == 'b') @@ -262,7 +262,7 @@ void menuUserProfiles() if (SD_MMC.exists(settingsFileName)) SD_MMC.remove(settingsFileName); } -#endif +#endif // COMPILE_SD_MMC } recordProfileNumber(0); // Move to Profile1 @@ -363,7 +363,7 @@ void factoryReset() SD_MMC.remove(stationCoordinateECEFFileName); // Remove station files SD_MMC.remove(stationCoordinateGeodeticFileName); } -#endif +#endif // COMPILE_SD_MMC xSemaphoreGive(sdCardSemaphore); } // End sdCardSemaphore @@ -512,5 +512,5 @@ void menuRadio() radioStart(); clearBuffer(); // Empty buffer of any newline chars -#endif +#endif // COMPILE_ESPNOW } diff --git a/Firmware/RTK_Surveyor/menuMessages.ino b/Firmware/RTK_Surveyor/menuMessages.ino index 70927da04..b22ce8cdd 100644 --- a/Firmware/RTK_Surveyor/menuMessages.ino +++ b/Firmware/RTK_Surveyor/menuMessages.ino @@ -796,7 +796,7 @@ bool findLastLog(char *lastLogNamePrt, size_t lastLogNameSize) } } } -#endif +#endif // COMPILE_SD_MMC xSemaphoreGive(sdCardSemaphore); } diff --git a/Firmware/RTK_Surveyor/menuPP.ino b/Firmware/RTK_Surveyor/menuPP.ino index 668eaa39e..588df7f68 100644 --- a/Firmware/RTK_Surveyor/menuPP.ino +++ b/Firmware/RTK_Surveyor/menuPP.ino @@ -12,7 +12,7 @@ static SFE_UBLOX_GNSS_SUPER i2cLBand; // NEO-D9S #ifndef POINTPERFECT_TOKEN #define POINTPERFECT_TOKEN \ 0xAA, 0xBB, 0xCC, 0xDD, 0x00, 0x11, 0x22, 0x33, 0x0A, 0x0B, 0x0C, 0x0D, 0x00, 0x01, 0x02, 0x03 -#endif +#endif // POINTPERFECT_TOKEN static uint8_t pointPerfectTokenArray[16] = {POINTPERFECT_TOKEN}; // Token in HEX form @@ -196,7 +196,7 @@ bool pointperfectProvisionDevice() // Override ID with testing ID snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X%02X%02X%02X", whitelistID[0], whitelistID[1], whitelistID[2], whitelistID[3], whitelistID[4], whitelistID[5]); -#endif +#endif // WHITELISTED_ID char givenName[100]; snprintf(givenName, sizeof(givenName), "SparkFun RTK %s v%d.%d - %s", platformPrefix, FIRMWARE_VERSION_MAJOR, @@ -317,9 +317,9 @@ bool pointperfectProvisionDevice() bluetoothStart(); return (retVal); -#else +#else // COMPILE_WIFI return (false); -#endif +#endif // COMPILE_WIFI } // Subscribe to MQTT channel, grab keys, then stop @@ -445,9 +445,9 @@ bool pointperfectUpdateKeys() // Return the key status return (gotKeys); -#else +#else // COMPILE_WIFI return (false); -#endif +#endif // COMPILE_WIFI } char *ltrim(char *s) diff --git a/Firmware/RTK_Surveyor/menuSystem.ino b/Firmware/RTK_Surveyor/menuSystem.ino index e0eb46093..c23a3a27b 100644 --- a/Firmware/RTK_Surveyor/menuSystem.ino +++ b/Firmware/RTK_Surveyor/menuSystem.ino @@ -82,7 +82,7 @@ void menuSystem() wifiMACAddress[3], wifiMACAddress[4], wifiMACAddress[5]); if (wifiState == WIFI_CONNECTED) wifiDisplayIpAddress(); -#endif +#endif // COMPILE_WIFI #ifdef COMPILE_ETHERNET if (HAS_ETHERNET) @@ -107,7 +107,7 @@ void menuSystem() systemPrintf("%s\r\n", settings.ethernetSubnet.toString()); } } -#endif +#endif // COMPILE_ETHERNET // Display the uptime uint64_t uptimeMilliseconds = millis(); @@ -684,7 +684,7 @@ void menuDebug() if (ENABLE_DEVELOPER && productVariant == REFERENCE_STATION) theGNSS.enableDebugging(serialGNSS); // Output all debug messages over serialGNSS else -#endif +#endif // REF_STN_GNSS_DEBUG theGNSS.enableDebugging(Serial, true); // Enable only the critical debug messages over Serial } else @@ -1127,7 +1127,7 @@ void printFileList() if (fileCount == 0) systemPrintln("No files found"); } -#endif +#endif // COMPILE_SD_MMC } else { diff --git a/Firmware/RTK_Surveyor/settings.h b/Firmware/RTK_Surveyor/settings.h index 0132d7bd1..bc325fe79 100644 --- a/Firmware/RTK_Surveyor/settings.h +++ b/Firmware/RTK_Surveyor/settings.h @@ -988,5 +988,5 @@ o/ufQJVtMVT8QtPHRh8jrdkPSHCa2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU rqXRfboQnoZsG4q5WTP468SQvvG5 -----END CERTIFICATE----- )====="; -#endif -#endif +#endif // COMPILE_L_BAND +#endif // COMPILE_WIFI