mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13834 from lucboudreau/thermo_sensor 

Adds some minimal sensor data to the thermostat driver to allow basic…
This commit is contained in:
Theo Arends 2021-11-30 10:09:50 +01:00 committed by GitHub
parent 79191b32be 7e24f88f79
commit 20a87186fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tasmota/xdrv_39_thermostat.ino
View File

@ -2022,8 +2022,17 @@ const char HTTP_THERMOSTAT_HL[] PROGMEM = "{s}<hr>{m}<hr>{e}";
#endif // USE_WEBSERVER
void ThermostatShow(uint8_t ctr_output)
void ThermostatShow(uint8_t ctr_output, bool json)
{
if (json) {
float f_target_temp = Thermostat[ctr_output].temp_target_level / 10.0f;
ResponseAppend_P(PSTR(",\"Thermostat%i\":{"), ctr_output);
ResponseAppend_P(PSTR("%s\"%s\":%i"), "", D_CMND_THERMOSTATMODESET, Thermostat[ctr_output].status.thermostat_mode);
ResponseAppend_P(PSTR("%s\"%s\":%2_f"), ",", D_CMND_TEMPTARGETSET, &f_target_temp);
ResponseAppend_P(PSTR("%s\"%s\":%i"), ",", D_CMND_CTRDUTYCYCLEREAD, ThermostatGetDutyCycle(ctr_output));
ResponseJsonEnd();
return;
}
#ifdef USE_WEBSERVER
WSContentSend_P(HTTP_THERMOSTAT_HL);
@ -2110,11 +2119,16 @@ bool Xdrv39(uint8_t function)
}
}
break;
case FUNC_JSON_APPEND:
for (ctr_output = 0; ctr_output < THERMOSTAT_CONTROLLER_OUTPUTS; ctr_output++) {
ThermostatShow(ctr_output, true);
}
break;
#ifdef USE_WEBSERVER
case FUNC_WEB_SENSOR:
for (ctr_output = 0; ctr_output < THERMOSTAT_CONTROLLER_OUTPUTS; ctr_output++) {
ThermostatShow(ctr_output);
ThermostatShow(ctr_output, false);
}
break;
#endif // USE_WEBSERVER