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

PARAMS_PANID is now defined in contiki-conf and no longer in params.h to be able

Browse source 
to change framer panid
This commit is contained in:
andreas@reder.eu 2013-03-20 07:23:03 +01:00 • committed by harald
parent 46010cbbd6
commit 86a6d88799
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
platform/osd-merkur/contiki-conf.h
View file

@ -99,6 +99,10 @@ typedef unsigned long off_t;
/* Logging adds 200 bytes to program size. RS232 output slows down webserver. */ /* Logging adds 200 bytes to program size. RS232 output slows down webserver. */
//#define LOG_CONF_ENABLED 1 //#define LOG_CONF_ENABLED 1
/* Network Panid */
#define IEEE802154_CONF_PANID 0xABCD
#define PARAMS_PANID IEEE802154_CONF_PANID
/* RADIOSTATS is used in rf230bb, clock.c and the webserver cgi to report radio usage */ /* RADIOSTATS is used in rf230bb, clock.c and the webserver cgi to report radio usage */
/* It has less overhead than ENERGEST */ /* It has less overhead than ENERGEST */
#define RADIOSTATS 0 #define RADIOSTATS 0

8
platform/osd-merkur/params.h
View file

@ -36,7 +36,6 @@ extern uint8_t eemem_mac_address[8];
extern uint8_t eemem_server_name[16]; extern uint8_t eemem_server_name[16];
extern uint8_t eemem_domain_name[30]; extern uint8_t eemem_domain_name[30];
#endif #endif
#ifdef SERVER_NAME #ifdef SERVER_NAME
#define PARAMS_SERVERNAME SERVER_NAME #define PARAMS_SERVERNAME SERVER_NAME
#else #else
@ -57,11 +56,6 @@ extern uint8_t eemem_domain_name[30];
#else #else
#define PARAMS_CHANNEL 26 #define PARAMS_CHANNEL 26
#endif #endif
#ifdef IEEE802154_PANID
#define PARAMS_PANID IEEE802154_PANID
#else
#define PARAMS_PANID 0xABCD
#endif
#ifdef IEEE802154_PANADDR #ifdef IEEE802154_PANADDR
#define PARAMS_PANADDR IEEE802154_PANADDR #define PARAMS_PANADDR IEEE802154_PANADDR
#else #else
@ -79,7 +73,7 @@ extern uint8_t eemem_domain_name[30];
#if UIP_CONF_LL_802154 #if UIP_CONF_LL_802154
//#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN} //#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN, 0xNN}
//#define PARAMS_EUI64ADDR {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01} //#define PARAMS_EUI64ADDR {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01}
#define PARAMS_EUI64ADDR {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x03} #define PARAMS_EUI64ADDR {0x00, 0x21, 0x2e, 0xff, 0xff, 0x00, 0x26, 0x6c}
//#define PARAMS_EUI64ADDR {0x00, 0x21, 0x2e, 0xff, 0xff, 0x00, 0x1E, 0xFB} //#define PARAMS_EUI64ADDR {0x00, 0x21, 0x2e, 0xff, 0xff, 0x00, 0x1E, 0xFB}
#else #else
//#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xff, 0xfe, 0xNN, 0xNN, 0xNN} //#define PARAMS_EUI64ADDR {0x02, 0xNN, 0xNN, 0xff, 0xfe, 0xNN, 0xNN, 0xNN}