pim/mongoose-touch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add 'mqtt' field -- a \001 delimited string of topics+messages to send

Browse Source
This commit is contained in:
Pim van Pelt
2017-12-02 21:29:42 +01:00
parent b8e5637c8b
commit 2b756cee3d
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/widget.c
View File

@ -99,11 +99,22 @@ struct widget_t *widget_create_from_json(const char *json) {
if (json_scanf(json, strlen(json), "{mqtt:%Q}", &mqtt) != 1) { if (json_scanf(json, strlen(json), "{mqtt:%Q}", &mqtt) != 1) {
LOG(LL_WARN, ("Widget '%s' is of type MQTT_BUTTON but does not have attribute 'mqtt'", widget->name)); LOG(LL_WARN, ("Widget '%s' is of type MQTT_BUTTON but does not have attribute 'mqtt'", widget->name));
} else { } else {
// Find length of all messages
uint16_t len=0;
char *p=NULL;
while ((h = json_next_elem(json, strlen(json), h, ".mqtt", &idx, &val)) != NULL) { while ((h = json_next_elem(json, strlen(json), h, ".mqtt", &idx, &val)) != NULL) {
LOG(LL_INFO, ("[%d]: [%.*s]", idx, val.len, val.ptr)); LOG(LL_INFO, ("[%d]: [%.*s]", idx, val.len, val.ptr));
if (val.len>0 && val.ptr) { len+=val.len;
}
} }
LOG(LL_INFO, ("%d elements in the list, %d total length", idx, len));
p=malloc(len+1+idx);
memset(p, 0, len+1+idx);
while ((h = json_next_elem(json, strlen(json), h, ".mqtt", &idx, &val)) != NULL) {
strncat(p, val.ptr, val.len);
strncat(p, "\001", len+1+idx);
}
LOG(LL_INFO, ("String is '%.*s'", len+idx, p));
widget->user_data=p;
if(mqtt) free(mqtt); if(mqtt) free(mqtt);
} }
} }