deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bugfix post led/RGB

Browse source
This commit is contained in:
Harald Pichler 2016-11-05 19:34:07 +01:00
parent 646bb077ef
commit d8bb685989
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
examples/osd/opentrigger-board/resources/res-rgb.c
View file

@ -37,7 +37,6 @@
*/ */
#include "contiki.h" #include "contiki.h"
#include <string.h> #include <string.h>
#include "rest-engine.h" #include "rest-engine.h"
#include "generic_resource.h" #include "generic_resource.h"
@ -51,7 +50,7 @@ static void res_post_put_handler(void *request, void *response, uint8_t *buffer,
/* A simple getter example. Returns the reading from the sensor with a simple etag */ /* A simple getter example. Returns the reading from the sensor with a simple etag */
RESOURCE(res_rgb, RESOURCE(res_rgb,
"title=\"LED: , POST/PUT mode=on|off\";rt=\"Control\"", "title=\"LED: , POST/PUT r=10&g=11&b=12\";rt=\"Control\"",
res_get_handler, res_get_handler,
res_post_put_handler, res_post_put_handler,
res_post_put_handler, res_post_put_handler,
@ -65,7 +64,7 @@ res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferr
if(accept == -1 || accept == REST.type.TEXT_PLAIN) { if(accept == -1 || accept == REST.type.TEXT_PLAIN) {
REST.set_header_content_type(response, REST.type.TEXT_PLAIN); REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "%d %d %d",color_rgb [0],color_rgb [1],color_rgb [2] ); snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "r=%d&g=%d&b=%d",color_rgb [0],color_rgb [1],color_rgb [2] );
REST.set_response_payload(response, buffer, strlen((char *)buffer)); REST.set_response_payload(response, buffer, strlen((char *)buffer));
} else if(accept == REST.type.APPLICATION_JSON) { } else if(accept == REST.type.APPLICATION_JSON) {
@ -91,20 +90,20 @@ res_post_put_handler(void *request, void *response, uint8_t *buffer, uint16_t pr
if(success && (len = REST.get_post_variable(request, "r", &valr))) { if(success && (len = REST.get_post_variable(request, "r", &valr))) {
if(len != 0) { if(len != 0) {
// printf("r= %s;",valr);
} else { } else {
success = 0; success = 0;
} }
if(success && (len = REST.get_post_variable(request, "g", &valg))) { if(success && (len = REST.get_post_variable(request, "g", &valg))) {
if(len != 0) { if(len != 0) {
// printf("g= %s;",valg);
} else { } else {
success = 0; success = 0;
} }
} }
if(success && (len = REST.get_post_variable(request, "b", &valb))) { if(success && (len = REST.get_post_variable(request, "b", &valb))) {
if(len != 0) { if(len != 0) {
// printf("b= %s;\n",valb);
} else { } else {
success = 0; success = 0;
} }

1
examples/osd/opentrigger-board/sketch.pde
View file

@ -84,6 +84,7 @@ color_from_string (const char *name, const char *uri, const char *s)
extern "C" int extern "C" int
color_rgb_from_string (const char *r, const char *g, const char *b) color_rgb_from_string (const char *r, const char *g, const char *b)
{ {
// printf("rgb r=%s; g=%s; b=%s;\n",r,g,b);
color_rgb [0] = atoi (r); color_rgb [0] = atoi (r);
color_rgb [1] = atoi (g); color_rgb [1] = atoi (g);
color_rgb [2] = atoi (b); color_rgb [2] = atoi (b);