riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15292 from fjmolinas/pr_openwsn_defs

Browse Source 
boards cpu: move OpenWSN defintions to openwsn_defs.h
This commit is contained in:
benpicco 2020-11-10 10:07:55 +01:00 committed by GitHub
commit 2a60406ae0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 202 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
boards/common/iotlab/include/board_common.h
View File

@ -61,23 +61,6 @@ extern "C" {
#define CONFIG_ZTIMER_USEC_MIN (2) #define CONFIG_ZTIMER_USEC_MIN (2)
/** @} */ /** @} */
/**
* @name OpenWSN timing constants
*
* @{
*/
/* Measured 440us + ~10% */
#define PORT_maxTxDataPrepare (500/PORT_US_PER_TICK)
/* Measured 200us + ~10% */
#define PORT_maxRxAckPrepare (300/PORT_US_PER_TICK)
/* Measured 300us + ~10% */
#define PORT_maxRxDataPrepare (350/PORT_US_PER_TICK)
/* Measured 316us + ~10% */
#define PORT_maxTxAckPrepare (350/PORT_US_PER_TICK)
/* Measured 360us with openwsn_sctimer_rtt */
#define PORT_delayTx (360/PORT_US_PER_TICK)
/** @} */
/** /**
* @name Define the interface to the AT86RF231 radio * @name Define the interface to the AT86RF231 radio
* *

48
boards/common/iotlab/include/openwsn_defs.h Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (C) 2020 Inria
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @ingroup boards_common
* @{
*
* @file
* @brief Board specific definitions for pkg/openwsn
*
* @author Francisco Molina <francois-xavier.molina@inria.fr>
*/
#ifndef OPENWSN_DEFS_H
#define OPENWSN_DEFS_H
#ifdef __cplusplus
extern "C" {
#endif
/**
* @name OpenWSN timing constants
*
* @{
*/
/* Measured 440us + ~10% */
#define PORT_maxTxDataPrepare (500/PORT_US_PER_TICK)
/* Measured 200us + ~10% */
#define PORT_maxRxAckPrepare (300/PORT_US_PER_TICK)
/* Measured 300us + ~10% */
#define PORT_maxRxDataPrepare (350/PORT_US_PER_TICK)
/* Measured 316us + ~10% */
#define PORT_maxTxAckPrepare (350/PORT_US_PER_TICK)
/* Measured 360us with openwsn_sctimer_rtt */
#define PORT_delayTx (360/PORT_US_PER_TICK)
/** @} */
#ifdef __cplusplus
}
#endif
#endif /* OPENWSN_DEFS_H */
/** @} */

3
boards/openmote-b/include/board.h
View File

@ -88,6 +88,9 @@
/** /**
* @name OpenWSN leds configuration * @name OpenWSN leds configuration
*
* @note This configuration mimics the one done in OpenWSN-fw for the
* same platform
* @{ * @{
*/ */
#define OPENWSN_LEDPIN_ERROR LED0_PIN #define OPENWSN_LEDPIN_ERROR LED0_PIN

16
boards/samr21-xpro/include/board.h
View File

@ -82,22 +82,6 @@ static inline int _edbg_get_eui64(const void *arg, eui64_t *addr)
#define EUI64_PROVIDER_INDEX 0 #define EUI64_PROVIDER_INDEX 0
/** @} */ /** @} */
/**
* @name OpenWSN timing constants
*
* @{
*/
/* Measured 800us + ~10% */
#define PORT_maxTxDataPrepare (900/PORT_US_PER_TICK)
/* Measured 450us + ~10% */
#define PORT_maxRxAckPrepare (500/PORT_US_PER_TICK)
/* Measured 500us + ~10% */
#define PORT_maxRxDataPrepare (550/PORT_US_PER_TICK)
/* Measured 660us + ~10% */
#define PORT_maxTxAckPrepare (750/PORT_US_PER_TICK)
/* Measured 650us with openwsn_sctimer_rtt */
#define PORT_delayTx (650/PORT_US_PER_TICK)
/** @} */
/** /**
* @name LED pin definitions and handlers * @name LED pin definitions and handlers

48
boards/samr21-xpro/include/openwsn_defs.h Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (C) 2020 Inria
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @ingroup boards_samr21-xpro
* @{
*
* @file
* @brief Board specific definitions for pkg/openwsn
*
* @author Francisco Molina <francois-xavier.molina@inria.fr>
*/
#ifndef OPENWSN_DEFS_H
#define OPENWSN_DEFS_H
#ifdef __cplusplus
extern "C" {
#endif
/**
* @name OpenWSN timing constants
*
* @{
*/
/* Measured 800us + ~10% */
#define PORT_maxTxDataPrepare (900/PORT_US_PER_TICK)
/* Measured 450us + ~10% */
#define PORT_maxRxAckPrepare (500/PORT_US_PER_TICK)
/* Measured 500us + ~10% */
#define PORT_maxRxDataPrepare (550/PORT_US_PER_TICK)
/* Measured 660us + ~10% */
#define PORT_maxTxAckPrepare (750/PORT_US_PER_TICK)
/* Measured 650us with openwsn_sctimer_rtt */
#define PORT_delayTx (650/PORT_US_PER_TICK)
/** @} */
#ifdef __cplusplus
}
#endif
#endif /* OPENWSN_DEFS_H */
/** @} */

14
cpu/cc2538/include/cpu_conf.h
View File

@ -43,7 +43,6 @@ extern "C" {
#define CPU_HAS_BITBAND (1) #define CPU_HAS_BITBAND (1)
/** @} */ /** @} */
/** /**
* @brief Flash page configuration * @brief Flash page configuration
* @{ * @{
@ -71,19 +70,6 @@ extern "C" {
#define FLASHPAGE_RAW_ALIGNMENT (4U) #define FLASHPAGE_RAW_ALIGNMENT (4U)
/** @} */ /** @} */
/**
* @name OpenWSN timing constants
*
* @{
*/
/* Taken from openwsn-fw */
#define PORT_maxTxDataPrepare (460/PORT_US_PER_TICK)
#define PORT_maxRxAckPrepare (300/PORT_US_PER_TICK)
#define PORT_maxRxDataPrepare (300/PORT_US_PER_TICK)
#define PORT_maxTxAckPrepare (460/PORT_US_PER_TICK)
#define PORT_delayTx (400/PORT_US_PER_TICK)
/** @} */
#ifdef __cplusplus #ifdef __cplusplus
} /* end extern "C" */ } /* end extern "C" */
#endif #endif

43
cpu/cc2538/include/openwsn_defs.h Normal file
View File

@ -0,0 +1,43 @@
/*
* Copyright (C) 2020 Inria
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @ingroup cpu
* @{
*
* @file
* @brief cc2538 specific definitions for pkg/openwsn
*
* @author Francisco Molina <francois-xavier.molina@inria.fr>
*/
#ifndef OPENWSN_DEFS_H
#define OPENWSN_DEFS_H
#ifdef __cplusplus
extern "C" {
#endif
/**
* @name OpenWSN timing constants
*
* @{
*/
/* Taken from openwsn-fw */
#define PORT_maxTxDataPrepare (460/PORT_US_PER_TICK)
#define PORT_maxRxAckPrepare (300/PORT_US_PER_TICK)
#define PORT_maxRxDataPrepare (300/PORT_US_PER_TICK)
#define PORT_maxTxAckPrepare (460/PORT_US_PER_TICK)
#define PORT_delayTx (400/PORT_US_PER_TICK)
/** @} */
#ifdef __cplusplus
}
#endif
#endif /* OPENWSN_DEFS_H */
/** @} */

48
cpu/nrf52/include/openwsn_defs.h Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (C) 2020 Inria
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @ingroup cpu
* @{
*
* @file
* @brief nrf52 specific definitions for pkg/openwsn
*
* @author Francisco Molina <francois-xavier.molina@inria.fr>
*/
#ifndef OPENWSN_DEFS_H
#define OPENWSN_DEFS_H
#ifdef __cplusplus
extern "C" {
#endif
#ifdef CPU_MODEL_NRF52840XXAA
/**
* @name OpenWSN timing constants
*
* @{
*/
/* Taken from OpenWSN @32.768Hz */
#define PORT_maxTxDataPrepare (400/PORT_US_PER_TICK)
#define PORT_maxRxAckPrepare (400/PORT_US_PER_TICK)
#define PORT_maxRxDataPrepare (400/PORT_US_PER_TICK)
#define PORT_maxTxAckPrepare (400/PORT_US_PER_TICK)
/* Measured 220us */
#define PORT_delayTx (300/PORT_US_PER_TICK)
#define PORT_delayRx (150/PORT_US_PER_TICK)
/** @} */
#endif
#ifdef __cplusplus
}
#endif
#endif /* OPENWSN_DEFS_H */
/** @} */

6
dist/tools/codespell/ignored_words.txt vendored
View File

@ -104,3 +104,9 @@ dedup
# circularly (used in "circularly linked list" in clist.h) => circular # circularly (used in "circularly linked list" in clist.h) => circular
circularly circularly
# Chang (common name) => Change
Chang
# chang (common name) => change
chang

6
pkg/openwsn/include/board_info.h
View File

@ -31,6 +31,12 @@
#include "periph_conf.h" #include "periph_conf.h"
#include "timex.h" #include "timex.h"
#if defined __has_include
# if __has_include ("openwsn_defs.h")
# include "openwsn_defs.h"
# endif
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif