update project to coap 13

2014-11-14 15:59:22 +01:00 · 2014-11-14 15:59:22 +01:00 · 8966f7d509
parent 0620eb86d0
commit 8966f7d509
3 changed files with 97 additions and 52 deletions
--- a/examples/osd/pir-sensor/Makefile
+++ b/examples/osd/pir-sensor/Makefile
@ -1,44 +1,50 @@
 all: er-example-server
-# Use this target explicitly if requried: er-plugtest-server
+# use this target explicitly if requried: er-plugtest-server
+
+
+# variable for this Makefile
+# configure CoAP implementation (3|7|12|13) (er-coap-07 also supports CoAP draft 08)
+WITH_COAP=13
+
+# for some platforms
+UIP_CONF_IPV6=1
+# IPv6 make config disappeared completely
+CFLAGS += -DUIP_CONF_IPV6=1

 CONTIKI=../../..
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

-# for static routing, if enabled
+# variable for Makefile.include
 ifneq ($(TARGET), minimal-net)
-ifneq ($(TARGET), native)
-ifneq ($(findstring avr,$(TARGET)), avr)
-PROJECT_SOURCEFILES += static-routing.c
-endif
-endif
-endif
-
-# variable for root Makefile.include
-WITH_UIP6=1
-# for some platforms
-UIP_CONF_IPV6=1
-
-# variable for this Makefile
-# configure CoAP implementation (3|7) (er-coap-07 also supports CoAP draft 08)
-WITH_COAP=7
-
-# new variable since slip-radio
-ifneq ($(TARGET), minimal-net)
-UIP_CONF_RPL=1
+CFLAGS += -DUIP_CONF_IPV6_RPL=1
 else
 # minimal-net does not support RPL under Linux and is mostly used to test CoAP only
 ${info INFO: compiling without RPL}
-UIP_CONF_RPL=0
-CFLAGS += -DUIP_CONF_ND6_DEF_MAXDADNS=0
+CFLAGS += -DUIP_CONF_IPV6_RPL=0
 CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\"
-CFLAGS += -DUIP_CONF_BUFFER_SIZE=1280
+${info INFO: compiling with large buffers}
+CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048
+CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
+CFLAGS += -DCOAP_MAX_HEADER_SIZE=640
 endif

 # linker optimizations
 SMALL=1

 # REST framework, requires WITH_COAP
-ifeq ($(WITH_COAP), 7)
+ifeq ($(WITH_COAP), 13)
+${info INFO: compiling with CoAP-13}
+CFLAGS += -DWITH_COAP=13
+CFLAGS += -DREST=coap_rest_implementation
+CFLAGS += -DUIP_CONF_TCP=0
+APPS += er-coap-13
+else ifeq ($(WITH_COAP), 12)
+${info INFO: compiling with CoAP-12}
+CFLAGS += -DWITH_COAP=12
+CFLAGS += -DREST=coap_rest_implementation
+CFLAGS += -DUIP_CONF_TCP=0
+APPS += er-coap-12
+else ifeq ($(WITH_COAP), 7)
 ${info INFO: compiling with CoAP-08}
 CFLAGS += -DWITH_COAP=7
 CFLAGS += -DREST=coap_rest_implementation
@ -84,5 +90,5 @@ connect-router:	$(CONTIKI)/tools/tunslip6
 connect-router-cooja:	$(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 aaaa::1/64

-tap0up:
+connect-minimal:
 	sudo ip address add fdfd::1/64 dev tap0
--- a/examples/osd/pir-sensor/er-example-server.c
+++ b/examples/osd/pir-sensor/er-example-server.c
@ -82,11 +82,15 @@
 #include "er-coap-03.h"
 #elif WITH_COAP == 7
 #include "er-coap-07.h"
+#elif WITH_COAP == 12
+#include "er-coap-12.h"
+#elif WITH_COAP == 13
+#include "er-coap-13.h"
 #else
 #warning "Erbium example without CoAP-specifc functionality"
 #endif /* CoAP-specific example */

-#define DEBUG 0
+#define DEBUG 1
 #if DEBUG
 #define PRINTF(...) printf(__VA_ARGS__)
 #define PRINT6ADDR(addr) PRINTF("[%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]", ((uint8_t *)addr)[0], ((uint8_t *)addr)[1], ((uint8_t *)addr)[2], ((uint8_t *)addr)[3], ((uint8_t *)addr)[4], ((uint8_t *)addr)[5], ((uint8_t *)addr)[6], ((uint8_t *)addr)[7], ((uint8_t *)addr)[8], ((uint8_t *)addr)[9], ((uint8_t *)addr)[10], ((uint8_t *)addr)[11], ((uint8_t *)addr)[12], ((uint8_t *)addr)[13], ((uint8_t *)addr)[14], ((uint8_t *)addr)[15])
@ -232,10 +236,11 @@ pir_event_handler(resource_t *r)
  ++event_counter;

  PRINTF("PIR TICK %u for /%s\n", event_counter, r->url);
-
-  /* Build notification. */
+  
+    /* Build notification. */
  coap_packet_t notification[1]; /* This way the packet can be treated as pointer as usual. */
-  coap_init_message(notification, COAP_TYPE_CON, CONTENT_2_05, 0 );
+  coap_init_message(notification, COAP_TYPE_CON, REST.status.OK, 0 );
+  
  coap_set_payload(notification, content, snprintf(content, sizeof(content), "EVENT %u", event_counter));

  /* Notify the registered observers with the given message type, observe option, and payload. */
--- a/examples/osd/pir-sensor/project-conf.h
+++ b/examples/osd/pir-sensor/project-conf.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Swedish Institute of Computer Science.
+ * Copyright (c) 2013, Matthias Kovatsch
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -29,8 +29,8 @@
 *
 */

-#ifndef __PROJECT_RPL_WEB_CONF_H__
-#define __PROJECT_RPL_WEB_CONF_H__
+#ifndef PROJECT_ERBIUM_CONF_H_
+#define PROJECT_ERBIUM_CONF_H_

 //#define PLATFORM_HAS_LEDS    1
 //#define PLATFORM_HAS_BUTTON  1
@ -38,36 +38,70 @@
 //#define PLATFORM_HAS_TEMPERATURE   1
 #define PLATFORM_HAS_BATTERY 1

-#define SICSLOWPAN_CONF_FRAG	1
+/* Some platforms have weird includes. */
+// #undef IEEE802154_CONF_PANID
+// #define IEEE802154_CONF_PANID 0xAAAA
+
+/* For Debug: Dont allow MCU sleeping between channel checks */
+#undef RDC_CONF_MCU_SLEEP
+#define RDC_CONF_MCU_SLEEP       0

 /* Disabling RDC for demo purposes. Core updates often require more memory. */
 /* For projects, optimize memory and enable RDC again. */
-//#undef NETSTACK_CONF_RDC
+// #undef NETSTACK_CONF_RDC
 //#define NETSTACK_CONF_RDC     nullrdc_driver

-/* Save some memory for the sky platform. */
-#undef UIP_CONF_DS6_NBR_NBU
-#define UIP_CONF_DS6_NBR_NBU     10
-#undef UIP_CONF_DS6_ROUTE_NBU
-#define UIP_CONF_DS6_ROUTE_NBU   10
+// enabel LEAF-NODE mode
+//#define RPL_CONF_LEAF_ONLY	1

-/* Increase rpl-border-router IP-buffer when using 128. */
-#ifndef REST_MAX_CHUNK_SIZE
+/* Increase rpl-border-router IP-buffer when using more than 64. */
+#undef REST_MAX_CHUNK_SIZE
 #define REST_MAX_CHUNK_SIZE    64
-#endif
+
+/* Estimate your header size, especially when using Proxy-Uri. */
+/*
+#undef COAP_MAX_HEADER_SIZE
+#define COAP_MAX_HEADER_SIZE    70
+*/
+
+/* The IP buffer size must fit all other hops, in particular the border router. */
+
+#undef UIP_CONF_BUFFER_SIZE
+#define UIP_CONF_BUFFER_SIZE    256
+

 /* Multiplies with chunk size, be aware of memory constraints. */
-#ifndef COAP_MAX_OPEN_TRANSACTIONS
-#define COAP_MAX_OPEN_TRANSACTIONS   2
-#endif
+#undef COAP_MAX_OPEN_TRANSACTIONS
+#define COAP_MAX_OPEN_TRANSACTIONS   4

-/* Must be <= open transaction number. */
-#ifndef COAP_MAX_OBSERVERS
-#define COAP_MAX_OBSERVERS      COAP_MAX_OPEN_TRANSACTIONS-1
-#endif
+/* Must be <= open transaction number, default is COAP_MAX_OPEN_TRANSACTIONS-1. */
+/*
+#undef COAP_MAX_OBSERVERS
+#define COAP_MAX_OBSERVERS      2
+*/
+
+/* Filtering .well-known/core per query can be disabled to save space. */
+/*
+#undef COAP_LINK_FORMAT_FILTERING
+#define COAP_LINK_FORMAT_FILTERING      0
+*/
+
+/* Save some memory for the sky platform. */
+/*
+#undef NBR_TABLE_CONF_MAX_NEIGHBORS
+#define NBR_TABLE_CONF_MAX_NEIGHBORS     10
+#undef UIP_CONF_MAX_ROUTES
+#define UIP_CONF_MAX_ROUTES   10
+*/

 /* Reduce 802.15.4 frame queue to save RAM. */
+/*
 #undef QUEUEBUF_CONF_NUM
-#define QUEUEBUF_CONF_NUM               4
+#define QUEUEBUF_CONF_NUM       4
+*/

-#endif /* __PROJECT_RPL_WEB_CONF_H__ */
+/*
+#undef SICSLOWPAN_CONF_FRAG
+#define SICSLOWPAN_CONF_FRAG	1
+*/
+#endif /* PROJECT_ERBIUM_CONF_H_ */