yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-04 10:19:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merging merged mergers

Browse source
This commit is contained in:
Cabooman 2024-02-11 14:39:53 +01:00
parent 4dafe58770
commit e2faaecfd4
4 changed files with 90 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

132
Software/src/devboard/utils/events.cpp
View file

@ -8,9 +8,9 @@ typedef struct {
EVENTS_STRUCT_TYPE entries[EVENT_NOF_EVENTS]; EVENTS_STRUCT_TYPE entries[EVENT_NOF_EVENTS];
uint32_t time_seconds; uint32_t time_seconds;
MyTimer second_timer; MyTimer second_timer;
uint8_t nof_yellow_events; uint8_t nof_warning_events;
uint8_t nof_blue_events; uint8_t nof_debug_events;
uint8_t nof_red_events; uint8_t nof_error_events;
} EVENT_TYPE; } EVENT_TYPE;
/* Local variables */ /* Local variables */
@ -36,53 +36,38 @@ void run_event_handling(void) {
/* Initialization function */ /* Initialization function */
void init_events(void) { void init_events(void) {
events.entries[EVENT_CAN_FAILURE] = { for (uint16_t i = 0; i < EVENT_NOF_EVENTS; i++) {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = RED, .state = EVENT_STATE_INACTIVE}; events.entries[EVENT_CAN_FAILURE].data = 0;
events.entries[EVENT_CAN_WARNING] = { events.entries[EVENT_CAN_FAILURE].timestamp = 0;
.timestamp = 0, .data = 0, .occurences = 0, .led_color = YELLOW, .state = EVENT_STATE_INACTIVE}; events.entries[EVENT_CAN_FAILURE].occurences = 0;
events.entries[EVENT_WATER_INGRESS] = { events.entries[EVENT_CAN_FAILURE].state = EVENT_STATE_INACTIVE;
.timestamp = 0, .data = 0, .occurences = 0, .led_color = RED, .state = EVENT_STATE_INACTIVE}; }
events.entries[EVENT_12V_LOW] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = YELLOW, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_SOC_PLAUSIBILITY_ERROR] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = RED, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_KWH_PLAUSIBILITY_ERROR] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = YELLOW, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_BATTERY_CHG_STOP_REQ] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = RED, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_BATTERY_DISCHG_STOP_REQ] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = RED, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_BATTERY_CHG_DISCHG_STOP_REQ] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = RED, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_LOW_SOH] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = RED, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_HVIL_FAILURE] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = RED, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_INTERNAL_OPEN_FAULT] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = RED, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_CELL_UNDER_VOLTAGE] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = RED, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_CELL_OVER_VOLTAGE] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = RED, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_CELL_DEVIATION_HIGH] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = YELLOW, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_UNKNOWN_EVENT_SET] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = RED, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_OTA_UPDATE] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = BLUE, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_DUMMY] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = RED, .state = EVENT_STATE_INACTIVE};
events.entries[EVENT_NOF_EVENTS] = {
.timestamp = 0, .data = 0, .occurences = 0, .led_color = RED, .state = EVENT_STATE_INACTIVE};
// BLUE... events.entries[EVENT_CAN_FAILURE].led_color = RED;
events.entries[EVENT_CAN_WARNING].led_color = YELLOW;
events.entries[EVENT_WATER_INGRESS].led_color = RED;
events.entries[EVENT_12V_LOW].led_color = YELLOW;
events.entries[EVENT_SOC_PLAUSIBILITY_ERROR].led_color = RED;
events.entries[EVENT_KWH_PLAUSIBILITY_ERROR].led_color = YELLOW;
events.entries[EVENT_BATTERY_CHG_STOP_REQ].led_color = RED;
events.entries[EVENT_BATTERY_DISCHG_STOP_REQ].led_color = RED;
events.entries[EVENT_BATTERY_CHG_DISCHG_STOP_REQ].led_color = RED;
events.entries[EVENT_LOW_SOH].led_color = RED;
events.entries[EVENT_HVIL_FAILURE].led_color = RED;
events.entries[EVENT_INTERNAL_OPEN_FAULT].led_color = RED;
events.entries[EVENT_CELL_UNDER_VOLTAGE].led_color = RED;
events.entries[EVENT_CELL_OVER_VOLTAGE].led_color = RED;
events.entries[EVENT_CELL_DEVIATION_HIGH].led_color = YELLOW;
events.entries[EVENT_UNKNOWN_EVENT_SET].led_color = RED;
events.entries[EVENT_OTA_UPDATE].led_color = BLUE; events.entries[EVENT_OTA_UPDATE].led_color = BLUE;
events.entries[EVENT_DUMMY].led_color = RED;
events.entries[EVENT_NOF_EVENTS].led_color = RED;
events.second_timer.interval = 1000; events.second_timer.interval = 1000;
events.nof_blue_events = 0; events.nof_debug_events = 0;
events.nof_red_events = 0; events.nof_error_events = 0;
events.nof_yellow_events = 0; events.nof_warning_events = 0;
} }
void set_event(EVENTS_ENUM_TYPE event, uint8_t data) { void set_event(EVENTS_ENUM_TYPE event, uint8_t data) {
@ -127,39 +112,24 @@ static void set_event(EVENTS_ENUM_TYPE event, uint8_t data, bool latched) {
update_bms_status(); update_bms_status();
#ifdef DEBUG_VIA_USB #ifdef DEBUG_VIA_USB
Serial.println(get_event_message(event)); Serial.println(get_event_message_string(event));
#endif #endif
} }
static void update_bms_status(void) { static void update_bms_status(void) {
if (events.nof_red_events > 0) { if (events.nof_error_events > 0) {
bms_status = FAULT; bms_status = FAULT;
} else if (events.nof_blue_events > 0) { } else if (events.nof_debug_events > 0) {
bms_status = UPDATING; bms_status = UPDATING;
} else if (events.nof_yellow_events > 0) { } else if (events.nof_warning_events > 0) {
// No bms_status update // No bms_status update
} }
} }
const char* get_led_color_display_text(u_int8_t led_color) {
switch (led_color) {
case RED:
return "Error";
case YELLOW:
return "Warning";
case GREEN:
return "Info";
case BLUE:
return "Debug";
default:
return "UNKNOWN";
}
}
static void update_event_numbers(void) { static void update_event_numbers(void) {
events.nof_red_events = 0; events.nof_error_events = 0;
events.nof_blue_events = 0; events.nof_debug_events = 0;
events.nof_yellow_events = 0; events.nof_warning_events = 0;
for (uint8_t i = 0u; i < EVENT_NOF_EVENTS; i++) { for (uint8_t i = 0u; i < EVENT_NOF_EVENTS; i++) {
if ((events.entries[i].state == EVENT_STATE_ACTIVE) || (events.entries[i].state == EVENT_STATE_ACTIVE_LATCHED)) { if ((events.entries[i].state == EVENT_STATE_ACTIVE) || (events.entries[i].state == EVENT_STATE_ACTIVE_LATCHED)) {
switch (events.entries[i].led_color) { switch (events.entries[i].led_color) {
@ -167,13 +137,13 @@ static void update_event_numbers(void) {
// Just informative // Just informative
break; break;
case YELLOW: case YELLOW:
events.nof_yellow_events++; events.nof_warning_events++;
break; break;
case BLUE: case BLUE:
events.nof_blue_events++; events.nof_debug_events++;
break; break;
case RED: case RED:
events.nof_red_events++; events.nof_error_events++;
break; break;
default: default:
break; break;
@ -190,20 +160,18 @@ static void update_event_time(void) {
} }
static void update_led_color(void) { static void update_led_color(void) {
if (events.nof_red_events > 0) { if (events.nof_error_events > 0) {
LEDcolor = RED; LEDcolor = RED;
} else if (events.nof_blue_events > 0) { } else if (events.nof_debug_events > 0) {
LEDcolor = BLUE; LEDcolor = BLUE;
} else if (events.nof_yellow_events > 0) { } else if (events.nof_warning_events > 0) {
LEDcolor = YELLOW; LEDcolor = YELLOW;
} else { } else {
LEDcolor = GREEN; LEDcolor = GREEN;
} }
// events.total_led_color = max(events.total_led_color, events.entries[event].led_color);
} }
const char* get_event_message(EVENTS_ENUM_TYPE event) { const char* get_event_message_string(EVENTS_ENUM_TYPE event) {
switch (event) { switch (event) {
case EVENT_CAN_FAILURE: case EVENT_CAN_FAILURE:
return "No CAN communication detected for 60s. Shutting down battery control."; return "No CAN communication detected for 60s. Shutting down battery control.";
@ -247,7 +215,15 @@ const char* get_event_message(EVENTS_ENUM_TYPE event) {
} }
const char* get_event_enum_string(EVENTS_ENUM_TYPE event) { const char* get_event_enum_string(EVENTS_ENUM_TYPE event) {
return EVENTS_ENUM_TYPE_STRING[event] + 6; // Return the event name but skip "EVENT_" that should always be first // Return the event name but skip "EVENT_" that should always be first
return EVENTS_ENUM_TYPE_STRING[event] + 6;
} }
const char* get_event_type(EVENTS_ENUM_TYPE event) {} const char* get_event_level_string(EVENTS_ENUM_TYPE event) {
// Return the event level but skip "EVENT_LEVEL_" that should always be first
return EVENTS_LEVEL_TYPE_STRING[event] + 12;
}
const EVENTS_STRUCT_TYPE* get_event_pointer(EVENTS_ENUM_TYPE event) {
return &events.entries[event];
}

37
Software/src/devboard/utils/events.h
View file

@ -6,21 +6,6 @@
#include <Arduino.h> #include <Arduino.h>
#endif #endif
typedef enum {
EVENT_STATE_INIT = 0,
EVENT_STATE_INACTIVE,
EVENT_STATE_ACTIVE,
EVENT_STATE_ACTIVE_LATCHED
} EVENTS_STATE_TYPE;
typedef struct {
uint32_t timestamp; // Time in seconds since startup when the event occurred
uint8_t data; // Custom data passed when setting the event, for example cell number for under voltage
uint8_t occurences; // Number of occurrences since startup
uint8_t led_color; // LED indication
EVENTS_STATE_TYPE state; // Event state
} EVENTS_STRUCT_TYPE;
#define GENERATE_ENUM(ENUM) ENUM, #define GENERATE_ENUM(ENUM) ENUM,
#define GENERATE_STRING(STRING) #STRING, #define GENERATE_STRING(STRING) #STRING,
@ -57,9 +42,25 @@ typedef enum { EVENTS_ENUM_TYPE(GENERATE_ENUM) } EVENTS_ENUM_TYPE;
typedef enum { EVENTS_LEVEL_TYPE(GENERATE_ENUM) } EVENTS_LEVEL_TYPE; typedef enum { EVENTS_LEVEL_TYPE(GENERATE_ENUM) } EVENTS_LEVEL_TYPE;
typedef enum {
EVENT_STATE_INIT = 0,
EVENT_STATE_INACTIVE,
EVENT_STATE_ACTIVE,
EVENT_STATE_ACTIVE_LATCHED
} EVENTS_STATE_TYPE;
typedef struct {
uint32_t timestamp; // Time in seconds since startup when the event occurred
uint8_t data; // Custom data passed when setting the event, for example cell number for under voltage
uint8_t occurences; // Number of occurrences since startup
uint8_t led_color; // LED indication
EVENTS_LEVEL_TYPE level; // Event level, i.e. ERROR/WARNING...
EVENTS_STATE_TYPE state; // Event state, i.e. ACTIVE/INACTIVE...
} EVENTS_STRUCT_TYPE;
const char* get_event_enum_string(EVENTS_ENUM_TYPE event); const char* get_event_enum_string(EVENTS_ENUM_TYPE event);
const char* get_event_message(EVENTS_ENUM_TYPE event); const char* get_event_message_string(EVENTS_ENUM_TYPE event);
const char* get_led_color_display_text(u_int8_t led_color); const char* get_event_level_string(EVENTS_ENUM_TYPE event);
const char* get_event_type(EVENTS_ENUM_TYPE event); const char* get_event_type(EVENTS_ENUM_TYPE event);
void init_events(void); void init_events(void);
@ -67,6 +68,8 @@ void set_event_latched(EVENTS_ENUM_TYPE event, uint8_t data);
void set_event(EVENTS_ENUM_TYPE event, uint8_t data); void set_event(EVENTS_ENUM_TYPE event, uint8_t data);
void clear_event(EVENTS_ENUM_TYPE event); void clear_event(EVENTS_ENUM_TYPE event);
const EVENTS_STRUCT_TYPE* get_event_pointer(EVENTS_ENUM_TYPE event);
void run_event_handling(void); void run_event_handling(void);
extern uint8_t bms_status; //Enum, 0-5 extern uint8_t bms_status; //Enum, 0-5

26
Software/src/devboard/webserver/events_html.cpp
View file

@ -1,5 +1,6 @@
#include "events_html.h" #include "events_html.h"
#include <Arduino.h> #include <Arduino.h>
#include "../utils/events.h"
const char EVENTS_HTML_START[] = R"=====( const char EVENTS_HTML_START[] = R"=====(
<style> <style>
@ -67,20 +68,23 @@ String events_processor(const String& var) {
content.reserve(5000); content.reserve(5000);
// Page format // Page format
content.concat(FPSTR(EVENTS_HTML_START)); content.concat(FPSTR(EVENTS_HTML_START));
const EVENTS_STRUCT_TYPE* event_pointer;
for (int i = 0; i < EVENT_NOF_EVENTS; i++) { for (int i = 0; i < EVENT_NOF_EVENTS; i++) {
Serial.println("Event: " + String(get_event_enum_string(static_cast<EVENTS_ENUM_TYPE>(i))) + event_pointer = get_event_pointer((EVENTS_ENUM_TYPE)i);
" count: " + String(entries[i].occurences) + " seconds: " + String(entries[i].timestamp) + EVENTS_ENUM_TYPE event_handle = static_cast<EVENTS_ENUM_TYPE>(i);
" data: " + String(entries[i].data)); Serial.println("Event: " + String(get_event_enum_string(event_handle)) +
if (entries[i].occurences > 0) { " count: " + String(event_pointer->occurences) + " seconds: " + String(event_pointer->timestamp) +
" data: " + String(event_pointer->data));
if (event_pointer->occurences > 0) {
content.concat("<div class='event'>"); content.concat("<div class='event'>");
content.concat("<div>" + String(get_event_enum_string(static_cast<EVENTS_ENUM_TYPE>(i))) + "</div>"); content.concat("<div>" + String(get_event_enum_string(event_handle)) + "</div>");
content.concat("<div>" + String(get_led_color_display_text(entries[i].led_color)) + "</div>"); content.concat("<div>" + String(get_event_level_string(event_handle)) + "</div>");
content.concat("<div class='last-event-seconds-ago'>" + String((millis() / 1000) - entries[i].timestamp) + content.concat("<div class='last-event-seconds-ago'>" + String((millis() / 1000) - event_pointer->timestamp) +
"</div>"); "</div>");
content.concat("<div>" + String(entries[i].occurences) + "</div>"); content.concat("<div>" + String(event_pointer->occurences) + "</div>");
content.concat("<div>" + String(entries[i].data) + "</div>"); content.concat("<div>" + String(event_pointer->data) + "</div>");
content.concat("<div>" + String(get_event_message(static_cast<EVENTS_ENUM_TYPE>(i))) + "</div>"); content.concat("<div>" + String(get_event_message_string(event_handle)) + "</div>");
content.concat("<div class='timestamp'>" + String(entries[i].timestamp) + "</div>"); content.concat("<div class='timestamp'>" + String(event_pointer->timestamp) + "</div>");
content.concat("</div>"); // End of event row content.concat("</div>"); // End of event row
} }
} }

4
Software/src/devboard/webserver/events_html.h
View file

@ -1,9 +1,7 @@
#ifndef EVENTS_H #ifndef EVENTS_H
#define EVENTS_H #define EVENTS_H
#include "../utils/events.h" #include <Arduino.h>
extern EVENTS_STRUCT_TYPE entries[EVENT_NOF_EVENTS];
/** /**
* @brief Replaces placeholder with content section in web page * @brief Replaces placeholder with content section in web page