giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #706 from simonduq/fix/tsch-cc2538

Browse Source 
Fix TSCH on cc2528dk and openmote-cc2538
This commit is contained in:
Simon Duquennoy 2018-10-16 14:02:12 +02:00 committed by GitHub
commit 5d43741699
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/cpu/cc2538/cc2538-def.h
View File

@ -36,6 +36,8 @@
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#define RTIMER_ARCH_SECOND 32768 #define RTIMER_ARCH_SECOND 32768
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#define CC2538_PHY_OVERHEAD 3
#define CC2538_BYTE_AIR_TIME 32
/* 352us from calling transmit() until the SFD byte has been sent */ /* 352us from calling transmit() until the SFD byte has been sent */
#define CC2538_DELAY_BEFORE_TX ((unsigned)US_TO_RTIMERTICKS(352)) #define CC2538_DELAY_BEFORE_TX ((unsigned)US_TO_RTIMERTICKS(352))
/* 192us as in datasheet but ACKs are not always received, so adjusted to 250us */ /* 192us as in datasheet but ACKs are not always received, so adjusted to 250us */

12
arch/platform/cc2538dk/dev/board.h
View File

@ -220,6 +220,18 @@
#endif /* #if SPI1_IN_USE */ #endif /* #if SPI1_IN_USE */
/** @} */ /** @} */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/**
* \name CC2538 TSCH configuration
*
* @{
*/
#define RADIO_PHY_OVERHEAD CC2538_PHY_OVERHEAD
#define RADIO_BYTE_AIR_TIME CC2538_BYTE_AIR_TIME
#define RADIO_DELAY_BEFORE_TX CC2538_DELAY_BEFORE_TX
#define RADIO_DELAY_BEFORE_RX CC2538_DELAY_BEFORE_RX
#define RADIO_DELAY_BEFORE_DETECT CC2538_DELAY_BEFORE_DETECT
/** @} */
/*---------------------------------------------------------------------------*/
/** /**
* \name Device string used on startup * \name Device string used on startup
* @{ * @{

12
arch/platform/openmote-cc2538/board.h
View File

@ -174,6 +174,18 @@
#define I2C_SDA_PIN 4 #define I2C_SDA_PIN 4
/** @} */ /** @} */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/**
* \name CC2538 TSCH configuration
*
* @{
*/
#define RADIO_PHY_OVERHEAD CC2538_PHY_OVERHEAD
#define RADIO_BYTE_AIR_TIME CC2538_BYTE_AIR_TIME
#define RADIO_DELAY_BEFORE_TX CC2538_DELAY_BEFORE_TX
#define RADIO_DELAY_BEFORE_RX CC2538_DELAY_BEFORE_RX
#define RADIO_DELAY_BEFORE_DETECT CC2538_DELAY_BEFORE_DETECT
/** @} */
/*---------------------------------------------------------------------------*/
/** /**
* \name Device string used on startup * \name Device string used on startup
* @{ * @{

2
tests/01-compile-base/Makefile
View File

@ -24,6 +24,8 @@ rpl-border-router/sky \
slip-radio/sky \ slip-radio/sky \
libs/ipv6-hooks/sky \ libs/ipv6-hooks/sky \
nullnet/native \ nullnet/native \
nullnet/sky \
nullnet/sky:MAKE_MAC=MAKE_MAC_TSCH \
mqtt-client/native \ mqtt-client/native \
coap/coap-example-client/native \ coap/coap-example-client/native \
coap/coap-example-server/native \ coap/coap-example-server/native \

2
tests/02-compile-arm-ports-01/Makefile
View File

@ -89,6 +89,8 @@ platform-specific/cc2538-common/pka/cc2538dk \
hello-world/cc2538dk \ hello-world/cc2538dk \
rpl-border-router/cc2538dk \ rpl-border-router/cc2538dk \
rpl-border-router/cc2538dk:MAKE_ROUTING=MAKE_ROUTING_RPL_CLASSIC \ rpl-border-router/cc2538dk:MAKE_ROUTING=MAKE_ROUTING_RPL_CLASSIC \
6tisch/simple-node/cc2538dk \
6tisch/simple-node/cc2538dk:MAKE_WITH_SECURITY=1,MAKE_WITH_ORCHESTRA=1 \
hello-world/nrf52dk \ hello-world/nrf52dk \
platform-specific/nrf52dk/coap-demo/coap-server/nrf52dk \ platform-specific/nrf52dk/coap-demo/coap-server/nrf52dk \
platform-specific/nrf52dk/coap-demo/coap-client/nrf52dk:SERVER_IPV6_EP=ffff \ platform-specific/nrf52dk/coap-demo/coap-client/nrf52dk:SERVER_IPV6_EP=ffff \

2
tests/03-compile-arm-ports-02/Makefile
View File

@ -68,6 +68,8 @@ libs/ipv6-hooks/openmote-cc2538 \
libs/shell/openmote-cc2538 \ libs/shell/openmote-cc2538 \
libs/simple-energest/openmote-cc2538 \ libs/simple-energest/openmote-cc2538 \
libs/deployment/openmote-cc2538 \ libs/deployment/openmote-cc2538 \
6tisch/simple-node/openmote-cc2538 \
6tisch/simple-node/openmote-cc2538:MAKE_WITH_SECURITY=1,MAKE_WITH_ORCHESTRA=1 \
TOOLS= TOOLS=