From 7ea1e260205dc01735a4b1d506d3a1258ebc17a8 Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Wed, 24 Jan 2018 14:27:58 +0100 Subject: [PATCH] Fix JSON escaping and scoping --- src/channel.c | 2 +- src/rpc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/channel.c b/src/channel.c index a06c732..10e40e9 100644 --- a/src/channel.c +++ b/src/channel.c @@ -147,7 +147,7 @@ void channel_set(int idx, bool state) { if (s_channels[idx].led_gpio!=GPIO_INVALID) 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) { diff --git a/src/rpc.c b/src/rpc.c index da98add..bd23ee6 100644 --- a/src/rpc.c +++ b/src/rpc.c @@ -49,7 +49,7 @@ static void rpc_channel_toggle_handler(struct mg_rpc_request_info *ri, void *cb_ return; 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; (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)) 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; (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); - 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; (void) ri;