replaced er-coap APP with the coap module

This commit is contained in:
Joakim Eriksson 2017-09-01 16:57:50 +02:00 committed by Niclas Finne
parent 6c96a428f2
commit 7930d35810
15 changed files with 19 additions and 22 deletions

View File

@ -20,8 +20,8 @@ endif
PROJECTDIRS += $(REST_RESOURCES_DIR)
PROJECT_SOURCEFILES += $(REST_RESOURCES_FILES)
# REST Engine shall use Erbium CoAP implementation
APPS += er-coap
# Include the CoAP implementation
MODULES += os/net/app-layer/coap
# optional rules to get assembly
#CUSTOM_RULE_C_TO_OBJECTDIR_O = 1

View File

@ -41,7 +41,7 @@
#include <string.h>
#include "contiki.h"
#include "contiki-net.h"
#include "er-coap-engine.h"
#include "coap-engine.h"
#include "dev/button-sensor.h"
#define DEBUG 0

View File

@ -38,9 +38,9 @@
#include <string.h>
#include "rest-engine.h"
#include "er-coap-block1.h"
#include "er-coap-separate.h"
#include "er-coap-transactions.h"
#include "coap-block1.h"
#include "coap-separate.h"
#include "coap-transactions.h"
static void res_post_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
SEPARATE_RESOURCE(res_b1_sep_b2, "title=\"Block1 + Separate + Block2 demo\"", NULL, res_post_handler, NULL, NULL, NULL);

View File

@ -38,7 +38,7 @@
#include <string.h>
#include "rest-engine.h"
#include "er-coap.h"
#include "coap.h"
#define DEBUG 0
#if DEBUG

View File

@ -38,7 +38,7 @@
#include <string.h>
#include "rest-engine.h"
#include "er-coap.h"
#include "coap.h"
#define DEBUG 0
#if DEBUG

View File

@ -38,7 +38,7 @@
#include <string.h>
#include "rest-engine.h"
#include "er-coap.h"
#include "coap.h"
static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
static void res_periodic_handler(void);

View File

@ -38,8 +38,8 @@
#include <string.h>
#include "rest-engine.h"
#include "er-coap-separate.h"
#include "er-coap-transactions.h"
#include "coap-separate.h"
#include "coap-transactions.h"
static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
static void res_resume_handler(void);

View File

@ -16,8 +16,8 @@ PROJECT_SOURCEFILES += httpd-simple.c
CONTIKI_WITH_IPV6 = 1
# REST Engine shall use Erbium CoAP implementation
APPS += er-coap
MODULES += os/net/app-layer/mqtt
MODULES += os/net/app-layer/coap
CONTIKI=../../../..
include $(CONTIKI)/Makefile.include

View File

@ -5,7 +5,7 @@ all: $(CONTIKI_PROJECT)
CONTIKI_WITH_IPV6 = 1
APPS += er-coap
MODULES += os/net/app-layer/coap
CONTIKI = ../../../..
include $(CONTIKI)/Makefile.include

View File

@ -15,6 +15,6 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
CFLAGS += -DWITH_COAP
CFLAGS += -DUIP_CONF_TCP=0
APPS += er-coap
MODULES += os/net/app-layer/coap
include $(CONTIKI)/Makefile.include

View File

@ -15,6 +15,6 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
CFLAGS += -DWITH_COAP
CFLAGS += -DUIP_CONF_TCP=0
APPS += er-coap
MODULES += os/net/app-layer/coap
include $(CONTIKI)/Makefile.include

View File

@ -15,6 +15,6 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
CFLAGS += -DWITH_COAP
CFLAGS += -DUIP_CONF_TCP=0
APPS += er-coap
MODULES += os/net/app-layer/coap
include $(CONTIKI)/Makefile.include

View File

@ -13,8 +13,7 @@ PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DWITH_COAP
CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0
APPS += er-coap
MODULES += os/net/app-layer/coap
MODULES += os/net/mac/tsch os/services/orchestra os/lib/json
all: $(CONTIKI_PROJECT)

View File

@ -15,8 +15,7 @@ PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DWITH_COAP
CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0
APPS += er-coap
MODULES += os/net/app-layer/coap
MODULES += os/net/mac/tsch os/services/orchestra os/lib/json
all: $(CONTIKI_PROJECT)

View File

@ -13,8 +13,7 @@ PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DWITH_COAP
CFLAGS += -DREST=coap_rest_implementation
CFLAGS += -DUIP_CONF_TCP=0
APPS += er-coap
MODULES += os/net/app-layer/coap
MODULES += os/net/mac/tsch os/services/orchestra os/lib/json
all: $(CONTIKI_PROJECT)