From 7ab9de2cc76c5e058f92da235696ed4e36545e17 Mon Sep 17 00:00:00 2001 From: Aadi Desai <21363892+supleed2@users.noreply.github.com> Date: Wed, 9 Jun 2021 18:33:37 +0100 Subject: [PATCH] Tidy up main.cpp formatting Regions allow for Code Folding --- Control/src/main.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Control/src/main.cpp b/Control/src/main.cpp index 245331e..87707e7 100644 --- a/Control/src/main.cpp +++ b/Control/src/main.cpp @@ -1,3 +1,4 @@ +#pragma region Includes #include #include // #include Software Serial not currently needed @@ -9,29 +10,36 @@ #include #include #include +#pragma endregion -// Enable extra debugging info +#pragma region Enable extra debugging info for ESP32 #undef LOG_LOCAL_LEVEL #define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE #include "esp_log.h" +#pragma endregion +#pragma region Definitions eg pins #define RX1pin 14 // Pin 10 on expansion board, UART1 #define TX1pin 4 // Pin 11 on expansion board, UART1 +#pragma endregion -// Function Declarations +#pragma region Function Declarations void printFPGAoutput(); void returnSensorData(); void notFound(AsyncWebServerRequest *request); void webSocketEvent(uint8_t num, WStype_t type, uint8_t *payload, size_t length); +#pragma endregion -// Global objects +#pragma region Global objects AsyncWebServer webserver(80); WebSocketsServer websocketserver(81); Ticker ticker; +#pragma endregion -// Global variables +#pragma region Global variables float battery_voltage = 4.0f; int distance_travelled = 0; +#pragma endregion void setup() {