From afa20ee0ae2e3f15b5deabe155955950bef36f61 Mon Sep 17 00:00:00 2001 From: harald42 Date: Tue, 19 Nov 2013 15:23:52 +0100 Subject: [PATCH] cleanup plattform defines, disable energest, radiostatistics --- .../er-example-server.c | 2 +- platform/osd-merkur/contiki-conf.h | 7 ++---- platform/osd-merkur/contiki-main.c | 1 - platform/osd-merkur/params.c | 12 +++++----- platform/osd-merkur/params.h | 22 +++++++------------ 5 files changed, 17 insertions(+), 27 deletions(-) diff --git a/examples/osd/er-rest-example-merkurboard/er-example-server.c b/examples/osd/er-rest-example-merkurboard/er-example-server.c index dca42a593..14c203b12 100644 --- a/examples/osd/er-rest-example-merkurboard/er-example-server.c +++ b/examples/osd/er-rest-example-merkurboard/er-example-server.c @@ -48,7 +48,7 @@ #define REST_RES_DS1820 0 #define REST_RES_HELLO 0 #define REST_RES_MIRROR 0 /* causes largest code size */ -#define REST_RES_CHUNKS 0 +#define REST_RES_CHUNKS 1 #define REST_RES_SEPARATE 0 #define REST_RES_PUSHING 0 #define REST_RES_EVENT 1 diff --git a/platform/osd-merkur/contiki-conf.h b/platform/osd-merkur/contiki-conf.h index 95f61808a..489cdaf61 100644 --- a/platform/osd-merkur/contiki-conf.h +++ b/platform/osd-merkur/contiki-conf.h @@ -101,10 +101,10 @@ typedef unsigned long off_t; /* RADIOSTATS is used in rf230bb, clock.c and the webserver cgi to report radio usage */ /* It has less overhead than ENERGEST */ -#define RADIOSTATS 1 +//#define RADIOSTATS 1 /* More extensive stats, via main loop printfs or webserver status pages */ -#define ENERGEST_CONF_ON 1 +//#define ENERGEST_CONF_ON 1 /* Packet statistics */ typedef unsigned short uip_stats_t; @@ -190,7 +190,6 @@ typedef unsigned short uip_stats_t; #define NETSTACK_CONF_RDC sicslowmac_driver #define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_RADIO rf230_driver -#define CHANNEL_802_15_4 26 /* AUTOACK receive mode gives better rssi measurements, even if ACK is never requested */ #define RF230_CONF_AUTOACK 1 /* Request 802.15.4 ACK on all packets sent (else autoretry). This is primarily for testing. */ @@ -249,7 +248,6 @@ typedef unsigned short uip_stats_t; #define RIMESTATS_CONF_ENABLED 1 #define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_RADIO rf230_driver -#define CHANNEL_802_15_4 26 /* The radio needs to interrupt during an rtimer interrupt */ #define RTIMER_CONF_NESTED_INTERRUPTS 1 #define RF230_CONF_AUTOACK 1 @@ -290,7 +288,6 @@ typedef unsigned short uip_stats_t; #define NETSTACK_CONF_RDC cxmac_driver #define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_RADIO rf230_driver -#define CHANNEL_802_15_4 26 #define RF230_CONF_AUTOACK 1 #define SICSLOWPAN_CONF_FRAG 1 #define SICSLOWPAN_CONF_MAXAGE 3 diff --git a/platform/osd-merkur/contiki-main.c b/platform/osd-merkur/contiki-main.c index 8c5fe2de4..7fd111290 100644 --- a/platform/osd-merkur/contiki-main.c +++ b/platform/osd-merkur/contiki-main.c @@ -557,7 +557,6 @@ extern uip_ds6_netif_t uip_ds6_if; PRINTF("\nRoutes [%u max]\n",UIP_DS6_ROUTE_NB); { uip_ds6_route_t *r; - PRINTF("\nRoutes [%u max]\n",UIP_DS6_ROUTE_NB); j = 1; for(r = uip_ds6_route_list_head(); r != NULL; diff --git a/platform/osd-merkur/params.c b/platform/osd-merkur/params.c index a5a83932a..582dbe67f 100644 --- a/platform/osd-merkur/params.c +++ b/platform/osd-merkur/params.c @@ -119,8 +119,8 @@ uint8_t eemem_domain_name[] EEMEM = PARAMS_DOMAINNAME; #endif /*AVR_WEBSERVER */ uint16_t eemem_nodeid EEMEM = PARAMS_NODEID; -uint8_t eemem_channel[2] EEMEM = {PARAMS_CHANNEL, ~PARAMS_CHANNEL}; -uint16_t eemem_panid EEMEM = PARAMS_PANID; +uint8_t eemem_channel[2] EEMEM = {CHANNEL_802_15_4, ~CHANNEL_802_15_4}; +uint16_t eemem_panid EEMEM = IEEE802154_PANID; uint16_t eemem_panaddr EEMEM = PARAMS_PANADDR; uint8_t eemem_txpower EEMEM = PARAMS_TXPOWER; @@ -153,11 +153,11 @@ params_get_channel(void) { eeprom_write_block(&buffer, &eemem_server_name, sizeof(eemem_server_name)); for (i=0;iSet EEPROM RF channel to %d\n",x); } @@ -235,7 +235,7 @@ params_get_panid(void) { if (settings_get(SETTINGS_KEY_PAN_ID, 0,(unsigned char*)&x, &size) == SETTINGS_STATUS_OK) { PRINTD("<-Get PAN ID of %04x\n",x); } else { - x=PARAMS_PANID; + x=IEEE802154_PANID; if (settings_add_uint16(SETTINGS_KEY_PAN_ID,x)==SETTINGS_STATUS_OK) { PRINTD("->Set EEPROM PAN ID to %04x\n",x); } diff --git a/platform/osd-merkur/params.h b/platform/osd-merkur/params.h index e602ca3e0..f91ce5759 100644 --- a/platform/osd-merkur/params.h +++ b/platform/osd-merkur/params.h @@ -12,6 +12,11 @@ * * Note the parameters in this file can be changed without forcing a complete rebuild. */ +// default settings +#define CHANNEL_802_15_4 26 // default frequency (11-26) +#define IEEE802154_PANID 0xABCD // default panid +// end default settings + #define CONTIKI_CONF_RANDOM_MAC 0 //adds 78 bytes #define CONTIKI_CONF_SETTINGS_MANAGER 0 //adds 1696 bytes #define BOOTLOADER_GET_MAC 1 // get mac form boolaoder, need bootlaoder bonsai, PARAMETER_STORAGE 0 @@ -38,7 +43,6 @@ extern uint8_t eemem_mac_address[8]; extern uint8_t eemem_server_name[16]; extern uint8_t eemem_domain_name[30]; #endif - #ifdef SERVER_NAME #define PARAMS_SERVERNAME SERVER_NAME #else @@ -54,16 +58,6 @@ extern uint8_t eemem_domain_name[30]; #else #define PARAMS_NODEID 0 #endif -#ifdef CHANNEL_802_15_4 -#define PARAMS_CHANNEL CHANNEL_802_15_4 -#else -#define PARAMS_CHANNEL 26 -#endif -#ifdef IEEE802154_PANID -#define PARAMS_PANID IEEE802154_PANID -#else -#define PARAMS_PANID 0xABCD -#endif #ifdef IEEE802154_PANADDR #define PARAMS_PANADDR IEEE802154_PANADDR #else @@ -95,9 +89,9 @@ uint8_t params_get_eui64(uint8_t *eui64); #if PARAMETER_STORAGE==0 /* Hard coded program flash parameters */ #define params_get_servername(...) -#define params_get_nodeid(...) PARAMS_NODEID -#define params_get_channel(...) PARAMS_CHANNEL -#define params_get_panid(...) PARAMS_PANID +#define params_get_nodeid(...) PARAMS_NODEID +#define params_get_channel(...) CHANNEL_802_15_4 +#define params_get_panid(...) IEEE802154_PANID #define params_get_panaddr(...) PARAMS_PANADDR #define params_get_txpower(...) PARAMS_TXPOWER #else