tests: adjusted test to changed GPIO interface
This commit is contained in:
parent
b49f11bed7
commit
315ac1bedb
@ -33,27 +33,27 @@ ifneq (true,$(USE_BOARD_PARAMETERS))
|
||||
ifneq (,$(ATRF_SPI))
|
||||
CFLAGS += -DATRF_SPI=$(ATRF_SPI)
|
||||
else
|
||||
CFLAGS += -DATRF_SPI=SPI_0 # set default
|
||||
CFLAGS += -DATRF_SPI=SPI_0 # set default
|
||||
endif
|
||||
ifneq (,$(ATRF_CS))
|
||||
CFLAGS += -DATRF_CS=$(ATRF_CS)
|
||||
else
|
||||
CFLAGS += -DATRF_CS=GPIO_0 # set default
|
||||
CFLAGS += -DATRF_CS=GPIO\(0,0\) # set default
|
||||
endif
|
||||
ifneq (,$(ATRF_INT))
|
||||
CFLAGS += -DATRF_INT=$(ATRF_INT)
|
||||
else
|
||||
CFLAGS += -DATRF_INT=GPIO_1 # set default
|
||||
CFLAGS += -DATRF_INT=GPIO\(0,1\) # set default
|
||||
endif
|
||||
ifneq (,$(ATRF_SLEEP))
|
||||
CFLAGS += -DATRF_SLEEP=$(ATRF_SLEEP)
|
||||
else
|
||||
CFLAGS += -DATRF_SLEEP=GPIO_2 # set default
|
||||
CFLAGS += -DATRF_SLEEP=GPIO\(0,2\) # set default
|
||||
endif
|
||||
ifneq (,$(ATRF_RESET))
|
||||
CFLAGS += -DATRF_RESET=$(ATRF_RESET)
|
||||
else
|
||||
CFLAGS += -DATRF_RESET=GPIO_3 # set default
|
||||
CFLAGS += -DATRF_RESET=GPIO\(0,3\) # set default
|
||||
endif
|
||||
ifneq (,$(ATRF_SPI_SPEED))
|
||||
CFLAGS += -DATRF_SPI_SPEED=$(ATRF_SPI_SPEED)
|
||||
|
||||
@ -5,7 +5,7 @@ FEATURES_REQUIRED = periph_gpio
|
||||
|
||||
# define default pin mappings for some boards:
|
||||
ifneq (,$(filter stm32f4discovery,$(BOARD)))
|
||||
export DHT_GPIO ?= GPIO_4
|
||||
export DHT_GPIO ?= GPIO\(4,3\)
|
||||
endif
|
||||
|
||||
USEMODULE += dht
|
||||
@ -21,7 +21,7 @@ ifneq (,$(DHT_GPIO))
|
||||
CFLAGS += -DDHT_GPIO=$(DHT_GPIO)
|
||||
else
|
||||
# set random default
|
||||
CFLAGS += -DDHT_GPIO=GPIO_0
|
||||
CFLAGS += -DDHT_GPIO=GPIO\(0,0\)
|
||||
endif
|
||||
|
||||
include $(RIOTBASE)/Makefile.include
|
||||
|
||||
@ -16,7 +16,7 @@ ifneq (,$(TEST_ISL29125_IRQ_PIN))
|
||||
CFLAGS += -DTEST_ISL29125_IRQ_PIN=$(TEST_ISL29125_IRQ_PIN)
|
||||
else
|
||||
# set random default
|
||||
CFLAGS += -DTEST_ISL29125_IRQ_PIN=GPIO_5
|
||||
CFLAGS += -DTEST_ISL29125_IRQ_PIN=GPIO\(0,0\)
|
||||
endif
|
||||
|
||||
include $(RIOTBASE)/Makefile.include
|
||||
|
||||
@ -27,22 +27,22 @@ ifneq (true,$(USE_BOARD_PARAMETERS))
|
||||
ifneq (,$(KWRF_SHARED_SPI))
|
||||
CFLAGS += -DKW2XRF_SHARED_SPI=$(DKW2XRF_SHARED_SPI)
|
||||
else
|
||||
CFLAGS += -DKW2XRFD_SHARED_SPI=1 # activate spi-lock
|
||||
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
|
||||
CFLAGS += -DKWRF_SPI=SPI_0 # set default
|
||||
endif
|
||||
ifneq (,$(KWRF_CS))
|
||||
CFLAGS += -DKWRF_CS=$(KWRF_CS)
|
||||
else
|
||||
CFLAGS += -DKWRF_CS=GPIO_0 # set default
|
||||
CFLAGS += -DKWRF_CS=GPIO\(0,0\) # set default
|
||||
endif
|
||||
ifneq (,$(KWRF_INT))
|
||||
CFLAGS += -DKWRF_INT=$(KWRF_INT)
|
||||
else
|
||||
CFLAGS += -DKWRF_INT=GPIO_1 # set default
|
||||
CFLAGS += -DKWRF_INT=GPIO\(0,1\) # set default
|
||||
endif
|
||||
ifneq (,$(KWRF_SPI_SPEED))
|
||||
CFLAGS += -DKWRF_SPI_SPEED=$(KWRF_SPI_SPEED)
|
||||
|
||||
@ -22,13 +22,13 @@ ifneq (,$(TEST_L3G4200D_INT))
|
||||
CFLAGS += -DTEST_L3G4200D_INT=$(TEST_L3G4200D_INT)
|
||||
else
|
||||
# set random default
|
||||
CFLAGS += -DTEST_L3G4200D_INT=GPIO_0
|
||||
CFLAGS += -DTEST_L3G4200D_INT=GPIO\(0,0\)
|
||||
endif
|
||||
ifneq (,$(TEST_L3G4200D_DRDY))
|
||||
CFLAGS += -DTEST_L3G4200D_DRDY=$(TEST_L3G4200D_DRDY)
|
||||
else
|
||||
# set random default
|
||||
CFLAGS += -DTEST_L3G4200D_DRDY=GPIO_1
|
||||
CFLAGS += -DTEST_L3G4200D_DRDY=GPIO\(0,1\)
|
||||
endif
|
||||
|
||||
include $(RIOTBASE)/Makefile.include
|
||||
|
||||
@ -16,19 +16,19 @@ ifneq (,$(TEST_LIS3DH_CS))
|
||||
CFLAGS += -DTEST_LIS3DH_CS=$(TEST_LIS3DH_CS)
|
||||
else
|
||||
# set arbitrary default
|
||||
CFLAGS += -DTEST_LIS3DH_CS=GPIO_0
|
||||
CFLAGS += -DTEST_LIS3DH_CS=GPIO\(0,0\)
|
||||
endif
|
||||
ifneq (,$(TEST_LIS3DH_INT1))
|
||||
CFLAGS += -DTEST_LIS3DH_INT1=$(TEST_LIS3DH_INT1)
|
||||
else
|
||||
# set arbitrary default
|
||||
CFLAGS += -DTEST_LIS3DH_INT1=GPIO_1
|
||||
CFLAGS += -DTEST_LIS3DH_INT1=GPIO\(0,1\)
|
||||
endif
|
||||
ifneq (,$(TEST_LIS3DH_INT2))
|
||||
CFLAGS += -DTEST_LIS3DH_INT2=$(TEST_LIS3DH_INT2)
|
||||
else
|
||||
# set arbitrary default
|
||||
CFLAGS += -DTEST_LIS3DH_INT2=GPIO_2
|
||||
CFLAGS += -DTEST_LIS3DH_INT2=GPIO\(0,2\)
|
||||
endif
|
||||
|
||||
include $(RIOTBASE)/Makefile.include
|
||||
|
||||
@ -35,13 +35,13 @@ ifneq (,$(TEST_LSM303DLHC_ACC_PIN))
|
||||
CFLAGS += -DTEST_LSM303DLHC_ACC_PIN=$(TEST_LSM303DLHC_ACC_PIN)
|
||||
else
|
||||
# set random default
|
||||
CFLAGS += -DTEST_LSM303DLHC_ACC_PIN=GPIO_0
|
||||
CFLAGS += -DTEST_LSM303DLHC_ACC_PIN=GPIO\(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_1
|
||||
CFLAGS += -DTEST_LSM303DLHC_MAG_PIN=GPIO\(0,1\)
|
||||
endif
|
||||
|
||||
include $(RIOTBASE)/Makefile.include
|
||||
|
||||
@ -10,9 +10,9 @@ USEMODULE += nrf24l01p
|
||||
FEATURES_REQUIRED = periph_spi
|
||||
|
||||
SPI_PORT ?= SPI_0
|
||||
CE_PIN ?= GPIO_0
|
||||
CS_PIN ?= GPIO_1
|
||||
IRQ_PIN ?= GPIO_2
|
||||
CE_PIN ?= GPIO\(0,0\)
|
||||
CS_PIN ?= GPIO\(0,1\)
|
||||
IRQ_PIN ?= GPIO\(0,2\)
|
||||
|
||||
include $(RIOTBASE)/Makefile.include
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ ifneq (,$(TEST_NVRAM_SPI_CS))
|
||||
CFLAGS += -DTEST_NVRAM_SPI_CS=$(TEST_NVRAM_SPI_CS)
|
||||
else
|
||||
# set arbitrary default
|
||||
CFLAGS += -DTEST_NVRAM_SPI_CS=GPIO_0
|
||||
CFLAGS += -DTEST_NVRAM_SPI_CS=GPIO\(0,0\)
|
||||
endif
|
||||
ifneq (,$(TEST_NVRAM_SPI_SIZE))
|
||||
CFLAGS += -DTEST_NVRAM_SPI_SIZE=$(TEST_NVRAM_SPI_SIZE)
|
||||
|
||||
@ -11,13 +11,13 @@ ifeq (,$(TEST_PCD8544_SPI))
|
||||
CFLAGS += -DTEST_PCD8544_SPI=SPI_0
|
||||
endif
|
||||
ifeq (,$(TEST_PCD8544_CS))
|
||||
CFLAGS += -DTEST_PCD8544_CS=GPIO_0
|
||||
CFLAGS += -DTEST_PCD8544_CS=GPIO\(0,0\)
|
||||
endif
|
||||
ifeq (,$(TEST_PCD8544_RESET))
|
||||
CFLAGS += -DTEST_PCD8544_RESET=GPIO_1
|
||||
CFLAGS += -DTEST_PCD8544_RESET=GPIO\(0,1\)
|
||||
endif
|
||||
ifeq (,$(TEST_PCD8544_MODE))
|
||||
CFLAGS += -DTEST_PCD8544_MODE=GPIO_2
|
||||
CFLAGS += -DTEST_PCD8544_MODE=GPIO\(0,2\)
|
||||
endif
|
||||
|
||||
include $(RIOTBASE)/Makefile.include
|
||||
|
||||
@ -5,10 +5,10 @@ FEATURES_REQUIRED = periph_gpio
|
||||
|
||||
# Define default pin mappings for some boards:
|
||||
ifneq (,$(filter stm32f4discovery,$(BOARD)))
|
||||
export PIR_GPIO ?= GPIO_8
|
||||
export PIR_GPIO ?= GPIO\(3,7\)
|
||||
endif
|
||||
ifneq (,$(filter arduino-due,$(BOARD)))
|
||||
export PIR_GPIO ?= GPIO_10
|
||||
export PIR_GPIO ?= GPIO\(0,20\)
|
||||
endif
|
||||
|
||||
USEMODULE += pir
|
||||
@ -18,7 +18,7 @@ ifneq (,$(PIR_GPIO))
|
||||
CFLAGS += -DPIR_GPIO=$(PIR_GPIO)
|
||||
else
|
||||
# set random default
|
||||
CFLAGS += -DPIR_GPIO=GPIO_0
|
||||
CFLAGS += -DPIR_GPIO=GPIO\(0,0\)
|
||||
endif
|
||||
|
||||
include $(RIOTBASE)/Makefile.include
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user