mirror of
https://github.com/lumapu/ahoy.git
synced 2025-05-25 14:56:11 +02:00
0.8.118
* possible fix reset max values #1609 * slightly improved WiFi reconnect
This commit is contained in:
parent
bf78c6ab0d
commit
d43ebc6c5a
7 changed files with 36 additions and 40 deletions
|
@ -239,15 +239,15 @@ class Inverter {
|
|||
|
||||
uint8_t getPosByChFld(uint8_t channel, uint8_t fieldId, record_t<> *rec) {
|
||||
DPRINTLN(DBG_VERBOSE, F("hmInverter.h:getPosByChFld"));
|
||||
if(NULL != rec) {
|
||||
uint8_t pos = 0;
|
||||
for(; pos < rec->length; pos++) {
|
||||
if((rec->assign[pos].ch == channel) && (rec->assign[pos].fieldId == fieldId))
|
||||
break;
|
||||
}
|
||||
return (pos >= rec->length) ? 0xff : pos;
|
||||
} else
|
||||
if(nullptr == rec)
|
||||
return 0xff;
|
||||
|
||||
uint8_t pos = 0;
|
||||
for(; pos < rec->length; pos++) {
|
||||
if((rec->assign[pos].ch == channel) && (rec->assign[pos].fieldId == fieldId))
|
||||
break;
|
||||
}
|
||||
return (pos >= rec->length) ? 0xff : pos;
|
||||
}
|
||||
|
||||
byteAssign_t *getByteAssign(uint8_t pos, record_t<> *rec) {
|
||||
|
@ -363,7 +363,7 @@ class Inverter {
|
|||
|
||||
bool setValue(uint8_t pos, record_t<> *rec, REC_TYP val) {
|
||||
DPRINTLN(DBG_VERBOSE, F("hmInverter.h:setValue"));
|
||||
if(NULL == rec)
|
||||
if(nullptr == rec)
|
||||
return false;
|
||||
if(pos > rec->length)
|
||||
return false;
|
||||
|
@ -585,7 +585,7 @@ class Inverter {
|
|||
}
|
||||
}
|
||||
|
||||
void resetAlarms(bool clear = false) {
|
||||
void resetAlarms(bool clearTs = false) {
|
||||
lastAlarm.fill({0, 0, 0});
|
||||
mAlarmNxtWrPos = 0;
|
||||
alarmCnt = 0;
|
||||
|
@ -594,7 +594,7 @@ class Inverter {
|
|||
memset(mOffYD, 0, sizeof(float) * 6);
|
||||
memset(mLastYD, 0, sizeof(float) * 6);
|
||||
|
||||
if(clear) {
|
||||
if(clearTs) {
|
||||
tsMaxAcPower = *Timestamp;
|
||||
tsMaxTemperature = *Timestamp;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue