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

0.8.3

Browse source 
* fix yield day reset during day #848
* add total AC Max Power to WebUI
* fix opendtufusion build (GxEPD patch)
This commit is contained in:
lumapu 2023-11-09 22:58:48 +01:00
parent 975f6923d3
commit 56a1f3beaf
6 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/hm/hmInverter.h
View file

@ -150,6 +150,9 @@ class Inverter {
rssi = -127;
memset(&radioStatistics, 0, sizeof(statistics_t));
memset(txRfQuality, -6, 5);
memset(mOffYD, 0, sizeof(float) * 6);
memset(mLastYD, 0, sizeof(float) * 6);
}
void tickSend(std::function<void(uint8_t cmd, bool isDevControl)> cb) {
@ -266,7 +269,12 @@ class Inverter {
} else if (FLD_YT == rec->assign[pos].fieldId) {
rec->record[pos] = ((REC_TYP)(val) / (REC_TYP)(div) * generalConfig->yieldEffiency) + ((REC_TYP)config->yieldCor[rec->assign[pos].ch-1]);
} else if (FLD_YD == rec->assign[pos].fieldId) {
rec->record[pos] = (REC_TYP)(val) / (REC_TYP)(div) * generalConfig->yieldEffiency;
float actYD = (REC_TYP)(val) / (REC_TYP)(div) * generalConfig->yieldEffiency;
uint8_t idx = rec->assign[pos].ch - 1;
if (mLastYD[idx] > actYD)
mOffYD[idx] += mLastYD[idx];
mLastYD[idx] = actYD;
rec->record[pos] = mOffYD[idx] + actYD;
} else {
if ((REC_TYP)(div) > 1)
rec->record[pos] = (REC_TYP)(val) / (REC_TYP)(div);
@ -540,6 +548,9 @@ class Inverter {
alarmNxtWrPos = 0;
alarmCnt = 0;
alarmLastId = 0;
memset(mOffYD, 0, sizeof(float) * 6);
memset(mLastYD, 0, sizeof(float) * 6);
}
uint16_t parseAlarmLog(uint8_t id, uint8_t pyld[], uint8_t len) {
@ -662,7 +673,9 @@ class Inverter {
radioId.b[0] = 0x01;
}
bool mDevControlRequest; // true if change needed
private:
float mOffYD[6], mLastYD[6];
bool mDevControlRequest; // true if change needed
};
template <class REC_TYP>