pim/lightswitch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix JSON escaping and scoping

Browse Source
This commit is contained in:
Pim van Pelt
2018-01-24 14:27:58 +01:00
parent 4a083555e8
commit 7ea1e26020
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/channel.c
View File

@ -147,7 +147,7 @@ void channel_set(int idx, bool state) {
if (s_channels[idx].led_gpio!=GPIO_INVALID) if (s_channels[idx].led_gpio!=GPIO_INVALID)
mgos_gpio_write(s_channels[idx].led_gpio, state); mgos_gpio_write(s_channels[idx].led_gpio, state);
mqtt_publish_stat("channel", "{\"idx\": %d, \"relay_state\": %d}", idx, channel_get(idx)); mqtt_publish_stat("channel", "{idx: %d, relay_state: %d}", idx, channel_get(idx));
} }
bool channel_get(int idx) { bool channel_get(int idx) {

6
src/rpc.c
View File

@ -49,7 +49,7 @@ static void rpc_channel_toggle_handler(struct mg_rpc_request_info *ri, void *cb_
return; return;
channel_handler(gpio, NULL); channel_handler(gpio, NULL);
mg_rpc_send_responsef(ri, "idx: %d, relay_state: %d", idx, channel_get(idx)); mg_rpc_send_responsef(ri, "{idx: %d, relay_state: %d}", idx, channel_get(idx));
ri = NULL; ri = NULL;
(void) ri; (void) ri;
@ -67,7 +67,7 @@ static void rpc_channel_get_handler(struct mg_rpc_request_info *ri, void *cb_arg
if (!rpc_args_to_idx_and_gpio(ri, args, &idx, &gpio)) if (!rpc_args_to_idx_and_gpio(ri, args, &idx, &gpio))
return; return;
mg_rpc_send_responsef(ri, "idx: %d, relay_state: %d", idx, channel_get(idx)); mg_rpc_send_responsef(ri, "{idx: %d, relay_state: %d}", idx, channel_get(idx));
ri = NULL; ri = NULL;
(void) ri; (void) ri;
@ -103,7 +103,7 @@ static void rpc_channel_set_handler(struct mg_rpc_request_info *ri, void *cb_arg
} }
channel_set(idx, (bool) value); channel_set(idx, (bool) value);
mg_rpc_send_responsef(ri, "idx: %d, relay_state: %d", idx, channel_get(idx)); mg_rpc_send_responsef(ri, "{idx: %d, relay_state: %d}", idx, channel_get(idx));
ri = NULL; ri = NULL;
(void) ri; (void) ri;