jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-29 05:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11616 from hallard/teleinfo

Browse Source 
fixed wrong display in some case
This commit is contained in:
Theo Arends 2021-04-07 13:36:03 +02:00 committed by GitHub
commit 4c1011d0aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tasmota/xnrg_15_teleinfo.ino
View File

@ -620,8 +620,8 @@ void TInfoShow(bool json)
} }
else else
{ {
char name[32]; char name[33];
char value[32]; char value[33];
if (tinfo_mode==TINFO_MODE_HISTORIQUE ) { if (tinfo_mode==TINFO_MODE_HISTORIQUE ) {
if (getValueFromLabelIndex(LABEL_BASE, value) ) { if (getValueFromLabelIndex(LABEL_BASE, value) ) {
@ -670,13 +670,13 @@ void TInfoShow(bool json)
if (getValueFromLabelIndex(LABEL_SMAXSN, value) ) { if (getValueFromLabelIndex(LABEL_SMAXSN, value) ) {
WSContentSend_PD(HTTP_ENERGY_PMAX_TELEINFO, atoi(value)); WSContentSend_PD(HTTP_ENERGY_PMAX_TELEINFO, atoi(value));
} }
if (getValueFromLabelIndex(LABEL_LTARF, name) ) { if (getValueFromLabelIndex(LABEL_LTARF, value) ) {
WSContentSend_PD(HTTP_ENERGY_TARIF_TELEINFO, name); WSContentSend_PD(HTTP_ENERGY_TARIF_TELEINFO, value);
} }
if (getValueFromLabelIndex(LABEL_NGTF, name) ) { if (getValueFromLabelIndex(LABEL_NGTF, value) ) {
if (isousc) { if (isousc) {
int percent = (int) ((Energy.current[0]*100.0f) / isousc) ; int percent = (int) ((Energy.current[0]*100.0f) / isousc) ;
WSContentSend_PD(HTTP_ENERGY_CONTRAT_TELEINFO, name, isousc); WSContentSend_PD(HTTP_ENERGY_CONTRAT_TELEINFO, value, isousc);
WSContentSend_PD(HTTP_ENERGY_LOAD_TELEINFO, percent); WSContentSend_PD(HTTP_ENERGY_LOAD_TELEINFO, percent);
} }
} }