3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-25 23:06:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'lumapu:development03' into development03

Browse source
This commit is contained in:
DanielR92 2023-08-26 18:08:24 +02:00 • committed by GitHub
commit a18b86d375
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 62 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/hm/hmInverter.h
View file

@ -65,7 +65,7 @@ struct calcFunc_t {
template<class T=float>
struct record_t {
byteAssign_t* assign; // assigment of bytes in payload
byteAssign_t* assign; // assignment of bytes in payload
uint8_t length; // length of the assignment list
T *record; // data pointer
uint32_t ts; // timestamp of last received payload
@ -151,7 +151,7 @@ class Inverter {
InverterStatus status; // indicates the current inverter status
std::array<alarm_t, 10> lastAlarm; // holds last 10 alarms
uint8_t alarmNxtWrPos; // indicates the position in array (rolling buffer)
uint16_t alarmCnt; // counts the total number of occured alarms
uint16_t alarmCnt; // counts the total number of occurred alarms
int8_t rssi; // HMS and HMT inverters only
@ -361,7 +361,7 @@ class Inverter {
//}
}
else
DPRINTLN(DBG_WARN, F("add with unknown assginment"));
DPRINTLN(DBG_WARN, F("add with unknown assignment"));
}
else
DPRINTLN(DBG_ERROR, F("addValue: assignment not found with cmd 0x"));
@ -438,6 +438,7 @@ class Inverter {
if((*timestamp - recordMeas.ts) > INVERTER_OFF_THRES_SEC) {
status = InverterStatus::OFF;
actPowerLimit = 0xffff; // power limit will be read once inverter becomes available
alarmMesIndex = 0;
}
else
status = InverterStatus::WAS_ON;