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

0.7.57

Browse source 
* fix Alarms are always in queue (since 0.7.56)
* fix display active power control to long for small devices #1165
This commit is contained in:
lumapu 2023-09-18 22:52:02 +02:00
parent 3b4365a697
commit ff63f5236d
5 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CHANGES.md
View file

@ -1,5 +1,9 @@
# Development Changes # Development Changes
## 0.7.57 - 2023-09-18
* fix Alarms are always in queue (since 0.7.56)
* fix display active power control to long for small devices #1165
## 0.7.56 - 2023-09-17 ## 0.7.56 - 2023-09-17
* only request alarms which were not received before #1113 * only request alarms which were not received before #1113
* added flag if alarm was requested but not received and re-request it #1105 * added flag if alarm was requested but not received and re-request it #1105

2
src/defines.h
View file

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 7 #define VERSION_MINOR 7
#define VERSION_PATCH 56 #define VERSION_PATCH 57
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {

7
src/hm/hmInverter.h
View file

@ -151,8 +151,7 @@ class Inverter {
std::array<alarm_t, 10> lastAlarm; // holds last 10 alarms std::array<alarm_t, 10> lastAlarm; // holds last 10 alarms
uint8_t alarmNxtWrPos; // indicates the position in array (rolling buffer) uint8_t alarmNxtWrPos; // indicates the position in array (rolling buffer)
uint16_t alarmCnt; // counts the total number of occurred alarms uint16_t alarmCnt; // counts the total number of occurred alarms
uint8_t alarmLastId; // lastId which was received uint16_t alarmLastId; // lastId which was received
bool alarmReqPending; // alarmData request issued and wait for answer
int8_t rssi; // HMS and HMT inverters only int8_t rssi; // HMS and HMT inverters only
@ -210,7 +209,7 @@ class Inverter {
enqueCommand<InfoCommand>(InverterDevInform_All); // firmware version enqueCommand<InfoCommand>(InverterDevInform_All); // firmware version
else if (getHwVersion() == 0) else if (getHwVersion() == 0)
enqueCommand<InfoCommand>(InverterDevInform_Simple); // hardware version enqueCommand<InfoCommand>(InverterDevInform_Simple); // hardware version
else if(alarmReqPending) else if((alarmLastId != alarmMesIndex) && (alarmMesIndex != 0))
enqueCommand<InfoCommand>(AlarmData); // alarm not answered enqueCommand<InfoCommand>(AlarmData); // alarm not answered
enqueCommand<InfoCommand>(RealTimeRunData_Debug); // live data enqueCommand<InfoCommand>(RealTimeRunData_Debug); // live data
} else if (ivGen == IV_MI){ } else if (ivGen == IV_MI){
@ -342,7 +341,6 @@ class Inverter {
DPRINT(DBG_INFO, "alarm ID incremented to "); DPRINT(DBG_INFO, "alarm ID incremented to ");
DBGPRINTLN(String(alarmMesIndex)); DBGPRINTLN(String(alarmMesIndex));
alarmReqPending = true;
enqueCommand<InfoCommand>(AlarmData); enqueCommand<InfoCommand>(AlarmData);
} }
} }
@ -626,7 +624,6 @@ class Inverter {
DPRINTLN(DBG_DEBUG, "Alarm #" + String(pyld[startOff+1]) + " '" + String(getAlarmStr(pyld[startOff+1])) + "' start: " + ah::getTimeStr(start) + ", end: " + ah::getTimeStr(endTime)); DPRINTLN(DBG_DEBUG, "Alarm #" + String(pyld[startOff+1]) + " '" + String(getAlarmStr(pyld[startOff+1])) + "' start: " + ah::getTimeStr(start) + ", end: " + ah::getTimeStr(endTime));
addAlarm(pyld[startOff+1], start, endTime); addAlarm(pyld[startOff+1], start, endTime);
alarmReqPending = false;
alarmCnt++; alarmCnt++;
alarmLastId = alarmMesIndex; alarmLastId = alarmMesIndex;

6
src/web/html/style.css
View file

@ -266,6 +266,9 @@ p {
.a-r { text-align: right; } .a-r { text-align: right; }
.a-c { text-align: center; } .a-c { text-align: center; }
.d-none { display: none !important; }
.d-block { display: block !important; }
.row > * { .row > * {
padding-left: 0.5rem; padding-left: 0.5rem;
padding-right: 0.5rem; padding-right: 0.5rem;
@ -304,6 +307,9 @@ p {
.fs-sm-6 { font-size: 1.5rem; } .fs-sm-6 { font-size: 1.5rem; }
.fs-sm-7 { font-size: 1.25rem; } .fs-sm-7 { font-size: 1.25rem; }
.fs-sm-8 { font-size: 1rem; } .fs-sm-8 { font-size: 1rem; }
.d-sm-block { display: block !important;}
.d-sm-none { display: none !important; }
} }
/* md */ /* md */

3
src/web/html/visualization.html
View file

@ -113,7 +113,8 @@
ml("div", {class: "col mx-2 mx-md-1"}, ml("span", { class: "pointer", onclick: function() { ml("div", {class: "col mx-2 mx-md-1"}, ml("span", { class: "pointer", onclick: function() {
getAjax("/api/inverter/version/" + obj.id, parseIvVersion); getAjax("/api/inverter/version/" + obj.id, parseIvVersion);
}}, obj.name)), }}, obj.name)),
ml("div", {class: "col a-c"}, "Active Power Control: " + pwrLimit), ml("div", {class: "col a-c d-none d-sm-block"}, "Active Power Control: " + pwrLimit),
ml("div", {class: "col a-c d-block d-sm-none"}, "APC: " + pwrLimit),
ml("div", {class: "col a-c"}, ml("span", { class: "pointer", onclick: function() { ml("div", {class: "col a-c"}, ml("span", { class: "pointer", onclick: function() {
getAjax("/api/inverter/alarm/" + obj.id, parseIvAlarm); getAjax("/api/inverter/alarm/" + obj.id, parseIvAlarm);
}}, ("Alarms: " + obj.alarm_cnt))), }}, ("Alarms: " + obj.alarm_cnt))),