Skip to content
Snippets Groups Projects
Commit 8a9ee96c authored by Adam Dunkels's avatar Adam Dunkels
Browse files

Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

parents e4aec834 3e5afa2b
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
platform/redbee-dev/contiki-conf.h
+ 2
− 2
View file @ 8a9ee96c
...@@ -115,7 +115,7 @@ typedef unsigned long rtimer_clock_t; ...@@ -115,7 +115,7 @@ typedef unsigned long rtimer_clock_t;
#define NETSTACK_CONF_RADIO contiki_maca_driver #define NETSTACK_CONF_RADIO contiki_maca_driver
#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_FRAMER framer_802154
#define MAC_CONF_CHANNEL_CHECK_RATE 8 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
#define CXMAC_CONF_ANNOUNCEMENTS 0 #define CXMAC_CONF_ANNOUNCEMENTS 0
#define XMAC_CONF_ANNOUNCEMENTS 0 #define XMAC_CONF_ANNOUNCEMENTS 0
...@@ -129,7 +129,7 @@ typedef unsigned long rtimer_clock_t; ...@@ -129,7 +129,7 @@ typedef unsigned long rtimer_clock_t;
#define NETSTACK_CONF_RADIO contiki_maca_driver #define NETSTACK_CONF_RADIO contiki_maca_driver
#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_FRAMER framer_802154
#define MAC_CONF_CHANNEL_CHECK_RATE 8 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
#define COLLECT_CONF_ANNOUNCEMENTS 1 #define COLLECT_CONF_ANNOUNCEMENTS 1
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
... ...
......
platform/redbee-econotag/contiki-conf.h
+ 2
− 2
View file @ 8a9ee96c
...@@ -125,7 +125,7 @@ typedef unsigned long rtimer_clock_t; ...@@ -125,7 +125,7 @@ typedef unsigned long rtimer_clock_t;
#define NETSTACK_CONF_RADIO contiki_maca_driver #define NETSTACK_CONF_RADIO contiki_maca_driver
#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_FRAMER framer_802154
#define MAC_CONF_CHANNEL_CHECK_RATE 8 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
#define CXMAC_CONF_ANNOUNCEMENTS 0 #define CXMAC_CONF_ANNOUNCEMENTS 0
#define XMAC_CONF_ANNOUNCEMENTS 0 #define XMAC_CONF_ANNOUNCEMENTS 0
...@@ -139,7 +139,7 @@ typedef unsigned long rtimer_clock_t; ...@@ -139,7 +139,7 @@ typedef unsigned long rtimer_clock_t;
#define NETSTACK_CONF_RADIO contiki_maca_driver #define NETSTACK_CONF_RADIO contiki_maca_driver
#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_FRAMER framer_802154
#define MAC_CONF_CHANNEL_CHECK_RATE 8 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
#define COLLECT_CONF_ANNOUNCEMENTS 1 #define COLLECT_CONF_ANNOUNCEMENTS 1
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
... ...
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment