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

coap 18

Browse source
This commit is contained in:
Harald Pichler 2014-12-29 08:16:47 +01:00
parent aaaa0aa138
commit 365fe31b02
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/json-resource/generic_resource.c
View file

@ -46,8 +46,7 @@
#include <string.h> #include <string.h>
#include "contiki.h" #include "contiki.h"
#include "jsonparse.h" #include "jsonparse.h"
/* Only coap 13 for now */ #include "er-coap.h"
#include "er-coap-13.h"
#include "generic_resource.h" #include "generic_resource.h"
/* Error-handling macro */ /* Error-handling macro */
@ -125,7 +124,8 @@ void generic_handler
const uint8_t *bytes = NULL; const uint8_t *bytes = NULL;
const uint16_t *accept = NULL; const uint16_t *accept = NULL;
uint16_t a_ctype = REST.type.APPLICATION_JSON; uint16_t a_ctype = REST.type.APPLICATION_JSON;
uint16_t c_ctype = REST.get_header_content_type (request); uint16_t c_ctype;
n_acc = REST.get_header_content_type (request, &c_ctype);
/* Seems like accepted type is currently unsupported? */ /* Seems like accepted type is currently unsupported? */
n_acc = REST.get_header_accept (request, &accept); n_acc = REST.get_header_accept (request, &accept);

3
apps/time/resource_gmtime.c
View file

@ -14,8 +14,7 @@
#include "time.h" #include "time.h"
#include "time_resource.h" #include "time_resource.h"
#include "jsonparse.h" #include "jsonparse.h"
/* Only coap 13 for now */ #include "er-coap.h"
#include "er-coap-13.h"
#include "generic_resource.h" #include "generic_resource.h"
size_t time_to_string (const char *name, uint8_t is_json, char *buf, size_t bs) size_t time_to_string (const char *name, uint8_t is_json, char *buf, size_t bs)

2
apps/time/time_resource.h
View file

@ -17,7 +17,7 @@
#ifndef time_resource_h #ifndef time_resource_h
#define time_resource_h #define time_resource_h
#include "contiki.h" #include "contiki.h"
#include "erbium.h" #include "rest-engine.h"
extern resource_t resource_timestamp; extern resource_t resource_timestamp;
extern resource_t resource_localtime; extern resource_t resource_localtime;

1
examples/osd/arduino-sketch/sketch.pde
View file

@ -23,6 +23,7 @@ uint16_t analog5_voltage = 0;
void setup (void) void setup (void)
{ {
arduino_pwm_timer_init ();
rest_init_engine (); rest_init_engine ();
rest_activate_resource (&resource_led_pwm); rest_activate_resource (&resource_led_pwm);
rest_activate_resource (&resource_led_period); rest_activate_resource (&resource_led_period);