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

Fix unit test failing

Browse source
This commit is contained in:
Daniel Öster 2025-08-30 00:30:49 +03:00
parent 5df7071999
commit 127094f9fa
1 changed files with 327 additions and 326 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -159,12 +159,13 @@ void reset_all_events() {
} }
events.level = EVENT_LEVEL_INFO; events.level = EVENT_LEVEL_INFO;
update_bms_status(); update_bms_status();
}
void set_event_MQTTpublished(EVENTS_ENUM_TYPE event) { void set_event_MQTTpublished(EVENTS_ENUM_TYPE event) {
events.entries[event].MQTTpublished = true; events.entries[event].MQTTpublished = true;
} }
String get_event_message_string(EVENTS_ENUM_TYPE event) { String get_event_message_string(EVENTS_ENUM_TYPE event) {
switch (event) { switch (event) {
case EVENT_CANMCP2517FD_INIT_FAILURE: case EVENT_CANMCP2517FD_INIT_FAILURE:
return "CAN-FD initialization failed. Check hardware or bitrate settings"; return "CAN-FD initialization failed. Check hardware or bitrate settings";
@ -378,32 +379,32 @@ void reset_all_events() {
default: default:
return ""; return "";
} }
} }
const char* get_event_enum_string(EVENTS_ENUM_TYPE event) { const char* get_event_enum_string(EVENTS_ENUM_TYPE event) {
// 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; return EVENTS_ENUM_TYPE_STRING[event] + 6;
} }
const char* get_event_level_string(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 the event level but skip "EVENT_LEVEL_" that should always be first
return EVENTS_LEVEL_TYPE_STRING[events.entries[event].level] + 12; return EVENTS_LEVEL_TYPE_STRING[events.entries[event].level] + 12;
} }
const char* get_event_level_string(EVENTS_LEVEL_TYPE event_level) { const char* get_event_level_string(EVENTS_LEVEL_TYPE event_level) {
// Return the event level but skip "EVENT_LEVEL_TYPE_" that should always be first // Return the event level but skip "EVENT_LEVEL_TYPE_" that should always be first
return EVENTS_LEVEL_TYPE_STRING[event_level] + 17; return EVENTS_LEVEL_TYPE_STRING[event_level] + 17;
} }
const EVENTS_STRUCT_TYPE* get_event_pointer(EVENTS_ENUM_TYPE event) { const EVENTS_STRUCT_TYPE* get_event_pointer(EVENTS_ENUM_TYPE event) {
return &events.entries[event]; return &events.entries[event];
} }
EVENTS_LEVEL_TYPE get_event_level(void) { EVENTS_LEVEL_TYPE get_event_level(void) {
return events.level; return events.level;
} }
EMULATOR_STATUS get_emulator_status() { EMULATOR_STATUS get_emulator_status() {
switch (events.level) { switch (events.level) {
case EVENT_LEVEL_DEBUG: case EVENT_LEVEL_DEBUG:
case EVENT_LEVEL_INFO: case EVENT_LEVEL_INFO:
@ -417,16 +418,16 @@ void reset_all_events() {
default: default:
return EMULATOR_STATUS::STATUS_OK; return EMULATOR_STATUS::STATUS_OK;
} }
} }
const char* get_emulator_status_string(EMULATOR_STATUS status) { const char* get_emulator_status_string(EMULATOR_STATUS status) {
// Return the status string but skip "STATUS_" that should always be first // Return the status string but skip "STATUS_" that should always be first
return EMULATOR_STATUS_STRING[status] + 7; return EMULATOR_STATUS_STRING[status] + 7;
} }
/* Local functions */ /* Local functions */
static void set_event(EVENTS_ENUM_TYPE event, uint8_t data, bool latched) { static void set_event(EVENTS_ENUM_TYPE event, uint8_t data, bool latched) {
// Just some defensive stuff if someone sets an unknown event // Just some defensive stuff if someone sets an unknown event
if (event >= EVENT_NOF_EVENTS) { if (event >= EVENT_NOF_EVENTS) {
event = EVENT_UNKNOWN_EVENT_SET; event = EVENT_UNKNOWN_EVENT_SET;
@ -451,9 +452,9 @@ void reset_all_events() {
events.level = (EVENTS_LEVEL_TYPE)max(events.level, events.entries[event].level); events.level = (EVENTS_LEVEL_TYPE)max(events.level, events.entries[event].level);
update_bms_status(); update_bms_status();
} }
static void update_bms_status(void) { static void update_bms_status(void) {
switch (events.level) { switch (events.level) {
case EVENT_LEVEL_INFO: case EVENT_LEVEL_INFO:
case EVENT_LEVEL_WARNING: case EVENT_LEVEL_WARNING:
@ -469,19 +470,19 @@ void reset_all_events() {
default: default:
break; break;
} }
} }
// Function to compare events by timestamp descending // Function to compare events by timestamp descending
bool compareEventsByTimestampDesc(const EventData& a, const EventData& b) { bool compareEventsByTimestampDesc(const EventData& a, const EventData& b) {
return a.event_pointer->timestamp > b.event_pointer->timestamp; return a.event_pointer->timestamp > b.event_pointer->timestamp;
} }
// Function to compare events by timestamp ascending // Function to compare events by timestamp ascending
bool compareEventsByTimestampAsc(const EventData& a, const EventData& b) { bool compareEventsByTimestampAsc(const EventData& a, const EventData& b) {
return a.event_pointer->timestamp < b.event_pointer->timestamp; return a.event_pointer->timestamp < b.event_pointer->timestamp;
} }
static void update_event_level(void) { static void update_event_level(void) {
EVENTS_LEVEL_TYPE temporary_level = EVENT_LEVEL_INFO; EVENTS_LEVEL_TYPE temporary_level = EVENT_LEVEL_INFO;
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)) {
@ -489,4 +490,4 @@ void reset_all_events() {
} }
} }
events.level = temporary_level; events.level = temporary_level;
} }