jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 19:56:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17114 from curzon01/modbus

Browse Source 
Fix generic modbus single phase register output
This commit is contained in:
Theo Arends 2022-11-17 15:21:36 +01:00 committed by GitHub
commit 9e65dd51e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasmota/tasmota_xnrg_energy/xnrg_29_modbus.ino
View File

@ -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
} }