From c82183b46ad2b8a543fc32fb55f04a964cf36ba0 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 11 Feb 2024 00:06:51 +0200 Subject: [PATCH] Fix compilation error --- Software/Software.ino | 2 -- Software/src/devboard/utils/events.cpp | 2 -- Software/src/devboard/webserver/cellmonitor_html.h | 3 +++ Software/src/devboard/webserver/settings_html.h | 2 ++ 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Software/Software.ino b/Software/Software.ino index df20927a..c038af2f 100644 --- a/Software/Software.ino +++ b/Software/Software.ino @@ -130,9 +130,7 @@ void setup() { init_webserver(); #endif -#ifdef EVENTLOGGING init_events(); -#endif init_CAN(); diff --git a/Software/src/devboard/utils/events.cpp b/Software/src/devboard/utils/events.cpp index ee2d79f5..18f8da4a 100644 --- a/Software/src/devboard/utils/events.cpp +++ b/Software/src/devboard/utils/events.cpp @@ -30,7 +30,6 @@ void init_events(void) { } void set_event(EVENTS_ENUM_TYPE event, uint8_t data) { -#ifdef EVENTLOGGING if (event >= EVENT_NOF_EVENTS) { event = EVENT_UNKNOWN_EVENT_SET; } @@ -42,7 +41,6 @@ void set_event(EVENTS_ENUM_TYPE event, uint8_t data) { Serial.println("Set event: " + String(get_event_enum_string(event)) + ". Has occured " + String(entries[event].occurences) + " times"); #endif -#endif } void update_event_timestamps(void) { diff --git a/Software/src/devboard/webserver/cellmonitor_html.h b/Software/src/devboard/webserver/cellmonitor_html.h index ce7972ad..0a3d4aa9 100644 --- a/Software/src/devboard/webserver/cellmonitor_html.h +++ b/Software/src/devboard/webserver/cellmonitor_html.h @@ -1,6 +1,9 @@ #ifndef CELLMONITOR_H #define CELLMONITOR_H +#include +#include + extern uint16_t cell_max_voltage; //mV, 0-4350 extern uint16_t cell_min_voltage; //mV, 0-4350 extern uint16_t cellvoltages[120]; //mV 0-4350 per cell diff --git a/Software/src/devboard/webserver/settings_html.h b/Software/src/devboard/webserver/settings_html.h index fe466842..88e7f47a 100644 --- a/Software/src/devboard/webserver/settings_html.h +++ b/Software/src/devboard/webserver/settings_html.h @@ -1,6 +1,8 @@ #ifndef SETTINGS_H #define SETTINGS_H +#include + #include "../../../USER_SETTINGS.h" // Needed for WiFi ssid and password extern uint16_t battery_voltage; //V+1, 0-500.0 (0-5000)