jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 12:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ResponseAppend_P API

Browse Source
This commit is contained in:
Charles 2020-08-16 11:54:16 +02:00
parent 6e05a247b7
commit 7c7545761a
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tasmota/xnrg_15_teleinfo.ino
View File

@ -325,16 +325,11 @@ void NewFrameCallback(struct _ValueList * me)
if (Settings.flag4.teleinfo_rawdata) { if (Settings.flag4.teleinfo_rawdata) {
struct _ValueList * me = tinfo.getList(); struct _ValueList * me = tinfo.getList();
// Total size we can use, remove { } and \0 char sep = ' '; // First JSON value separator
int remaining_size;
char sep = ' ';
char * p ; char * p ;
int len;
boolean isNumber ; boolean isNumber ;
strcpy_P(mqtt_data, PSTR("{")); Response_P(PSTR("{"));
len = strlen(mqtt_data);
remaining_size = sizeof(mqtt_data) - len - 2;
// Loop thru all the teleinfo frame but // Loop thru all the teleinfo frame but
// always check we don't buffer overflow of MQTT data // always check we don't buffer overflow of MQTT data
@ -354,23 +349,20 @@ void NewFrameCallback(struct _ValueList * me)
p++; p++;
} }
ResponseAppend_P( PSTR("%c\"%s\":"), sep, me->name );
if (!isNumber) { if (!isNumber) {
snprintf_P(mqtt_data+len, remaining_size, PSTR("%c\"%s\":\"%s\""), sep, me->name, me->value); ResponseAppend_P( PSTR("\"%s\""), me->value );
} else { } else {
snprintf_P(mqtt_data+len, remaining_size, PSTR("%c\"%s\":%d"), sep, me->name, atoi(me->value)); ResponseAppend_P( PSTR("%d"), atoi(me->value));
} }
// Total size we can use now
// Still remove space for latest } and \0 and current size
len = strlen(mqtt_data);
remaining_size = sizeof(mqtt_data) - len - 2 ;
// Now separator is comma // Now separator is comma
sep =','; sep =',';
} }
} }
strcat_P(mqtt_data, PSTR("}")); ResponseJsonEnd();
MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data); MqttPublishPrefixTopic_P(RESULT_OR_TELE, mqtt_data);
} }