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

0.7.47

Browse source 
* fix boot loop #1140
This commit is contained in:
lumapu 2023-09-07 21:30:41 +02:00
parent 6b721cbe0c
commit f28f314fcf
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/CHANGES.md
View file

@ -1,5 +1,8 @@
# Development Changes # Development Changes
## 0.7.47 - 2023-09-07
* fix boot loop #1140
## 0.7.46 - 2023-09-04 ## 0.7.46 - 2023-09-04
* removed `delay` from ePaper * removed `delay` from ePaper
* started improvements of `/system` * started improvements of `/system`

7
src/app.cpp
View file

@ -453,12 +453,15 @@ void app::tickSend(void) {
int8_t maxLoop = MAX_NUM_INVERTERS; int8_t maxLoop = MAX_NUM_INVERTERS;
Inverter<> *iv = mSys.getInverterByPos(mSendLastIvId); Inverter<> *iv = mSys.getInverterByPos(mSendLastIvId);
do { while(maxLoop > 0) {
do { do {
mSendLastIvId = ((MAX_NUM_INVERTERS - 1) == mSendLastIvId) ? 0 : mSendLastIvId + 1; mSendLastIvId = ((MAX_NUM_INVERTERS - 1) == mSendLastIvId) ? 0 : mSendLastIvId + 1;
iv = mSys.getInverterByPos(mSendLastIvId); iv = mSys.getInverterByPos(mSendLastIvId);
} while ((NULL == iv) && ((maxLoop--) > 0)); } while ((NULL == iv) && ((maxLoop--) > 0));
} while((!iv->config->enabled) && (maxLoop > 0)); if(NULL != iv)
if(iv->config->enabled)
break;
}
if (NULL != iv) { if (NULL != iv) {
if (iv->config->enabled) { if (iv->config->enabled) {

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 46 #define VERSION_PATCH 47
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {

9
src/web/html/index.html
View file

@ -126,16 +126,13 @@
icon = iconWarn; icon = iconWarn;
cl = "icon-warn"; cl = "icon-warn";
avail = "disabled"; avail = "disabled";
} } else if(false == i["is_avail"]) {
else if(false == i["is_avail"]) {
icon = iconInfo; icon = iconInfo;
cl = "icon-info"; cl = "icon-info";
avail = "not yet available"; avail = "not yet available";
} } else if(0 == i["ts_last_success"]) {
else if(0 == i["ts_last_success"]) {
avail = "available but no data was received until now"; avail = "available but no data was received until now";
} } else {
else {
avail = "available and is "; avail = "available and is ";
if(false == i["is_producing"]) if(false == i["is_producing"])
avail += "not "; avail += "not ";