From 1b90f53ba4a4e0f4984999fb42b15bae49b92422 Mon Sep 17 00:00:00 2001 From: asterix Date: Tue, 11 Oct 2011 15:13:12 +0000 Subject: [PATCH] Insert leds status inside the json string. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@5154 38d2e660-2303-0410-9eaa-f027e97ec537 --- boards/sam3x-ek/examples/sam3x-ek_http_server/main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/boards/sam3x-ek/examples/sam3x-ek_http_server/main.c b/boards/sam3x-ek/examples/sam3x-ek_http_server/main.c index 712c6b6c..6b545b4d 100644 --- a/boards/sam3x-ek/examples/sam3x-ek_http_server/main.c +++ b/boards/sam3x-ek/examples/sam3x-ek_http_server/main.c @@ -202,13 +202,15 @@ static int cgi_status(struct netconn *client, const char *name, char *recv_buf, sprintf(status.last_connected_ip, "%d.%d.%d.%d", IP_ADDR_TO_INT_TUPLE(client->pcb.ip->remote_ip.addr)); sprintf(status.local_ip, "%d.%d.%d.%d", IP_ADDR_TO_INT_TUPLE(client->pcb.ip->local_ip.addr)); - sprintf((char *)tx_buf, "{ \"local_ip\":\"%s\",\"last_connected_ip\":\"%s\", \"temp\":%d.%d,\"volt\":%d.%d,\"up_time\":%ld,\"tot_req\":%d }", + sprintf((char *)tx_buf, "{ \"local_ip\":\"%s\",\"last_connected_ip\":\"%s\", \"temp\":%d.%d,\"volt\":%d.%d,\"up_time\":%ld,\"tot_req\":%d, \ +\"leds\":{ \"0\":\"%d\", \"1\":\"%d\", \"2\":\"%d\"}}", status.local_ip, status.last_connected_ip, status.internal_temp / 10, status.internal_temp % 10, volt / 1000, volt % 1000, - status.up_time, status.tot_req); - - + status.up_time, status.tot_req, + GET_LED_STATUS(status.led_status, 0), + GET_LED_STATUS(status.led_status, 1), + GET_LED_STATUS(status.led_status, 2)); http_sendOk(client, HTTP_CONTENT_JSON); netconn_write(client, tx_buf, strlen((char *)tx_buf), NETCONN_COPY); -- 2.25.1