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

Merge from main and fix conflicts

Browse source
This commit is contained in:
Jaakko Haakana 2025-07-26 16:57:29 +03:00
commit 28609f18a6
16 changed files with 128 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -398,8 +398,6 @@ EVENTS_LEVEL_TYPE get_event_level(void) {
return events.level;
}
uint64_t get_timestamp(unsigned long currentMillis);
/* Local functions */
static void set_event(EVENTS_ENUM_TYPE event, uint8_t data, bool latched) {
@ -418,7 +416,7 @@ static void set_event(EVENTS_ENUM_TYPE event, uint8_t data, bool latched) {
}
// We should set the event, update event info
events.entries[event].timestamp = get_timestamp(millis());
events.entries[event].timestamp = millis64();
events.entries[event].data = data;
// Check if the event is latching
events.entries[event].state = latched ? EVENT_STATE_ACTIVE_LATCHED : EVENT_STATE_ACTIVE;