From ceb868d934462a7038a8c5636f5b10c5b82edda7 Mon Sep 17 00:00:00 2001 From: Niclas Finne Date: Tue, 15 Apr 2014 22:59:20 +0200 Subject: [PATCH] Modified project setup for er-rest-example and rest-example to use nullrdc and nullmac to reduce the code size. This allows the examples to compile on Tmote Sky again. --- examples/er-rest-example/project-conf.h | 8 ++++++-- examples/rest-example/project-conf.h | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/examples/er-rest-example/project-conf.h b/examples/er-rest-example/project-conf.h index 128ccd0b2..edaf10b71 100644 --- a/examples/er-rest-example/project-conf.h +++ b/examples/er-rest-example/project-conf.h @@ -35,11 +35,15 @@ /* Some platforms have weird includes. */ #undef IEEE802154_CONF_PANID -/* Disabling RDC for demo purposes. Core updates often require more memory. */ -/* For projects, optimize memory and enable RDC again. */ +/* Disabling RDC and CSMA for demo purposes. Core updates often + require more memory. */ +/* For projects, optimize memory and enable RDC and CSMA again. */ #undef NETSTACK_CONF_RDC #define NETSTACK_CONF_RDC nullrdc_driver +#undef NETSTACK_CONF_MAC +#define NETSTACK_CONF_MAC nullmac_driver + /* Increase rpl-border-router IP-buffer when using more than 64. */ #undef REST_MAX_CHUNK_SIZE #define REST_MAX_CHUNK_SIZE 64 diff --git a/examples/rest-example/project-conf.h b/examples/rest-example/project-conf.h index ca93a92ec..7019c021a 100644 --- a/examples/rest-example/project-conf.h +++ b/examples/rest-example/project-conf.h @@ -32,6 +32,15 @@ #ifndef PROJECT_RPL_WEB_CONF_H_ #define PROJECT_RPL_WEB_CONF_H_ +/* Disabling RDC and CSMA for demo purposes. Core updates often + require more memory. */ +/* For projects, optimize memory and enable RDC and CSMA again. */ +#undef NETSTACK_CONF_RDC +#define NETSTACK_CONF_RDC nullrdc_driver + +#undef NETSTACK_CONF_MAC +#define NETSTACK_CONF_MAC nullmac_driver + #ifndef QUEUEBUF_CONF_NUM #define QUEUEBUF_CONF_NUM 6 #endif