From b7f2c5f7eecb2bfae1d18deb6e71aafc565e0cc3 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:24 +0100 Subject: [PATCH 01/30] tests/driver_adt7310: simplified Makefile --- tests/driver_adt7310/Makefile | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/driver_adt7310/Makefile b/tests/driver_adt7310/Makefile index ad673da932..b0d29190e8 100644 --- a/tests/driver_adt7310/Makefile +++ b/tests/driver_adt7310/Makefile @@ -6,17 +6,12 @@ FEATURES_REQUIRED = periph_spi periph_gpio USEMODULE += adt7310 USEMODULE += xtimer -ifneq (,$(TEST_ADT7310_SPI)) - CFLAGS += -DTEST_ADT7310_SPI=$(TEST_ADT7310_SPI) -else - # set arbitrary default - CFLAGS += -DTEST_ADT7310_SPI=SPI_0 -endif -ifneq (,$(TEST_ADT7310_CS)) - CFLAGS += -DTEST_ADT7310_CS=$(TEST_ADT7310_CS) -else - # set arbitrary default - CFLAGS += -DTEST_ADT7310_CS=GPIO_PIN\(0,0\) -endif +# set default device parameters in case they are undefined +TEST_ADT7310_SPI ?= SPI_0 +TEST_ADT7310_CS ?= GPIO_PIN\(0,0\) + +# export parameters +CFLAGS += -DTEST_ADT7310_SPI=$(TEST_ADT7310_SPI) +CFLAGS += -DTEST_ADT7310_CS=$(TEST_ADT7310_CS) include $(RIOTBASE)/Makefile.include From 6d9d6b428ac7f95f63b4d5bca164a407991fc9d9 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:24 +0100 Subject: [PATCH 02/30] tests/driver_at86rf2xx: simplified Makefile --- tests/driver_at86rf2xx/Makefile | 99 ++++++++++++++------------------- 1 file changed, 42 insertions(+), 57 deletions(-) diff --git a/tests/driver_at86rf2xx/Makefile b/tests/driver_at86rf2xx/Makefile index 7bad238570..95926b6e97 100644 --- a/tests/driver_at86rf2xx/Makefile +++ b/tests/driver_at86rf2xx/Makefile @@ -3,63 +3,7 @@ include ../Makefile.tests_common FEATURES_REQUIRED = periph_spi periph_gpio -BOARD_INSUFFICIENT_MEMORY := stm32f0discovery weio -BOARD_BLACKLIST := nucleo-f334 -# nucleo-f334: not enough GPIO pins defined - -ifneq (,$(filter samr21-xpro,$(BOARD))) - DRIVER ?= at86rf233 - USE_BOARD_PARAMETERS:=true -endif -ifneq (,$(filter iotlab-m3,$(BOARD))) - DRIVER ?= at86rf231 - USE_BOARD_PARAMETERS:=true -endif - -ifneq (,$(DRIVER)) - USEMODULE += $(DRIVER) -else - # default to at86rf231 - USEMODULE += at86rf231 -endif - -ifneq (true,$(USE_BOARD_PARAMETERS)) - # This adds . to include path so generic at86rf2xx_params.h gets picked - # up. All boards actually having such a device on board should define - # USE_BOARD_PARAMETERS=true above to skip this step, as the board provides - # this header. - CFLAGS += -I$(CURDIR) - -ifneq (,$(ATRF_SPI)) - CFLAGS += -DATRF_SPI=$(ATRF_SPI) -else - CFLAGS += -DATRF_SPI=SPI_0 # set default -endif -ifneq (,$(ATRF_CS)) - CFLAGS += -DATRF_CS=$(ATRF_CS) -else - CFLAGS += -DATRF_CS=GPIO_PIN\(0,0\) # set default -endif -ifneq (,$(ATRF_INT)) - CFLAGS += -DATRF_INT=$(ATRF_INT) -else - CFLAGS += -DATRF_INT=GPIO_PIN\(0,1\) # set default -endif -ifneq (,$(ATRF_SLEEP)) - CFLAGS += -DATRF_SLEEP=$(ATRF_SLEEP) -else - CFLAGS += -DATRF_SLEEP=GPIO_PIN\(0,2\) # set default -endif -ifneq (,$(ATRF_RESET)) - CFLAGS += -DATRF_RESET=$(ATRF_RESET) -else - CFLAGS += -DATRF_RESET=GPIO_PIN\(0,3\) # set default -endif -ifneq (,$(ATRF_SPI_SPEED)) - CFLAGS += -DATRF_SPI_SPEED=$(ATRF_SPI_SPEED) -endif - -endif # USE_BOARD_PARAMETERS=false +BOARD_INSUFFICIENT_MEMORY := nucleo-f334 stm32f0discovery weio USEMODULE += auto_init_gnrc_netif USEMODULE += gnrc_netif @@ -69,6 +13,47 @@ USEMODULE += shell USEMODULE += shell_commands USEMODULE += ps +# define parameters for selected boards +ifneq (,$(filter samr21-xpro,$(BOARD))) + DRIVER := at86rf233 + USE_BOARD_PARAMETERS := true +endif +ifneq (,$(filter iotlab-m3 fox,$(BOARD))) + DRIVER := at86rf231 + USE_BOARD_PARAMETERS := true +endif + +# only set specific parameters if not using board configuration +ifneq (true,$(USE_BOARD_PARAMETERS)) + + # set default device parameters in case they are undefined + DRIVER ?= at86rf231 + ATRF_SPI ?= SPI_0 + ATRF_SPI_SPEED ?= SPI_SPEED_5MHZ + ATRF_CS ?= GPIO_PIN\(0,0\) + ATRF_INT ?= GPIO_PIN\(0,1\) + ATRF_SLEEP ?= GPIO_PIN\(0,2\) + ATRF_RESET ?= GPIO_PIN\(0,3\) + + # export parameters + CFLAGS += -DATRF_SPI=$(ATRF_SPI) + CFLAGS += -DATRF_SPI_SPEED=$(ATRF_SPI_SPEED) + CFLAGS += -DATRF_CS=$(ATRF_CS) + CFLAGS += -DATRF_INT=$(ATRF_INT) + CFLAGS += -DATRF_SLEEP=$(ATRF_SLEEP) + CFLAGS += -DATRF_RESET=$(ATRF_RESET) + + # This adds . to include path so generic at86rf2xx_params.h gets picked + # up. All boards actually having such a device on board should define + # USE_BOARD_PARAMETERS=true above to skip this step, as the board provides + # this header. + CFLAGS += -I$(CURDIR) + +endif + +# finally include the actual chosen driver +USEMODULE += $(DRIVER) + CFLAGS += -DDEVELHELP include $(RIOTBASE)/Makefile.include From 26eed54b0bf8f0fb3136966fe58bbd0c5d49fa74 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:24 +0100 Subject: [PATCH 03/30] tests/driver_dht: simplified Makefile --- tests/driver_dht/Makefile | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/tests/driver_dht/Makefile b/tests/driver_dht/Makefile index f468b3d0bc..aed320fce1 100644 --- a/tests/driver_dht/Makefile +++ b/tests/driver_dht/Makefile @@ -3,26 +3,20 @@ include ../Makefile.tests_common FEATURES_REQUIRED = periph_gpio -# define default pin mappings for some boards: -ifneq (,$(filter stm32f4discovery,$(BOARD))) - export DHT_GPIO ?= GPIO_PIN\(4,3\) -endif - USEMODULE += dht USEMODULE += xtimer -ifneq (,$(DHT_TYPE)) - CFLAGS += -DDHT_TYPE=$(DHT_TYPE) -else - # set random default - CFLAGS += -DDHT_TYPE=DHT11 +# define parameters for selected boards +ifneq (,$(filter stm32f4discovery,$(BOARD))) + DHT_GPIO ?= GPIO_PIN\(4,3\) endif -ifneq (,$(DHT_GPIO)) - CFLAGS += -DDHT_GPIO=$(DHT_GPIO) -else - # set random default - CFLAGS += -DDHT_GPIO=GPIO_PIN\(0,0\) -endif +# set default device parameters in case they are undefined +DHT_GPIO ?= GPIO_PIN\(0,0\) +DHT_TYPE ?= DHT11 + +# export parameters +CFLAGS += -DDHT_TYPE=$(DHT_TYPE) +CFLAGS += -DDHT_GPIO=$(DHT_GPIO) include $(RIOTBASE)/Makefile.include From f3643ee3cd071b39128c89158783864f9c3386c3 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:24 +0100 Subject: [PATCH 04/30] tests/driver_hdc1000: simplified Makefile --- tests/driver_hdc1000/Makefile | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/driver_hdc1000/Makefile b/tests/driver_hdc1000/Makefile index b8a2294dfd..bf93ccac12 100644 --- a/tests/driver_hdc1000/Makefile +++ b/tests/driver_hdc1000/Makefile @@ -6,17 +6,12 @@ FEATURES_REQUIRED = periph_i2c USEMODULE += hdc1000 USEMODULE += xtimer -ifneq (,$(TEST_HDC1000_I2C)) - CFLAGS += -DTEST_HDC1000_I2C=$(TEST_HDC1000_I2C) -else - # set random default - CFLAGS += -DTEST_HDC1000_I2C=I2C_0 -endif -ifneq (,$(TEST_HDC1000_ADDR)) - CFLAGS += -DTEST_HDC1000_ADDR=$(TEST_HDC1000_ADDR) -else - # set random default - CFLAGS += -DTEST_HDC1000_ADDR=0x43 -endif +# set default device parameters in case they are undefined +TEST_HDC1000_I2C ?= I2C_0 +TEST_HDC1000_ADDR ?= 0x43 + +# export parameters +CFLAGS += -DTEST_HDC1000_I2C=$(TEST_HDC1000_I2C) +CFLAGS += -DTEST_HDC1000_ADDR=$(TEST_HDC1000_ADDR) include $(RIOTBASE)/Makefile.include From 7c381a028244d03655551bc7f0d8b8bd14673d59 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:24 +0100 Subject: [PATCH 05/30] tests/driver_hih6130: simplified Makefile --- tests/driver_hih6130/Makefile | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/driver_hih6130/Makefile b/tests/driver_hih6130/Makefile index 032e0da40f..f621c043bb 100644 --- a/tests/driver_hih6130/Makefile +++ b/tests/driver_hih6130/Makefile @@ -6,17 +6,12 @@ FEATURES_REQUIRED = periph_i2c USEMODULE += hih6130 USEMODULE += xtimer -ifneq (,$(TEST_HIH6130_I2C)) - CFLAGS += -DTEST_HIH6130_I2C=$(TEST_HIH6130_I2C) -else - # set arbitrary default - CFLAGS += -DTEST_HIH6130_I2C=I2C_0 -endif -ifneq (,$(TEST_HIH6130_ADDR)) - CFLAGS += -DTEST_HIH6130_ADDR=$(TEST_HIH6130_ADDR) -else - # factory default address - CFLAGS += -DTEST_HIH6130_ADDR=0x27 -endif +# set default device parameters in case they are undefined +TEST_HIH6130_I2C ?= I2C_0 +TEST_HIH6130_ADDR ?= 0x27 + +# export parameters +CFLAGS += -DTEST_HIH6130_I2C=$(TEST_HIH6130_I2C) +CFLAGS += -DTEST_HIH6130_ADDR=$(TEST_HIH6130_ADDR) include $(RIOTBASE)/Makefile.include From 9e94faf3898e5b9ed7269f13e5a95c9ac9bdc85e Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:24 +0100 Subject: [PATCH 06/30] tests/driver_ina220: simplified Makefile --- tests/driver_ina220/Makefile | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/driver_ina220/Makefile b/tests/driver_ina220/Makefile index debe98e59d..35e2c7c244 100644 --- a/tests/driver_ina220/Makefile +++ b/tests/driver_ina220/Makefile @@ -6,17 +6,12 @@ FEATURES_REQUIRED = periph_i2c USEMODULE += ina220 USEMODULE += xtimer -ifneq (,$(TEST_INA220_I2C)) - CFLAGS += -DTEST_INA220_I2C=$(TEST_INA220_I2C) -else - # set arbitrary default - CFLAGS += -DTEST_INA220_I2C=I2C_0 -endif -ifneq (,$(TEST_INA220_ADDR)) - CFLAGS += -DTEST_INA220_ADDR=$(TEST_INA220_ADDR) -else - # set arbitrary default - CFLAGS += -DTEST_INA220_ADDR=0x40 -endif +# set default device parameters in case they are undefined +TEST_INA220_I2C ?= I2C_0 +TEST_INA220_ADDR ?= 0x40 + +# export parameters +CFLAGS += -DTEST_INA220_I2C=$(TEST_INA220_I2C) +CFLAGS += -DTEST_INA220_ADDR=$(TEST_INA220_ADDR) include $(RIOTBASE)/Makefile.include From 5c55aad75251872d8f5fad870d62f37426701950 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:24 +0100 Subject: [PATCH 07/30] tests/driver_isl29020: simplified Makefile --- tests/driver_isl29020/Makefile | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/tests/driver_isl29020/Makefile b/tests/driver_isl29020/Makefile index c5c52a55ab..51e0dd2078 100644 --- a/tests/driver_isl29020/Makefile +++ b/tests/driver_isl29020/Makefile @@ -3,26 +3,15 @@ include ../Makefile.tests_common FEATURES_REQUIRED = periph_i2c -# Define default pin mappings for some boards: -ifneq (,$(filter iotlab-m3,$(BOARD))) - export TEST_ISL29020_ADDR = 68 - export TEST_ISL29020_I2C ?= I2C_0 -endif - USEMODULE += isl29020 USEMODULE += xtimer -ifneq (,$(TEST_ISL29020_I2C)) - CFLAGS += -DTEST_ISL29020_I2C=$(TEST_ISL29020_I2C) -else - # set random default - CFLAGS += -DTEST_ISL29020_I2C=I2C_0 -endif -ifneq (,$(TEST_ISL29020_ADDR)) - CFLAGS += -DTEST_ISL29020_ADDR=$(TEST_ISL29020_ADDR) -else - # set random default - CFLAGS += -DTEST_ISL29020_ADDR=68 -endif +# set default device parameters in case they are undefined +TEST_ISL29020_I2C ?= I2C_0 +TEST_ISL29020_ADDR ?= 68 + +# export parameters +CFLAGS += -DTEST_ISL29020_I2C=$(TEST_ISL29020_I2C) +CFLAGS += -DTEST_ISL29020_ADDR=$(TEST_ISL29020_ADDR) include $(RIOTBASE)/Makefile.include From 3ac943aa77651893fea0afdd5eae7545a69fdef4 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:24 +0100 Subject: [PATCH 08/30] tests/driver_isl29125: simplified Makefile --- tests/driver_isl29125/Makefile | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/driver_isl29125/Makefile b/tests/driver_isl29125/Makefile index f598fc9eb5..56f3c16956 100644 --- a/tests/driver_isl29125/Makefile +++ b/tests/driver_isl29125/Makefile @@ -6,17 +6,12 @@ FEATURES_REQUIRED = periph_i2c USEMODULE += isl29125 USEMODULE += xtimer -ifneq (,$(TEST_ISL29125_I2C)) - CFLAGS += -DTEST_ISL29125_I2C=$(TEST_ISL29125_I2C) -else - # set random default - CFLAGS += -DTEST_ISL29125_I2C=I2C_0 -endif -ifneq (,$(TEST_ISL29125_IRQ_PIN)) - CFLAGS += -DTEST_ISL29125_IRQ_PIN=$(TEST_ISL29125_IRQ_PIN) -else - # set random default - CFLAGS += -DTEST_ISL29125_IRQ_PIN=GPIO_PIN\(0,0\) -endif +# set default device parameters in case they are undefined +TEST_ISL29125_I2C ?= I2C_0 +TEST_ISL29125_IRQ_PIN ?= GPIO_PIN\(0,0\) + +# export parameters +CFLAGS += -DTEST_ISL29125_I2C=$(TEST_ISL29125_I2C) +CFLAGS += -DTEST_ISL29125_IRQ_PIN=$(TEST_ISL29125_IRQ_PIN) include $(RIOTBASE)/Makefile.include From fddfa7487be1d5431e55b6570b8552f2a403cf3f Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:24 +0100 Subject: [PATCH 09/30] tests/driver_kw2xrf: simplified Makefile --- tests/driver_kw2xrf/Makefile | 80 ++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 45 deletions(-) diff --git a/tests/driver_kw2xrf/Makefile b/tests/driver_kw2xrf/Makefile index 4ab259b726..f7b257f141 100644 --- a/tests/driver_kw2xrf/Makefile +++ b/tests/driver_kw2xrf/Makefile @@ -5,51 +5,6 @@ FEATURES_REQUIRED = periph_spi periph_gpio BOARD_INSUFFICIENT_MEMORY := stm32f0discovery nucleo-f334 weio -ifneq (,$(filter pba-d-01-kw2x,$(BOARD))) - DRIVER ?= kw2xrf - USE_BOARD_PARAMETERS:=true -endif - -ifneq (,$(DRIVER)) - USEMODULE += $(DRIVER) -else - # default to kw2xrf - USEMODULE += kw2xrf -endif - -ifneq (true,$(USE_BOARD_PARAMETERS)) - # This adds . to include path so generic kw2xrf_params.h gets picked - # up. All boards actually having such a device on board should define - # USE_BOARD_PARAMETERS=true above to skip this step, as the board provides - # this header. - CFLAGS += -I$(CURDIR) - -ifneq (,$(KWRF_SHARED_SPI)) - CFLAGS += -DKW2XRF_SHARED_SPI=$(DKW2XRF_SHARED_SPI) -else - CFLAGS += -DKW2XRFD_SHARED_SPI=1 # activate spi-lock -endif -ifneq (,$(KWRF_SPI)) - CFLAGS += -DKWRF_SPI=$(KWRF_SPI) -else - CFLAGS += -DKWRF_SPI=SPI_0 # set default -endif -ifneq (,$(KWRF_CS)) - CFLAGS += -DKWRF_CS=$(KWRF_CS) -else - CFLAGS += -DKWRF_CS=GPIO_PIN\(0,0\) # set default -endif -ifneq (,$(KWRF_INT)) - CFLAGS += -DKWRF_INT=$(KWRF_INT) -else - CFLAGS += -DKWRF_INT=GPIO_PIN\(0,1\) # set default -endif -ifneq (,$(KWRF_SPI_SPEED)) - CFLAGS += -DKWRF_SPI_SPEED=$(KWRF_SPI_SPEED) -endif - -endif # USE_BOARD_PARAMETERS=false - USEMODULE += auto_init_gnrc_netif USEMODULE += gnrc_netif USEMODULE += gnrc_nomac @@ -58,6 +13,41 @@ USEMODULE += shell USEMODULE += shell_commands USEMODULE += ps +# define parameters for selected boards +ifneq (,$(filter pba-d-01-kw2x,$(BOARD))) + DRIVER := kw2xrf + USE_BOARD_PARAMETERS := true +endif + +# only set specific parameters if not using board configuration +ifneq (true,$(USE_BOARD_PARAMETERS)) + + # set default device parameters in case they are undefined + DRIVER ?= kw2xrf + KW2XRF_SHARED_SPI ?= 1 + KWRF_SPI ?= SPI_0 + KWRF_SPI_SPEED ?= SPI_SPEED_5MHZ + KWRF_CS ?= GPIO_PIN\(0,0\) + KWRF_INT ?= GPIO_PIN\(0,1\) + + # export parameters + CFLAGS += -DKW2XRF_SHARED_SPI=$(KW2XRF_SHARED_SPI) + CFLAGS += -DKWRF_SPI=$(KWRF_SPI) + CFLAGS += -DKWRF_SPI_SPEED=$(KWRF_SPI_SPEED) + CFLAGS += -DKWRF_CS=$(KWRF_CS) + CFLAGS += -DKWRF_INT=$(KWRF_INT) + + # This adds . to include path so generic kw2xrf_params.h gets picked + # up. All boards actually having such a device on board should define + # USE_BOARD_PARAMETERS=true above to skip this step, as the board provides + # this header. + CFLAGS += -I$(CURDIR) + +endif + +# finally include the actual chosen driver +USEMODULE += $(DRIVER) + CFLAGS += -DDEVELHELP include $(RIOTBASE)/Makefile.include From a67a57ae39c66e75d67915c59c17e2bde2f88fcd Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:24 +0100 Subject: [PATCH 10/30] tests/driver_l3g4200d: simplified Makefile --- tests/driver_l3g4200d/Makefile | 35 +++++++++++----------------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/tests/driver_l3g4200d/Makefile b/tests/driver_l3g4200d/Makefile index ec4d04db1b..c329a51788 100644 --- a/tests/driver_l3g4200d/Makefile +++ b/tests/driver_l3g4200d/Makefile @@ -6,29 +6,16 @@ FEATURES_REQUIRED = periph_i2c periph_gpio USEMODULE += l3g4200d USEMODULE += xtimer -ifneq (,$(TEST_L3G4200D_I2C)) - CFLAGS += -DTEST_L3G4200D_I2C=$(TEST_L3G4200D_I2C) -else - # set random default - CFLAGS += -DTEST_L3G4200D_I2C=I2C_0 -endif -ifneq (,$(TEST_L3G4200D_ADDR)) - CFLAGS += -DTEST_L3G4200D_ADDR=$(TEST_L3G4200D_ADDR) -else - # set random default - CFLAGS += -DTEST_L3G4200D_ADDR=104 -endif -ifneq (,$(TEST_L3G4200D_INT)) - CFLAGS += -DTEST_L3G4200D_INT=$(TEST_L3G4200D_INT) -else - # set random default - CFLAGS += -DTEST_L3G4200D_INT=GPIO_PIN\(0,0\) -endif -ifneq (,$(TEST_L3G4200D_DRDY)) - CFLAGS += -DTEST_L3G4200D_DRDY=$(TEST_L3G4200D_DRDY) -else - # set random default - CFLAGS += -DTEST_L3G4200D_DRDY=GPIO_PIN\(0,1\) -endif +# set default device parameters in case they are undefined +TEST_L3G4200D_I2C ?= I2C_0 +TEST_L3G4200D_ADDR ?= 104 +TEST_L3G4200D_INT ?= GPIO_PIN\(0,0\) +TEST_L3G4200D_DRDY ?= GPIO_PIN\(0,1\) + +# export parameters +CFLAGS += -DTEST_L3G4200D_I2C=$(TEST_L3G4200D_I2C) +CFLAGS += -DTEST_L3G4200D_ADDR=$(TEST_L3G4200D_ADDR) +CFLAGS += -DTEST_L3G4200D_INT=$(TEST_L3G4200D_INT) +CFLAGS += -DTEST_L3G4200D_DRDY=$(TEST_L3G4200D_DRDY) include $(RIOTBASE)/Makefile.include From f54e16ac84935af89b56f87c5e11c965328bd598 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:24 +0100 Subject: [PATCH 11/30] tests/driver_lis3dh: simplified Makefile --- tests/driver_lis3dh/Makefile | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/tests/driver_lis3dh/Makefile b/tests/driver_lis3dh/Makefile index 21a82f2ff9..2097649d77 100644 --- a/tests/driver_lis3dh/Makefile +++ b/tests/driver_lis3dh/Makefile @@ -6,29 +6,16 @@ FEATURES_REQUIRED = periph_spi periph_gpio USEMODULE += lis3dh USEMODULE += xtimer -ifneq (,$(TEST_LIS3DH_SPI)) - CFLAGS += -DTEST_LIS3DH_SPI=$(TEST_LIS3DH_SPI) -else - # set arbitrary default - CFLAGS += -DTEST_LIS3DH_SPI=SPI_0 -endif -ifneq (,$(TEST_LIS3DH_CS)) - CFLAGS += -DTEST_LIS3DH_CS=$(TEST_LIS3DH_CS) -else - # set arbitrary default - CFLAGS += -DTEST_LIS3DH_CS=GPIO_PIN\(0,0\) -endif -ifneq (,$(TEST_LIS3DH_INT1)) - CFLAGS += -DTEST_LIS3DH_INT1=$(TEST_LIS3DH_INT1) -else - # set arbitrary default - CFLAGS += -DTEST_LIS3DH_INT1=GPIO_PIN\(0,1\) -endif -ifneq (,$(TEST_LIS3DH_INT2)) - CFLAGS += -DTEST_LIS3DH_INT2=$(TEST_LIS3DH_INT2) -else - # set arbitrary default - CFLAGS += -DTEST_LIS3DH_INT2=GPIO_PIN\(0,2\) -endif +# set default device parameters in case they are undefined +TEST_LIS3DH_SPI ?= SPI_0 +TEST_LIS3DH_CS ?= GPIO_PIN\(0,0\) +TEST_LIS3DH_INT1 ?= GPIO_PIN\(0,1\) +TEST_LIS3DH_INT2 ?= GPIO_PIN\(0,2\) + +# export parameters +CFLAGS += -DTEST_LIS3DH_SPI=$(TEST_LIS3DH_SPI) +CFLAGS += -DTEST_LIS3DH_CS=$(TEST_LIS3DH_CS) +CFLAGS += -DTEST_LIS3DH_INT1=$(TEST_LIS3DH_INT1) +CFLAGS += -DTEST_LIS3DH_INT2=$(TEST_LIS3DH_INT2) include $(RIOTBASE)/Makefile.include From 208c72f4dd88382146827a00ebe6c61cd5e4ad87 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:24 +0100 Subject: [PATCH 12/30] tests/driver_lps331ap: simplified Makefile --- tests/driver_lps331ap/Makefile | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/driver_lps331ap/Makefile b/tests/driver_lps331ap/Makefile index b590eeb18d..df505e70d7 100644 --- a/tests/driver_lps331ap/Makefile +++ b/tests/driver_lps331ap/Makefile @@ -6,17 +6,12 @@ FEATURES_REQUIRED = periph_i2c USEMODULE += lps331ap USEMODULE += xtimer -ifneq (,$(TEST_LPS331AP_I2C)) - CFLAGS += -DTEST_LPS331AP_I2C=$(TEST_LPS331AP_I2C) -else - # set random default - CFLAGS += -DTEST_LPS331AP_I2C=I2C_0 -endif -ifneq (,$(TEST_LPS331AP_ADDR)) - CFLAGS += -DTEST_LPS331AP_ADDR=$(TEST_LPS331AP_ADDR) -else - # set random default - CFLAGS += -DTEST_LPS331AP_ADDR=92 -endif +# set default device parameters in case they are undefined +TEST_LPS331AP_I2C ?= I2C_0 +TEST_LPS331AP_ADDR ?= 92 + +# export parameters +CFLAGS += -DTEST_LPS331AP_I2C=$(TEST_LPS331AP_I2C) +CFLAGS += -DTEST_LPS331AP_ADDR=$(TEST_LPS331AP_ADDR) include $(RIOTBASE)/Makefile.include From 965c69d8be23e0d2b7fcafab3f383313da03a207 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:24 +0100 Subject: [PATCH 13/30] tests/driver_lsm303dlhc: simplified Makefile --- tests/driver_lsm303dlhc/Makefile | 54 +++++++++++--------------------- 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/tests/driver_lsm303dlhc/Makefile b/tests/driver_lsm303dlhc/Makefile index 95791f7c91..ac128264b5 100644 --- a/tests/driver_lsm303dlhc/Makefile +++ b/tests/driver_lsm303dlhc/Makefile @@ -3,45 +3,27 @@ include ../Makefile.tests_common FEATURES_REQUIRED = periph_i2c -# Define default pin mappings for some boards: -ifneq (,$(filter iotlab-m3,$(BOARD))) - export TEST_LSM303DLHC_MAG_ADDR=30 - export TEST_LSM303DLHC_ACC_ADDR=25 - export TEST_LSM303DLHC_I2C ?=I2C_0 -endif - USEMODULE += lsm303dlhc USEMODULE += xtimer -ifneq (,$(TEST_LSM303DLHC_I2C)) - CFLAGS += -DTEST_LSM303DLHC_I2C=$(TEST_LSM303DLHC_I2C) -else - # set random default - CFLAGS += -DTEST_LSM303DLHC_I2C=I2C_0 -endif -ifneq (,$(TEST_LSM303DLHC_MAG_ADDR)) - CFLAGS += -DTEST_LSM303DLHC_MAG_ADDR=$(TEST_LSM303DLHC_MAG_ADDR) -else - # set random default - CFLAGS += -DTEST_LSM303DLHC_MAG_ADDR=30 -endif -ifneq (,$(TEST_LSM303DLHC_ACC_ADDR)) - CFLAGS += -DTEST_LSM303DLHC_ACC_ADDR=$(TEST_LSM303DLHC_ACC_ADDR) -else - # set random default - CFLAGS += -DTEST_LSM303DLHC_ACC_ADDR=25 -endif -ifneq (,$(TEST_LSM303DLHC_ACC_PIN)) - CFLAGS += -DTEST_LSM303DLHC_ACC_PIN=$(TEST_LSM303DLHC_ACC_PIN) -else - # set random default - CFLAGS += -DTEST_LSM303DLHC_ACC_PIN=GPIO_PIN\(0,0\) -endif -ifneq (,$(TEST_LSM303DLHC_MAG_PIN)) - CFLAGS += -DTEST_LSM303DLHC_MAG_PIN=$(TEST_LSM303DLHC_MAG_PIN) -else - # set random default - CFLAGS += -DTEST_LSM303DLHC_MAG_PIN=GPIO_PIN\(0,1\) +# define parameters for selected boards +ifneq (,$(filter iotlab-m3,$(BOARD))) + TEST_LSM303DLHC_ACC_PIN ?= GPIO_PIN\(PORT_B,1\) + TEST_LSM303DLHC_MAG_PIN ?= GPIO_PIN\(PORT_B,2\) endif +# set default device parameters in case they are undefined +TEST_LSM303DLHC_I2C ?= I2C_0 +TEST_LSM303DLHC_ACC_ADDR ?= 25 +TEST_LSM303DLHC_MAG_ADDR ?= 30 +TEST_LSM303DLHC_ACC_PIN ?= GPIO_PIN\(0,0\) +TEST_LSM303DLHC_MAG_PIN ?= GPIO_PIN\(0,1\) + +# export parameters +CFLAGS += -DTEST_LSM303DLHC_I2C=$(TEST_LSM303DLHC_I2C) +CFLAGS += -DTEST_LSM303DLHC_ACC_ADDR=$(TEST_LSM303DLHC_ACC_ADDR) +CFLAGS += -DTEST_LSM303DLHC_MAG_ADDR=$(TEST_LSM303DLHC_MAG_ADDR) +CFLAGS += -DTEST_LSM303DLHC_ACC_PIN=$(TEST_LSM303DLHC_ACC_PIN) +CFLAGS += -DTEST_LSM303DLHC_MAG_PIN=$(TEST_LSM303DLHC_MAG_PIN) + include $(RIOTBASE)/Makefile.include From 269a4e0c687ab6723ed868c611709bd80ec47c00 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:24 +0100 Subject: [PATCH 14/30] tests/driver_mag3110: simplified Makefile --- tests/driver_mag3110/Makefile | 37 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/tests/driver_mag3110/Makefile b/tests/driver_mag3110/Makefile index 7d376ea1f1..9628d6df74 100644 --- a/tests/driver_mag3110/Makefile +++ b/tests/driver_mag3110/Makefile @@ -6,31 +6,18 @@ FEATURES_REQUIRED = periph_i2c USEMODULE += mag3110 USEMODULE += xtimer -ifneq (,$(TEST_MAG3110_I2C)) - CFLAGS += -DTEST_MAG3110_I2C=$(TEST_MAG3110_I2C) -else - CFLAGS += -DTEST_MAG3110_I2C=I2C_0 -endif -ifneq (,$(TEST_MAG3110_ADDR)) - CFLAGS += -DTEST_MAG3110_ADDR=$(TEST_MAG3110_ADDR) -else - CFLAGS += -DTEST_MAG3110_ADDR=0x0E -endif +# set default device parameters in case they are undefined +TEST_MAG3110_I2C ?= I2C_0 +TEST_MAG3110_ADDR ?= 0x0E +TEST_MAG3110_USER_OFFSET_X ?= -2000 +TEST_MAG3110_USER_OFFSET_Y ?= 180 +TEST_MAG3110_USER_OFFSET_Z ?= 210 -ifneq (,$(TEST_MAG3110_USER_OFFSET_X)) - CFLAGS += -DTEST_MAG3110_USER_OFFSET_X=$(TEST_MAG3110_USER_OFFSET_X) -else - CFLAGS += -DTEST_MAG3110_USER_OFFSET_X=-2000 -endif -ifneq (,$(TEST_MAG3110_USER_OFFSET_Y)) - CFLAGS += -DTEST_MAG3110_USER_OFFSET_Y=$(TEST_MAG3110_USER_OFFSET_Y) -else - CFLAGS += -DTEST_MAG3110_USER_OFFSET_Y=180 -endif -ifneq (,$(TEST_MAG3110_USER_OFFSET_Z)) - CFLAGS += -DTEST_MAG3110_USER_OFFSET_Z=$(TEST_MAG3110_USER_OFFSET_Z) -else - CFLAGS += -DTEST_MAG3110_USER_OFFSET_Z=210 -endif +# export parameters +CFLAGS += -DTEST_MAG3110_I2C=$(TEST_MAG3110_I2C) +CFLAGS += -DTEST_MAG3110_ADDR=$(TEST_MAG3110_ADDR) +CFLAGS += -DTEST_MAG3110_USER_OFFSET_X=$(TEST_MAG3110_USER_OFFSET_X) +CFLAGS += -DTEST_MAG3110_USER_OFFSET_Y=$(TEST_MAG3110_USER_OFFSET_Y) +CFLAGS += -DTEST_MAG3110_USER_OFFSET_Z=$(TEST_MAG3110_USER_OFFSET_Z) include $(RIOTBASE)/Makefile.include From c53fcb49db98f3932ad86ce7eee3f07682243b7f Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:25 +0100 Subject: [PATCH 15/30] tests/driver_mma8652: simplified Makefile --- tests/driver_mma8652/Makefile | 37 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/tests/driver_mma8652/Makefile b/tests/driver_mma8652/Makefile index 7f5b8bd2f4..552f3307e9 100644 --- a/tests/driver_mma8652/Makefile +++ b/tests/driver_mma8652/Makefile @@ -6,31 +6,18 @@ FEATURES_REQUIRED = periph_i2c USEMODULE += mma8652 USEMODULE += xtimer -ifneq (,$(TEST_MMA8652_I2C)) - CFLAGS += -DTEST_MMA8652_I2C=$(TEST_MMA8652_I2C) -else - CFLAGS += -DTEST_MMA8652_I2C=I2C_0 -endif -ifneq (,$(TEST_MMA8652_ADDR)) - CFLAGS += -DTEST_MMA8652_ADDR=$(TEST_MMA8652_ADDR) -else - CFLAGS += -DTEST_MMA8652_ADDR=0x1D -endif +# set default device parameters in case they are undefined +TEST_MMA8652_I2C ?= I2C_0 +TEST_MMA8652_ADDR ?= 0x1D +TEST_MMA8652_USER_OFFSET_X ?= 0 +TEST_MMA8652_USER_OFFSET_Y ?= 0 +TEST_MMA8652_USER_OFFSET_Z ?= 0 -ifneq (,$(TEST_MMA8652_USER_OFFSET_X)) - CFLAGS += -DTEST_MMA8652_USER_OFFSET_X=$(TEST_MMA8652_USER_OFFSET_X) -else - CFLAGS += -DTEST_MMA8652_USER_OFFSET_X=0 -endif -ifneq (,$(TEST_MMA8652_USER_OFFSET_Y)) - CFLAGS += -DTEST_MMA8652_USER_OFFSET_Y=$(TEST_MMA8652_USER_OFFSET_Y) -else - CFLAGS += -DTEST_MMA8652_USER_OFFSET_Y=0 -endif -ifneq (,$(TEST_MMA8652_USER_OFFSET_Z)) - CFLAGS += -DTEST_MMA8652_USER_OFFSET_Z=$(TEST_MMA8652_USER_OFFSET_Z) -else - CFLAGS += -DTEST_MMA8652_USER_OFFSET_Z=0 -endif +# export parameters +CFLAGS += -DTEST_MMA8652_I2C=$(TEST_MMA8652_I2C) +CFLAGS += -DTEST_MMA8652_ADDR=$(TEST_MMA8652_ADDR) +CFLAGS += -DTEST_MMA8652_USER_OFFSET_X=$(TEST_MMA8652_USER_OFFSET_X) +CFLAGS += -DTEST_MMA8652_USER_OFFSET_Y=$(TEST_MMA8652_USER_OFFSET_Y) +CFLAGS += -DTEST_MMA8652_USER_OFFSET_Z=$(TEST_MMA8652_USER_OFFSET_Z) include $(RIOTBASE)/Makefile.include From 379717b0b0c59259705bd1f773d877e75671ad13 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:25 +0100 Subject: [PATCH 16/30] tests/driver_mpl3115a2: simplified Makefile --- tests/driver_mpl3115a2/Makefile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/driver_mpl3115a2/Makefile b/tests/driver_mpl3115a2/Makefile index 36e5c47723..eba9d48c51 100644 --- a/tests/driver_mpl3115a2/Makefile +++ b/tests/driver_mpl3115a2/Makefile @@ -6,15 +6,12 @@ FEATURES_REQUIRED = periph_i2c USEMODULE += mpl3115a2 USEMODULE += xtimer -ifneq (,$(TEST_MPL3115A2_I2C)) - CFLAGS += -DTEST_MPL3115A2_I2C=$(TEST_MPL3115A2_I2C) -else - CFLAGS += -DTEST_MPL3115A2_I2C=I2C_0 -endif -ifneq (,$(TEST_MPL3115A2_ADDR)) - CFLAGS += -DTEST_MPL3115A2_ADDR=$(TEST_MPL3115A2_ADDR) -else - CFLAGS += -DTEST_MPL3115A2_ADDR=0x60 -endif +# set default device parameters in case they are undefined +TEST_MPL3115A2_I2C ?= I2C_0 +TEST_MPL3115A2_ADDR ?= 0x60 + +# export parameters +CFLAGS += -DTEST_MPL3115A2_I2C=$(TEST_MPL3115A2_I2C) +CFLAGS += -DTEST_MPL3115A2_ADDR=$(TEST_MPL3115A2_ADDR) include $(RIOTBASE)/Makefile.include From 400857070b0e93e7ecca1a119953ed4564d89cda Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:25 +0100 Subject: [PATCH 17/30] tests/driver_mpu9150: simplified Makefile --- tests/driver_mpu9150/Makefile | 39 ++++++++++++++--------------------- 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/tests/driver_mpu9150/Makefile b/tests/driver_mpu9150/Makefile index 956c50015b..7ccdadcc45 100644 --- a/tests/driver_mpu9150/Makefile +++ b/tests/driver_mpu9150/Makefile @@ -3,33 +3,24 @@ include ../Makefile.tests_common FEATURES_REQUIRED = periph_i2c -# Define default mappings for some boards: -ifneq (,$(filter msbiot,$(BOARD))) - export TEST_I2C ?= MPU9150_I2C - export TEST_HW_ADDR ?= MPU9150_HW_ADDR - export TEST_COMP_ADDR ?= MPU9150_COMP_ADDR -endif - USEMODULE += mpu9150 USEMODULE += xtimer -ifneq (,$(TEST_I2C)) - CFLAGS += -DTEST_I2C=$(TEST_I2C) -else - # set random default - CFLAGS += -DTEST_I2C=I2C_0 -endif -ifneq (,$(TEST_HW_ADDR)) - CFLAGS += -DTEST_HW_ADDR=$(TEST_HW_ADDR) -else - # set random default - CFLAGS += -DTEST_HW_ADDR=MPU9150_HW_ADDR_HEX_68 -endif -ifneq (,$(TEST_COMP_ADDR)) - CFLAGS += -DTEST_COMP_ADDR=$(TEST_COMP_ADDR) -else - # set random default - CFLAGS += -DTEST_COMP_ADDR=MPU9150_COMP_ADDR_HEX_0C +# define parameters for selected boards +ifneq (,$(filter msbiot,$(BOARD))) + TEST_I2C ?= MPU9150_I2C + TEST_HW_ADDR ?= MPU9150_HW_ADDR + TEST_COMP_ADDR ?= MPU9150_COMP_ADDR endif +# set default device parameters in case they are undefined +TEST_I2C ?= I2C_0 +TEST_HW_ADDR ?= MPU9150_HW_ADDR_HEX_68 +TEST_COMP_ADDR ?= MPU9150_COMP_ADDR_HEX_0C + +# export parameters +CFLAGS += -DTEST_I2C=$(TEST_I2C) +CFLAGS += -DTEST_HW_ADDR=$(TEST_HW_ADDR) +CFLAGS += -DTEST_COMP_ADDR=$(TEST_COMP_ADDR) + include $(RIOTBASE)/Makefile.include From d3676d20c2f2aa5c4d208f283e202c1bd37a70e3 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:25 +0100 Subject: [PATCH 18/30] tests/driver_mq3: simplified Makefile --- tests/driver_mq3/Makefile | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/tests/driver_mq3/Makefile b/tests/driver_mq3/Makefile index 55df254072..20135bd0e9 100644 --- a/tests/driver_mq3/Makefile +++ b/tests/driver_mq3/Makefile @@ -3,26 +3,15 @@ include ../Makefile.tests_common FEATURES_REQUIRED = periph_adc -# Define default pin mappings for some boards: -ifneq (,$(filter stm32f4discovery,$(BOARD))) - export MQ3_ADC ?= ADC_1 - export MQ3_CHAN ?= 0 -endif - USEMODULE += mq3 USEMODULE += xtimer -ifneq (,$(MQ3_ADC)) - CFLAGS += -DMQ3_ADC=$(MQ3_ADC) -else - # set random default - CFLAGS += -DMQ3_ADC=ADC_0 -endif -ifneq (,$(MQ3_CHAN)) - CFLAGS += -DMQ3_CHAN=$(MQ3_CHAN) -else - # set random default - CFLAGS += -DMQ3_CHAN=0 -endif +# set default device parameters in case they are undefined +MQ3_ADC ?= ADC_0 +MQ3_CHAN ?= 0 + +# export parameters +CFLAGS += -DMQ3_ADC=$(MQ3_ADC) +CFLAGS += -DMQ3_CHAN=$(MQ3_CHAN) include $(RIOTBASE)/Makefile.include From ddd4117e1287ba8289fe56eeea6e9fe5caa52261 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:25 +0100 Subject: [PATCH 19/30] tests/driver_nrf24l01p_lowlevel: simplified Makefile --- tests/driver_nrf24l01p_lowlevel/Makefile | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/tests/driver_nrf24l01p_lowlevel/Makefile b/tests/driver_nrf24l01p_lowlevel/Makefile index 888d0aa355..45c35fe0cf 100644 --- a/tests/driver_nrf24l01p_lowlevel/Makefile +++ b/tests/driver_nrf24l01p_lowlevel/Makefile @@ -1,30 +1,24 @@ APPLICATION = driver_nrf24l01p_lowlevel include ../Makefile.tests_common +FEATURES_REQUIRED = periph_spi + USEMODULE += shell USEMODULE += shell_commands USEMODULE += ps USEMODULE += vtimer USEMODULE += nrf24l01p -FEATURES_REQUIRED = periph_spi - +# set default device parameters in case they are undefined SPI_PORT ?= SPI_0 CE_PIN ?= GPIO_PIN\(0,0\) CS_PIN ?= GPIO_PIN\(0,1\) IRQ_PIN ?= GPIO_PIN\(0,2\) -include $(RIOTBASE)/Makefile.include +# export parameters +CFLAGS += -DSPI_PORT=$(SPI_PORT) +CFLAGS += -DCE_PIN=$(CE_PIN) +CFLAGS += -DCS_PIN=$(CS_PIN) +CFLAGS += -DIRQ_PIN=$(IRQ_PIN) -ifneq (,$(SPI_PORT)) -export CFLAGS += -DSPI_PORT=$(SPI_PORT) -endif -ifneq (,$(CE_PIN)) -export CFLAGS += -DCE_PIN=$(CE_PIN) -endif -ifneq (,$(CS_PIN)) -export CFLAGS += -DCS_PIN=$(CS_PIN) -endif -ifneq (,$(IRQ_PIN)) -export CFLAGS += -DIRQ_PIN=$(IRQ_PIN) -endif +include $(RIOTBASE)/Makefile.include From f9ce415d3f3c5a5e3ee95baaa1e7e3bf7725a61d Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:25 +0100 Subject: [PATCH 20/30] tests/driver_nvram_spi: simplified Makefile --- tests/driver_nvram_spi/Makefile | 35 +++++++++++---------------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/tests/driver_nvram_spi/Makefile b/tests/driver_nvram_spi/Makefile index 1d873d3f29..083fcf303c 100644 --- a/tests/driver_nvram_spi/Makefile +++ b/tests/driver_nvram_spi/Makefile @@ -6,29 +6,16 @@ FEATURES_REQUIRED = periph_spi periph_gpio USEMODULE += nvram_spi USEMODULE += xtimer -ifneq (,$(TEST_NVRAM_SPI_DEV)) - CFLAGS += -DTEST_NVRAM_SPI_DEV=$(TEST_NVRAM_SPI_DEV) -else - # set arbitrary default - CFLAGS += -DTEST_NVRAM_SPI_DEV=SPI_0 -endif -ifneq (,$(TEST_NVRAM_SPI_CS)) - CFLAGS += -DTEST_NVRAM_SPI_CS=$(TEST_NVRAM_SPI_CS) -else - # set arbitrary default - CFLAGS += -DTEST_NVRAM_SPI_CS=GPIO_PIN\(0,0\) -endif -ifneq (,$(TEST_NVRAM_SPI_SIZE)) - CFLAGS += -DTEST_NVRAM_SPI_SIZE=$(TEST_NVRAM_SPI_SIZE) -else - # set tiny arbitrary default - CFLAGS += -DTEST_NVRAM_SPI_SIZE=64 -endif -ifneq (,$(TEST_NVRAM_SPI_ADDRESS_COUNT)) - CFLAGS += -DTEST_NVRAM_SPI_ADDRESS_COUNT=$(TEST_NVRAM_SPI_ADDRESS_COUNT) -else - # set 1 address byte by default, increase if using a larger module for test. - CFLAGS += -DTEST_NVRAM_SPI_ADDRESS_COUNT=1 -endif +# set default device parameters in case they are undefined +TEST_NVRAM_SPI_DEV ?= SPI_0 +TEST_NVRAM_SPI_CS ?= GPIO_PIN\(0,0\) +TEST_NVRAM_SPI_SIZE ?= 64 +TEST_NVRAM_SPI_ADDRESS_COUNT ?= 1 + +# export parameters +CFLAGS += -DTEST_NVRAM_SPI_DEV=$(TEST_NVRAM_SPI_DEV) +CFLAGS += -DTEST_NVRAM_SPI_CS=$(TEST_NVRAM_SPI_CS) +CFLAGS += -DTEST_NVRAM_SPI_SIZE=$(TEST_NVRAM_SPI_SIZE) +CFLAGS += -DTEST_NVRAM_SPI_ADDRESS_COUNT=$(TEST_NVRAM_SPI_ADDRESS_COUNT) include $(RIOTBASE)/Makefile.include From 23c3315654d3d6792a8a64c44cfd56f7335631e6 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:25 +0100 Subject: [PATCH 21/30] tests/driver_pcd8544: simplified Makefile --- tests/driver_pcd8544/Makefile | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/tests/driver_pcd8544/Makefile b/tests/driver_pcd8544/Makefile index 2461345881..32a7c7f286 100644 --- a/tests/driver_pcd8544/Makefile +++ b/tests/driver_pcd8544/Makefile @@ -6,17 +6,16 @@ FEATURES_REQUIRED = periph_gpio periph_spi USEMODULE += shell USEMODULE += pcd8544 -ifeq (,$(TEST_PCD8544_SPI)) - CFLAGS += -DTEST_PCD8544_SPI=SPI_0 -endif -ifeq (,$(TEST_PCD8544_CS)) - CFLAGS += -DTEST_PCD8544_CS=GPIO_PIN\(0,0\) -endif -ifeq (,$(TEST_PCD8544_RESET)) - CFLAGS += -DTEST_PCD8544_RESET=GPIO_PIN\(0,1\) -endif -ifeq (,$(TEST_PCD8544_MODE)) - CFLAGS += -DTEST_PCD8544_MODE=GPIO_PIN\(0,2\) -endif +# set default device parameters in case they are undefined +TEST_PCD8544_SPI ?= SPI_0 +TEST_PCD8544_CS ?= GPIO_PIN\(0,0\) +TEST_PCD8544_RESET ?= GPIO_PIN\(0,1\) +TEST_PCD8544_MODE ?= GPIO_PIN\(0,2\) + +# export parameters +CFLAGS += -DTEST_PCD8544_SPI=$(TEST_PCD8544_SPI) +CFLAGS += -DTEST_PCD8544_CS=$(TEST_PCD8544_CS) +CFLAGS += -DTEST_PCD8544_RESET=$(TEST_PCD8544_RESET) +CFLAGS += -DTEST_PCD8544_MODE=$(TEST_PCD8544_MODE) include $(RIOTBASE)/Makefile.include From 3ee0980243d5d7a0c5b2c23e4bb60e20c0c6392a Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:25 +0100 Subject: [PATCH 22/30] tests/driver_pir: simplified Makefile --- tests/driver_pir/Makefile | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/tests/driver_pir/Makefile b/tests/driver_pir/Makefile index 0187a02d12..d446513c1f 100644 --- a/tests/driver_pir/Makefile +++ b/tests/driver_pir/Makefile @@ -3,23 +3,22 @@ include ../Makefile.tests_common FEATURES_REQUIRED = periph_gpio -# Define default pin mappings for some boards: -ifneq (,$(filter stm32f4discovery,$(BOARD))) - export PIR_GPIO ?= GPIO_PIN\(3,7\) -endif -ifneq (,$(filter arduino-due,$(BOARD))) - export PIR_GPIO ?= GPIO_PIN\(0,20\) -endif - USEMODULE += pir USEMODULE += xtimer -ifneq (,$(PIR_GPIO)) - CFLAGS += -DPIR_GPIO=$(PIR_GPIO) -else - # set random default - CFLAGS += -DPIR_GPIO=GPIO_PIN\(0,0\) +# define parameters for selected boards +ifneq (,$(filter stm32f4discovery,$(BOARD))) + PIR_GPIO ?= GPIO_PIN\(3,7\) endif +ifneq (,$(filter arduino-due,$(BOARD))) + PIR_GPIO ?= GPIO_PIN\(0,20\) +endif + +# set default device parameters in case they are undefined +PIR_GPIO ?= GPIO_PIN\(0,0\) + +# export parameters +CFLAGS += -DPIR_GPIO=$(PIR_GPIO) include $(RIOTBASE)/Makefile.include From 8c3a526441dfa171c2d678315703d5ee87bb1345 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:25 +0100 Subject: [PATCH 23/30] tests/driver_srf02: simplified Makefile --- tests/driver_srf02/Makefile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/driver_srf02/Makefile b/tests/driver_srf02/Makefile index 420b1a4072..19548d23a0 100644 --- a/tests/driver_srf02/Makefile +++ b/tests/driver_srf02/Makefile @@ -6,15 +6,12 @@ FEATURES_REQUIRED = periph_i2c USEMODULE += xtimer USEMODULE += srf02 -# Define default settings -export TEST_SRF02_I2C ?= I2C_0 -export TEST_MODE ?= SRF02_MODE_REAL_CM +# set default device parameters in case they are undefined +TEST_SRF02_I2C ?= I2C_0 +TEST_MODE ?= SRF02_MODE_REAL_CM + +# export parameters +CFLAGS += -DTEST_SRF02_I2C=$(TEST_SRF02_I2C) +CFLAGS += -DTEST_MODE=$(TEST_MODE) include $(RIOTBASE)/Makefile.include - -ifneq (,$(TEST_SRF02_I2C)) -export CFLAGS += -DTEST_SRF02_I2C=$(TEST_SRF02_I2C) -endif -ifneq (,$(TEST_MODE)) -export CFLAGS += -DTEST_MODE=$(TEST_MODE) -endif From cba6a74294e611f1b372490362d59dee69201060 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:25 +0100 Subject: [PATCH 24/30] tests/driver_srf08: simplified Makefile --- tests/driver_srf08/Makefile | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/tests/driver_srf08/Makefile b/tests/driver_srf08/Makefile index b0aef62a82..ef31a5c945 100644 --- a/tests/driver_srf08/Makefile +++ b/tests/driver_srf08/Makefile @@ -6,23 +6,16 @@ FEATURES_REQUIRED = periph_i2c USEMODULE += xtimer USEMODULE += srf08 -# Define default settings -export TEST_SRF08_I2C ?= I2C_0 +# set default device parameters in case they are undefined +export TEST_SRF08_I2C ?= I2C_0 export TEST_SRF08_SPEED ?= I2C_SPEED_NORMAL -export TEST_MODE ?= SRF08_MODE_CM -export TEST_NUM_ECHOS?= 3 +export TEST_MODE ?= SRF08_MODE_CM +export TEST_NUM_ECHOS ?= 3 + +# export parameters +CFLAGS += -DTEST_SRF08_I2C=$(TEST_SRF08_I2C) +CFLAGS += -DTEST_SRF08_SPEED=$(TEST_SRF08_SPEED) +CFLAGS += -DTEST_MODE=$(TEST_MODE) +CFLAGS += -DTEST_NUM_ECHOS=$(TEST_NUM_ECHOS) include $(RIOTBASE)/Makefile.include - -ifneq (,$(TEST_SRF08_I2C)) -export CFLAGS += -DTEST_SRF08_I2C=$(TEST_SRF08_I2C) -endif -ifneq (,$(TEST_SRF08_SPEED)) -export CFLAGS += -DTEST_SRF08_SPEED=$(TEST_SRF08_SPEED) -endif -ifneq (,$(TEST_MODE)) -export CFLAGS += -DTEST_MODE=$(TEST_MODE) -endif -ifneq (,$(TEST_NUM_ECHOS)) -export CFLAGS += -DTEST_NUM_ECHOS=$(TEST_NUM_ECHOS) -endif From c78fbe92eeeb994e147c9ae930367b1dc189b9b1 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:25 +0100 Subject: [PATCH 25/30] tests/driver_tcs37727: simplified Makefile --- tests/driver_tcs37727/Makefile | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/driver_tcs37727/Makefile b/tests/driver_tcs37727/Makefile index 103ef8bba3..f5254514aa 100644 --- a/tests/driver_tcs37727/Makefile +++ b/tests/driver_tcs37727/Makefile @@ -6,17 +6,12 @@ FEATURES_REQUIRED = periph_i2c USEMODULE += tcs37727 USEMODULE += xtimer -ifneq (,$(TEST_TCS37727_I2C)) - CFLAGS += -DTEST_TCS37727_I2C=$(TEST_TCS37727_I2C) -else - # set random default - CFLAGS += -DTEST_TCS37727_I2C=I2C_0 -endif -ifneq (,$(TEST_TCS37727_ADDR)) - CFLAGS += -DTEST_TCS37727_ADDR=$(TEST_TCS37727_ADDR) -else - # set random default - CFLAGS += -DTEST_TCS37727_ADDR=0x29 -endif +# set default device parameters in case they are undefined +TEST_TCS37727_I2C ?= I2C_0 +TEST_TCS37727_ADDR ?= 0x29 + +# export parameters +CFLAGS += -DTEST_TCS37727_I2C=$(TEST_TCS37727_I2C) +CFLAGS += -DTEST_TCS37727_ADDR=$(TEST_TCS37727_ADDR) include $(RIOTBASE)/Makefile.include From 770efad28a51cad1f58c5e4d87087d89e69a3399 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:25 +0100 Subject: [PATCH 26/30] tests/driver_tmp006: simplified Makefile --- tests/driver_tmp006/Makefile | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/tests/driver_tmp006/Makefile b/tests/driver_tmp006/Makefile index 4b4a803813..9f191c7cad 100644 --- a/tests/driver_tmp006/Makefile +++ b/tests/driver_tmp006/Makefile @@ -6,20 +6,14 @@ FEATURES_REQUIRED = periph_i2c USEMODULE += tmp006 USEMODULE += xtimer -ifneq (,$(TEST_TMP006_I2C)) - CFLAGS += -DTEST_TMP006_I2C=$(TEST_TMP006_I2C) -else - CFLAGS += -DTEST_TMP006_I2C=I2C_0 -endif -ifneq (,$(TEST_TMP006_ADDR)) - CFLAGS += -DTEST_TMP006_ADDR=$(TEST_TMP006_ADDR) -else - CFLAGS += -DTEST_TMP006_ADDR=0x41 -endif -ifneq (,$(TEST_TMP006_CONFIG_CR)) - CFLAGS += -DTEST_TMP006_CONFIG_CR=$(TEST_TMP006_CONFIG_CR) -else - CFLAGS += -DTEST_TMP006_CONFIG_CR=TMP006_CONFIG_CR_DEF -endif +# set default device parameters in case they are undefined +TEST_TMP006_I2C ?= I2C_0 +TEST_TMP006_ADDR ?= 0x41 +TEST_TMP006_CONFIG_CR ?= TMP006_CONFIG_CR_DEF + +# export parameters +CFLAGS += -DTEST_TMP006_I2C=$(TEST_TMP006_I2C) +CFLAGS += -DTEST_TMP006_ADDR=$(TEST_TMP006_ADDR) +CFLAGS += -DTEST_TMP006_CONFIG_CR=$(TEST_TMP006_CONFIG_CR) include $(RIOTBASE)/Makefile.include From 77d40d789d1202ceedc7e2bc47ae92eaf89ab406 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:25 +0100 Subject: [PATCH 27/30] tests/driver_xbee: simplified Makefile --- tests/driver_xbee/Makefile | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/tests/driver_xbee/Makefile b/tests/driver_xbee/Makefile index c481410fd5..a54b0e4b6b 100644 --- a/tests/driver_xbee/Makefile +++ b/tests/driver_xbee/Makefile @@ -5,17 +5,6 @@ FEATURES_REQUIRED = periph_uart periph_gpio BOARD_INSUFFICIENT_MEMORY := stm32f0discovery weio -# Define default pin mappings for some boards: -ifneq (,$(filter stm32f0discovery,$(BOARD))) - export XBEE_UART ?= "UART_DEV(0)" -endif -ifneq (,$(filter stm32f4discovery,$(BOARD))) - export XBEE_UART ?= "UART_DEV(0)" -endif -ifneq (,$(filter nucleo-f091,$(BOARD))) - export XBEE_UART ?= "UART_DEV(0)" -endif - USEMODULE += xbee USEMODULE += gnrc_netif USEMODULE += auto_init_gnrc_netif @@ -24,12 +13,11 @@ USEMODULE += gnrc_pktdump USEMODULE += shell USEMODULE += shell_commands -ifneq (,$(XBEE_UART)) - CFLAGS += -DXBEE_UART=$(XBEE_UART) -else - # set default - CFLAGS += -DXBEE_UART="UART_DEV(0)" -endif +# set default UART to use in case none was defined +XBEE_UART ?= "UART_NUMOF-1" + +# export UART to params file +CFLAGS += -DXBEE_UART=$(XBEE_UART) # add current directory to the include path. Putting it in CFLAGS will make # it go to the beginning, before the standard includes. From 1db162adbf2c9ffe8f03b15d186c560c48bd7f6d Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:25 +0100 Subject: [PATCH 28/30] tests/slip: simplified Makefile --- tests/slip/Makefile | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/tests/slip/Makefile b/tests/slip/Makefile index 49794dab33..e2041d4f30 100644 --- a/tests/slip/Makefile +++ b/tests/slip/Makefile @@ -10,19 +10,17 @@ USEMODULE += gnrc_slip USEMODULE += shell USEMODULE += shell_commands +# set slip parameters to default values if unset +SLIP_UART ?= "UART_NUMOF-1" +SLIP_BAUDRATE ?= 115200 + +# export slip parameters +CFLAGS += -DSLIP_UART="UART_DEV($(SLIP_UART))" +CFLAGS += -DSLIP_BAUDRATE=$(SLIP_BAUDRATE) + +# add current directory to the include path. Putting it in CFLAGS will make +# it go to the beginning, before the standard includes. +# That way slip_params.h get's included and auto configuration can pick it up. CFLAGS += -I$(CURDIR) -ifneq (,$(SLIP_UART)) - CFLAGS += -DSLIP_UART="UART_DEV($(SLIP_UART))" -else - # set default - CFLAGS += -DSLIP_UART="UART_DEV(UART_NUMOF-1)" -endif -ifneq (,$(SLIP_BAUDRATE)) - CFLAGS += -DSLIP_BAUDRATE=$(SLIP_BAUDRATE) -else - # set default - CFLAGS += -DSLIP_BAUDRATE=115200 -endif - include $(RIOTBASE)/Makefile.include From 58245bab60927c084431cef970057c8172c0a431 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 3 Nov 2015 15:27:27 +0100 Subject: [PATCH 29/30] tests/zep: simplified Makefile --- tests/zep/Makefile | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/tests/zep/Makefile b/tests/zep/Makefile index cb94a6af4e..4c65e3c364 100644 --- a/tests/zep/Makefile +++ b/tests/zep/Makefile @@ -14,31 +14,16 @@ USEMODULE += gnrc_pktdump USEMODULE += shell USEMODULE += shell_commands -ifeq (,$(ZEP_DST)) - # set default - CFLAGS += -DZEP_DST="\"::1\"" -else - CFLAGS += -DZEP_DST="\"$(ZEP_DST)\"" -endif -ifeq (,$(ZEP_SRC_PORT)) - # set default - CFLAGS += -DZEP_SRC_PORT=GNRC_ZEP_DEFAULT_PORT -else - CFLAGS += -DZEP_SRC_PORT=$(ZEP_SRC_PORT) -endif +# set optional default values for ZEP parameters if unset +ZEP_DST ?= "\"::1\"" +ZEP_SRC_PORT ?= GNRC_ZEP_DEFAULT_PORT +ZEP_DST_PORT ?= GNRC_ZEP_DEFAULT_PORT -ifeq (,$(ZEP_DST_PORT)) - # set default - CFLAGS += -DZEP_DST_PORT=GNRC_ZEP_DEFAULT_PORT -else - CFLAGS += -DZEP_DST_PORT=$(ZEP_DST_PORT) -endif - -# add current directory to the include path. Putting it in CFLAGS will make -# it go to the beginning, before the standard includes. -# That way xbee_params.h get's included and auto configuration can pick it up. -CFLAGS += -I$(CURDIR) +# export ZEP parameters +CFLAGS += -DZEP_DST="\"$(ZEP_DST)\"" +CFLAGS += -DZEP_SRC_PORT=$(ZEP_SRC_PORT) +CFLAGS += -DZEP_DST_PORT=$(ZEP_DST_PORT) # one for gnrc_netif_default and one for ZEP CFLAGS += -DGNRC_NETIF_NUMOF=2 From 99e5aaaa7d2838365791aaec0bdb743d3e245544 Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Fri, 13 Nov 2015 14:54:16 +0100 Subject: [PATCH 30/30] boards/fox: added params file for the at86rf231 --- boards/fox/include/at86rf2xx_params.h | 46 +++++++++++++++++++++++++++ boards/fox/include/board.h | 1 + 2 files changed, 47 insertions(+) create mode 100644 boards/fox/include/at86rf2xx_params.h diff --git a/boards/fox/include/at86rf2xx_params.h b/boards/fox/include/at86rf2xx_params.h new file mode 100644 index 0000000000..55f272773a --- /dev/null +++ b/boards/fox/include/at86rf2xx_params.h @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2015 Kaspar Schleiser + * + * 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 board_iotlab-m3 + * @{ + * + * @file + * @brief at86rf231 board specific configuration + * + * @author Kaspar Schleiser + */ + +#ifndef AT86RF2XX_PARAMS_H_ +#define AT86RF2XX_PARAMS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @name AT86RF231 configuration + */ +static const at86rf2xx_params_t at86rf2xx_params[] = + { + { + .spi = AT86RF231_SPI, + .spi_speed = AT86RF231_SPI_CLK, + .cs_pin = AT86RF231_CS, + .int_pin = AT86RF231_INT, + .sleep_pin = AT86RF231_SLEEP, + .reset_pin = AT86RF231_RESET, + }, + }; +/** @} */ + +#ifdef __cplusplus +} +#endif +#endif /* AT86RF2XX_PARAMS_H_ */ +/** @} */ diff --git a/boards/fox/include/board.h b/boards/fox/include/board.h index 29bef23df5..7ec9c42b9d 100644 --- a/boards/fox/include/board.h +++ b/boards/fox/include/board.h @@ -56,6 +56,7 @@ extern "C" { #define AT86RF231_INT GPIO_PIN(PORT_C,2) #define AT86RF231_RESET GPIO_PIN(PORT_C,1) #define AT86RF231_SLEEP GPIO_PIN(PORT_A,0) +#define AT86RF231_SPI_CLK SPI_SPEED_5MHZ /** @} */ /**