mirror of
https://github.com/dalathegreat/Battery-Emulator.git
synced 2025-10-03 17:59:27 +02:00
Fix test compilation errors and max
This commit is contained in:
parent
44d74b285e
commit
9e44de269c
8 changed files with 13 additions and 3 deletions
|
@ -1,6 +1,7 @@
|
||||||
#ifndef _ECMP_BATTERY_HTML_H
|
#ifndef _ECMP_BATTERY_HTML_H
|
||||||
#define _ECMP_BATTERT_HTML_H
|
#define _ECMP_BATTERT_HTML_H
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
#include "../datalayer/datalayer.h"
|
#include "../datalayer/datalayer.h"
|
||||||
#include "../datalayer/datalayer_extended.h"
|
#include "../datalayer/datalayer_extended.h"
|
||||||
#include "../devboard/webserver/BatteryHtmlRenderer.h"
|
#include "../devboard/webserver/BatteryHtmlRenderer.h"
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#ifndef _GEELY_GEOMETRY_C_HTML_H
|
#ifndef _GEELY_GEOMETRY_C_HTML_H
|
||||||
#define _GEELY_GEOMETRY_C_HTML_H
|
#define _GEELY_GEOMETRY_C_HTML_H
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
#include "../datalayer/datalayer.h"
|
#include "../datalayer/datalayer.h"
|
||||||
#include "../datalayer/datalayer_extended.h"
|
#include "../datalayer/datalayer_extended.h"
|
||||||
#include "../devboard/webserver/BatteryHtmlRenderer.h"
|
#include "../devboard/webserver/BatteryHtmlRenderer.h"
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#ifndef _NISSAN_LEAF_HTML_H
|
#ifndef _NISSAN_LEAF_HTML_H
|
||||||
#define _NISSAN_LEAF_HTML_H
|
#define _NISSAN_LEAF_HTML_H
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
#include "../datalayer/datalayer.h"
|
#include "../datalayer/datalayer.h"
|
||||||
#include "../datalayer/datalayer_extended.h"
|
#include "../datalayer/datalayer_extended.h"
|
||||||
#include "../devboard/webserver/BatteryHtmlRenderer.h"
|
#include "../devboard/webserver/BatteryHtmlRenderer.h"
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#ifndef _TESLA_HTML_H
|
#ifndef _TESLA_HTML_H
|
||||||
#define _TESLA_HTML_H
|
#define _TESLA_HTML_H
|
||||||
|
|
||||||
|
#include <cstring>
|
||||||
#include "../datalayer/datalayer.h"
|
#include "../datalayer/datalayer.h"
|
||||||
#include "../datalayer/datalayer_extended.h"
|
#include "../datalayer/datalayer_extended.h"
|
||||||
#include "../devboard/webserver/BatteryHtmlRenderer.h"
|
#include "../devboard/webserver/BatteryHtmlRenderer.h"
|
||||||
|
|
|
@ -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;
|
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()
|
// 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();
|
update_bms_status();
|
||||||
}
|
}
|
||||||
|
@ -461,7 +461,7 @@ 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)) {
|
||||||
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;
|
events.level = temporary_level;
|
||||||
|
|
|
@ -89,6 +89,7 @@ add_executable(tests
|
||||||
emul/can.cpp
|
emul/can.cpp
|
||||||
emul/time.cpp
|
emul/time.cpp
|
||||||
emul/serial.cpp
|
emul/serial.cpp
|
||||||
|
emul/Arduino.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(tests
|
target_link_libraries(tests
|
||||||
|
|
5
test/emul/Arduino.cpp
Normal file
5
test/emul/Arduino.cpp
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
#include "Arduino.h"
|
||||||
|
|
||||||
|
int max(int a, int b) {
|
||||||
|
return (a > b) ? a : b;
|
||||||
|
}
|
|
@ -13,6 +13,6 @@ int digitalRead(uint8_t pin);
|
||||||
#undef millis
|
#undef millis
|
||||||
unsigned long millis();
|
unsigned long millis();
|
||||||
|
|
||||||
#define max(a, b) std::max(a, b)
|
int max(int a, int b);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue