supleed2/ELEC50003-P1-CW
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC50003-P1-CW.git synced 2024-09-19 20:16:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up main.cpp formatting

Browse source 
Regions allow for Code Folding
This commit is contained in:
Aadi Desai 2021-06-09 18:33:37 +01:00
parent 5411a247bc
commit 7ab9de2cc7
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Control/src/main.cpp
View file

@ -1,3 +1,4 @@
#pragma region Includes
#include <Arduino.h> #include <Arduino.h>
#include <string> #include <string>
// #include <SoftwareSerial.h> Software Serial not currently needed // #include <SoftwareSerial.h> Software Serial not currently needed
@ -9,29 +10,36 @@
#include <credentials.h> #include <credentials.h>
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <SPIFFS.h> #include <SPIFFS.h>
#pragma endregion
// Enable extra debugging info #pragma region Enable extra debugging info for ESP32
#undef LOG_LOCAL_LEVEL #undef LOG_LOCAL_LEVEL
#define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE #define LOG_LOCAL_LEVEL ESP_LOG_VERBOSE
#include "esp_log.h" #include "esp_log.h"
#pragma endregion
#pragma region Definitions eg pins
#define RX1pin 14 // Pin 10 on expansion board, UART1 #define RX1pin 14 // Pin 10 on expansion board, UART1
#define TX1pin 4 // Pin 11 on expansion board, UART1 #define TX1pin 4 // Pin 11 on expansion board, UART1
#pragma endregion
// Function Declarations #pragma region Function Declarations
void printFPGAoutput(); void printFPGAoutput();
void returnSensorData(); void returnSensorData();
void notFound(AsyncWebServerRequest *request); void notFound(AsyncWebServerRequest *request);
void webSocketEvent(uint8_t num, WStype_t type, uint8_t *payload, size_t length); 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); AsyncWebServer webserver(80);
WebSocketsServer websocketserver(81); WebSocketsServer websocketserver(81);
Ticker ticker; Ticker ticker;
#pragma endregion
// Global variables #pragma region Global variables
float battery_voltage = 4.0f; float battery_voltage = 4.0f;
int distance_travelled = 0; int distance_travelled = 0;
#pragma endregion
void setup() void setup()
{ {