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

Fix test compilation errors and max

Browse source
This commit is contained in:
Jaakko Haakana 2025-07-26 15:53:24 +03:00
parent 44d74b285e
commit 9e44de269c
8 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Software/src/battery/ECMP-HTML.h
View file

@ -1,6 +1,7 @@
#ifndef _ECMP_BATTERY_HTML_H
#define _ECMP_BATTERT_HTML_H
#include <cstring>
#include "../datalayer/datalayer.h"
#include "../datalayer/datalayer_extended.h"
#include "../devboard/webserver/BatteryHtmlRenderer.h"

1
Software/src/battery/GEELY-GEOMETRY-C-HTML.h
View file

@ -1,6 +1,7 @@
#ifndef _GEELY_GEOMETRY_C_HTML_H
#define _GEELY_GEOMETRY_C_HTML_H
#include <cstring>
#include "../datalayer/datalayer.h"
#include "../datalayer/datalayer_extended.h"
#include "../devboard/webserver/BatteryHtmlRenderer.h"

1
Software/src/battery/NISSAN-LEAF-HTML.h
View file

@ -1,6 +1,7 @@
#ifndef _NISSAN_LEAF_HTML_H
#define _NISSAN_LEAF_HTML_H
#include <cstring>
#include "../datalayer/datalayer.h"
#include "../datalayer/datalayer_extended.h"
#include "../devboard/webserver/BatteryHtmlRenderer.h"

1
Software/src/battery/TESLA-HTML.h
View file

@ -1,6 +1,7 @@
#ifndef _TESLA_HTML_H
#define _TESLA_HTML_H
#include <cstring>
#include "../datalayer/datalayer.h"
#include "../datalayer/datalayer_extended.h"
#include "../devboard/webserver/BatteryHtmlRenderer.h"

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

@ -424,7 +424,7 @@ static void set_event(EVENTS_ENUM_TYPE event, uint8_t data, bool latched) {
events.entries[event].state = latched ? EVENT_STATE_ACTIVE_LATCHED : EVENT_STATE_ACTIVE;
// Update event level, only upwards. Downward changes are done in Software.ino:loop()
events.level = max(events.level, events.entries[event].level);
events.level = (EVENTS_LEVEL_TYPE)max(events.level, events.entries[event].level);
update_bms_status();
}
@ -461,7 +461,7 @@ static void update_event_level(void) {
EVENTS_LEVEL_TYPE temporary_level = EVENT_LEVEL_INFO;
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)) {
temporary_level = max(events.entries[i].level, temporary_level);
temporary_level = (EVENTS_LEVEL_TYPE)max(events.entries[i].level, temporary_level);
}
}
events.level = temporary_level;

1
test/CMakeLists.txt
View file

@ -89,6 +89,7 @@ add_executable(tests
emul/can.cpp
emul/time.cpp
emul/serial.cpp
emul/Arduino.cpp
)
target_link_libraries(tests

5
test/emul/Arduino.cpp Normal file
View file

@ -0,0 +1,5 @@
#include "Arduino.h"
int max(int a, int b) {
return (a > b) ? a : b;
}

2
test/emul/Arduino.h
View file

@ -13,6 +13,6 @@ int digitalRead(uint8_t pin);
#undef millis
unsigned long millis();
#define max(a, b) std::max(a, b)
int max(int a, int b);
#endif