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

Merge branch 'main' into dev

Browse source 
# Conflicts:
#	tools/esp8266/defines.h
#	tools/esp8266/hmSystem.h
This commit is contained in:
lumapu 2022-04-29 20:49:50 +02:00
commit c8a05efadc
33 changed files with 3714 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tools/esp8266/app.cpp
View file

@ -164,7 +164,7 @@ void app::loop(void) {
if(NULL != inv) {
mSys->Radio.sendTimePacket(inv->radioId.u64, mTimestamp);
yield();
delay(100);
//delay(100);
}
}
}
@ -184,7 +184,7 @@ void app::loop(void) {
snprintf(topic, 30, "%s/ch%d/%s", iv->name, iv->assign[i].ch, fields[iv->assign[i].fieldId]);
snprintf(val, 10, "%.3f", iv->getValue(i));
mMqtt.sendMsg(topic, val);
delay(20);
//delay(20);
yield();
}
}
@ -409,6 +409,8 @@ void app::showLiveData(void) {
case INV_TYPE_HM1200: modNum = 4; break;
}
modHtml += "<div class=\"ch-group\"><h3>" + String(iv->name) + "</h3>";
for(uint8_t ch = 1; ch <= modNum; ch ++) {
modHtml += "<div class=\"ch\"><span class=\"head\">CHANNEL " + String(ch) + "</span>";
for(uint8_t j = 0; j < 5; j++) {
@ -427,6 +429,8 @@ void app::showLiveData(void) {
}
modHtml += "</div>";
}
modHtml += "</div>";
#else
// dump all data to web frontend
modHtml = "<pre>";