diff --git a/Software/src/devboard/utils/events.cpp b/Software/src/devboard/utils/events.cpp index 25b25101..9fc064e2 100644 --- a/Software/src/devboard/utils/events.cpp +++ b/Software/src/devboard/utils/events.cpp @@ -7,6 +7,7 @@ static unsigned long previous_millis = 0; static uint32_t time_seconds = 0; static uint8_t total_led_color = GREEN; static char event_message[256]; +EVENTS_STRUCT_TYPE entries[EVENT_NOF_EVENTS]; /* Local function prototypes */ static void set_event_message(EVENTS_ENUM_TYPE event); @@ -34,10 +35,10 @@ void set_event(EVENTS_ENUM_TYPE event, uint8_t data) { } entries[event].timestamp = time_seconds; entries[event].data = data; - entries[event].occurences++; + ++entries[event].occurences; set_event_message(event); #ifdef DEBUG_VIA_USB - Serial.println(event_message); + Serial.println("Set event: " + String(get_event_enum_string(event)) + ". Has occured " + String(entries[event].occurences) + " times"); #endif } @@ -111,7 +112,11 @@ const char* get_event_message(EVENTS_ENUM_TYPE event) { } const char* get_event_enum_string(EVENTS_ENUM_TYPE event) { - return EVENTS_ENUM_TYPE_STRING[event]; + const char* fullString = EVENTS_ENUM_TYPE_STRING[event]; + if (strncmp(fullString, "EVENT_", 6) == 0) { + return fullString + 6; // Skip the first 6 characters + } + return fullString; } static void set_event_message(EVENTS_ENUM_TYPE event) { diff --git a/Software/src/devboard/utils/events.h b/Software/src/devboard/utils/events.h index 7d395bf5..ba8a0ba9 100644 --- a/Software/src/devboard/utils/events.h +++ b/Software/src/devboard/utils/events.h @@ -53,6 +53,6 @@ typedef struct { uint8_t occurences; // Number of occurrences since startup uint8_t led_color; // Weirdly indented comment } EVENTS_STRUCT_TYPE; -static EVENTS_STRUCT_TYPE entries[EVENT_NOF_EVENTS]; +extern EVENTS_STRUCT_TYPE entries[EVENT_NOF_EVENTS]; #endif // __MYTIMER_H__ diff --git a/Software/src/devboard/webserver/webserver.cpp b/Software/src/devboard/webserver/webserver.cpp index 5888e0fb..31b45234 100644 --- a/Software/src/devboard/webserver/webserver.cpp +++ b/Software/src/devboard/webserver/webserver.cpp @@ -318,9 +318,10 @@ void wifi_monitor() { wifi_reconnect_interval = DEFAULT_WIFI_RECONNECT_INTERVAL; // Print local IP address and start web server Serial.print("Connected to WiFi network: " + String(ssid)); - Serial.print("IP address: " + WiFi.localIP().toString()); - Serial.print("Signal Strength: " + String(WiFi.RSSI()) + " dBm "); - Serial.println("Channel: " + String(WiFi.channel())); + Serial.print(" IP address: " + WiFi.localIP().toString()); + Serial.print(" Signal Strength: " + String(WiFi.RSSI()) + " dBm"); + Serial.println(" Channel: " + String(WiFi.channel())); + Serial.println(" Hostname: " + String(WiFi.getHostname())); } } } @@ -945,17 +946,19 @@ String cellmonitor_processor(const String& var) { const char EVENTS_HTML_START[] PROGMEM = R"=====(
Event Type | LED Color | Last Event (seconds ago) | Count | Data | Message |
---|