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

Merge pull request #16865 from benpicco/drivers/cc110x-submodules

Browse Source 
drivers/cc110x: use pseudo-modules for band selection
This commit is contained in:
Martine Lenders 2021-09-17 13:54:42 +02:00 committed by GitHub
commit a606d8a8ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boards/avsextrem/Makefile.dep
View File

@ -1,3 +1,4 @@
ifneq (,$(filter netdev_default,$(USEMODULE))) ifneq (,$(filter netdev_default,$(USEMODULE)))
USEMODULE += cc1100 USEMODULE += cc1100
USEMODULE += cc110x_868mhz
endif endif

1
boards/msba2/Makefile.dep
View File

@ -1,5 +1,6 @@
ifneq (,$(filter netdev_default,$(USEMODULE))) ifneq (,$(filter netdev_default,$(USEMODULE)))
USEMODULE += cc1100 USEMODULE += cc1100
USEMODULE += cc110x_868mhz
endif endif
ifneq (,$(filter saul_default,$(USEMODULE))) ifneq (,$(filter saul_default,$(USEMODULE)))

1
boards/msbiot/Makefile.dep
View File

@ -1,5 +1,6 @@
ifneq (,$(filter netdev_default,$(USEMODULE))) ifneq (,$(filter netdev_default,$(USEMODULE)))
USEMODULE += cc1101 USEMODULE += cc1101
USEMODULE += cc110x_868mhz
endif endif
# add support for LEDs and buttons as default saul devices # add support for LEDs and buttons as default saul devices

5
drivers/cc110x/Makefile.dep
View File

@ -8,3 +8,8 @@ FEATURES_REQUIRED += periph_spi
ifneq (,$(filter gnrc_ipv6,$(USEMODULE))) ifneq (,$(filter gnrc_ipv6,$(USEMODULE)))
USEMODULE += gnrc_sixlowpan USEMODULE += gnrc_sixlowpan
endif endif
# default to 433 MHz operation
ifeq (,$(filter cc110x_%mhz,$(USEMODULE)))
USEMODULE += cc110x_433mhz
endif

14
drivers/cc110x/include/cc110x_params.h
View File

@ -59,7 +59,13 @@ extern "C" {
* Choose the one matching the base frequency your transceiver uses, otherwise * Choose the one matching the base frequency your transceiver uses, otherwise
* the TX power setting will be incorrect. * the TX power setting will be incorrect.
*/ */
#if IS_USED(MODULE_CC110X_433MHZ)
#define CC110X_PARAM_PATABLE (&cc110x_patable_433mhz)
#elif IS_USED(MODULE_CC110X_868MHZ)
#define CC110X_PARAM_PATABLE (&cc110x_patable_868mhz) #define CC110X_PARAM_PATABLE (&cc110x_patable_868mhz)
#elif IS_USED(MODULE_CC110X_915MHZ)
#define CC110X_PARAM_PATABLE (&cc110x_patable_915mhz)
#endif
#endif #endif
#ifndef CC110X_PARAM_CONFIG #ifndef CC110X_PARAM_CONFIG
@ -68,8 +74,12 @@ extern "C" {
* *
* If 868 MHz is used as base frequency, you can set this to `NULL` * If 868 MHz is used as base frequency, you can set this to `NULL`
*/ */
#if IS_USED(MODULE_CC110X_433MHZ)
#define CC110X_PARAM_CONFIG (&cc110x_config_433mhz_250kbps_300khz)
#else
#define CC110X_PARAM_CONFIG NULL #define CC110X_PARAM_CONFIG NULL
#endif #endif
#endif
#ifndef CC110X_PARAM_CHANNELS #ifndef CC110X_PARAM_CHANNELS
/** /**
@ -77,8 +87,12 @@ extern "C" {
* *
* This must match to configuration you have chosen * This must match to configuration you have chosen
*/ */
#if IS_USED(MODULE_CC110X_433MHZ)
#define CC110X_PARAM_CHANNELS (&cc110x_chanmap_433mhz_300khz)
#else
#define CC110X_PARAM_CHANNELS (&cc110x_chanmap_868mhz_lora) #define CC110X_PARAM_CHANNELS (&cc110x_chanmap_868mhz_lora)
#endif #endif
#endif
#ifndef CC110X_PARAMS #ifndef CC110X_PARAMS
/** /**

5
makefiles/pseudomodules.inc.mk
View File

@ -219,6 +219,11 @@ PSEUDOMODULES += cc1100
PSEUDOMODULES += cc1100e PSEUDOMODULES += cc1100e
PSEUDOMODULES += cc1101 PSEUDOMODULES += cc1101
# use pseudo-module for band selection
PSEUDOMODULES += cc110x_433mhz
PSEUDOMODULES += cc110x_868mhz
PSEUDOMODULES += cc110x_915mhz
# include variants of ds3231 drivers as pseudo modules # include variants of ds3231 drivers as pseudo modules
PSEUDOMODULES += ds3231_int PSEUDOMODULES += ds3231_int