mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-23 02:36:35 +00:00
Merge pull request #17114 from curzon01/modbus
Fix generic modbus single phase register output
This commit is contained in:
commit
9e65dd51e9
@ -750,18 +750,19 @@ void EnergyModbusShow(bool json) {
|
|||||||
values[j] = NrgMbsUser[i].data[j];
|
values[j] = NrgMbsUser[i].data[j];
|
||||||
}
|
}
|
||||||
uint32_t resolution = EnergyModbusResolution(NrgMbsUser[i].resolution);
|
uint32_t resolution = EnergyModbusResolution(NrgMbsUser[i].resolution);
|
||||||
|
uint32_t single = (!isnan(NrgMbsUser[i].data[1]) && !isnan(NrgMbsUser[i].data[2])) ? 0 : 1;
|
||||||
|
|
||||||
#ifdef ENERGY_MODBUS_DEBUG_SHOW
|
#ifdef ENERGY_MODBUS_DEBUG_SHOW
|
||||||
AddLog(LOG_LEVEL_DEBUG, PSTR("NRG: resolution %d -> %d"), NrgMbsUser[i].resolution, resolution);
|
AddLog(LOG_LEVEL_DEBUG, PSTR("NRG: resolution %d -> %d"), NrgMbsUser[i].resolution, resolution);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (json) {
|
if (json) {
|
||||||
ResponseAppend_P(PSTR(",\"%s\":%s"), NrgMbsUser[i].json_name, EnergyFormat(value_chr, values, resolution));
|
ResponseAppend_P(PSTR(",\"%s\":%s"), NrgMbsUser[i].json_name, EnergyFormat(value_chr, values, resolution, single));
|
||||||
#ifdef USE_WEBSERVER
|
#ifdef USE_WEBSERVER
|
||||||
} else {
|
} else {
|
||||||
WSContentSend_PD(PSTR("{s}%s{m}%s %s{e}"),
|
WSContentSend_PD(PSTR("{s}%s{m}%s %s{e}"),
|
||||||
NrgMbsUser[i].gui_name,
|
NrgMbsUser[i].gui_name,
|
||||||
WebEnergyFormat(value_chr, values, resolution),
|
WebEnergyFormat(value_chr, values, resolution, single),
|
||||||
NrgMbsUser[i].gui_unit);
|
NrgMbsUser[i].gui_unit);
|
||||||
#endif // USE_WEBSERVER
|
#endif // USE_WEBSERVER
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user