From 16b8caa6b6687480533ae307d4a687e71e73a324 Mon Sep 17 00:00:00 2001 From: Schorcht Date: Thu, 29 Nov 2018 08:25:27 +0100 Subject: [PATCH 1/7] periph/adc: change of ADC_LINE macro --- drivers/include/periph/adc.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/include/periph/adc.h b/drivers/include/periph/adc.h index 4fd2cc9f0020..54955b0ae980 100644 --- a/drivers/include/periph/adc.h +++ b/drivers/include/periph/adc.h @@ -68,9 +68,12 @@ typedef unsigned int adc_t; /** * @brief Default ADC line access macro + * + * The macro should be used to obtain the ADC line for device x and channel y, + * where the channels of device 0 are normally the MCU channels. */ #ifndef ADC_LINE -#define ADC_LINE(x) (x) +#define ADC_LINE(x,y) ((adc_t)((x & 0) | y)) #endif /** From df539e7aa75c9ff1bb64fcecf17c214de6c32cae Mon Sep 17 00:00:00 2001 From: Schorcht Date: Thu, 29 Nov 2018 08:26:39 +0100 Subject: [PATCH 2/7] boards/*: adoption for API change of ADC_LINE --- boards/arduino-zero/include/arduino_pinmap.h | 12 +++--- .../arduino-atmega/include/arduino_pinmap.h | 32 +++++++-------- .../arduino-due/include/arduino_pinmap.h | 24 +++++------ .../arduino-mkr/include/arduino_pinmap.h | 14 +++---- .../common/nucleo144/include/arduino_pinmap.h | 12 +++--- .../common/nucleo32/include/arduino_pinmap.h | 16 ++++---- .../common/nucleo64/include/arduino_pinmap.h | 12 +++--- boards/firefly/include/adc_params.h | 6 +-- boards/frdm-k22f/include/adc_params.h | 16 ++++---- boards/frdm-k64f/include/adc_params.h | 40 +++++++++---------- boards/frdm-kw41z/include/adc_params.h | 14 +++---- boards/mulle/include/adc_params.h | 30 +++++++------- boards/mulle/include/board.h | 4 +- boards/remote-pa/include/adc_params.h | 4 +- boards/remote-reva/include/adc_params.h | 6 +-- boards/remote-revb/include/adc_params.h | 6 +-- .../stm32f4discovery/include/arduino_pinmap.h | 8 ++-- .../ublox-c030-u201/include/arduino_pinmap.h | 12 +++--- 18 files changed, 134 insertions(+), 134 deletions(-) diff --git a/boards/arduino-zero/include/arduino_pinmap.h b/boards/arduino-zero/include/arduino_pinmap.h index dd705ec9ac68..ce7d04c73895 100644 --- a/boards/arduino-zero/include/arduino_pinmap.h +++ b/boards/arduino-zero/include/arduino_pinmap.h @@ -61,12 +61,12 @@ extern "C" { * @name Mapping of Arduino analog pins to RIOT ADC lines * @{ */ -#define ARDUINO_A0 ADC_LINE(0) -#define ARDUINO_A1 ADC_LINE(1) -#define ARDUINO_A2 ADC_LINE(2) -#define ARDUINO_A3 ADC_LINE(3) -#define ARDUINO_A4 ADC_LINE(4) -#define ARDUINO_A5 ADC_LINE(5) +#define ARDUINO_A0 ADC_LINE(0, 0) +#define ARDUINO_A1 ADC_LINE(0, 1) +#define ARDUINO_A2 ADC_LINE(0, 2) +#define ARDUINO_A3 ADC_LINE(0, 3) +#define ARDUINO_A4 ADC_LINE(0, 4) +#define ARDUINO_A5 ADC_LINE(0, 5) /** @} */ #ifdef __cplusplus diff --git a/boards/common/arduino-atmega/include/arduino_pinmap.h b/boards/common/arduino-atmega/include/arduino_pinmap.h index 00b7bf0ab72f..669d29aafdf1 100644 --- a/boards/common/arduino-atmega/include/arduino_pinmap.h +++ b/boards/common/arduino-atmega/include/arduino_pinmap.h @@ -160,23 +160,23 @@ extern "C" { #define ARDUINO_PIN_A15 ARDUINO_PIN_69 #endif -#define ARDUINO_A0 ADC_LINE(0) -#define ARDUINO_A1 ADC_LINE(1) -#define ARDUINO_A2 ADC_LINE(2) -#define ARDUINO_A3 ADC_LINE(3) -#define ARDUINO_A4 ADC_LINE(4) -#define ARDUINO_A5 ADC_LINE(5) -#define ARDUINO_A6 ADC_LINE(6) -#define ARDUINO_A7 ADC_LINE(7) +#define ARDUINO_A0 ADC_LINE(0, 0) +#define ARDUINO_A1 ADC_LINE(0, 1) +#define ARDUINO_A2 ADC_LINE(0, 2) +#define ARDUINO_A3 ADC_LINE(0, 3) +#define ARDUINO_A4 ADC_LINE(0, 4) +#define ARDUINO_A5 ADC_LINE(0, 5) +#define ARDUINO_A6 ADC_LINE(0, 6) +#define ARDUINO_A7 ADC_LINE(0, 7) #ifdef CPU_ATMEGA2560 -#define ARDUINO_A8 ADC_LINE(8) -#define ARDUINO_A9 ADC_LINE(9) -#define ARDUINO_A10 ADC_LINE(10) -#define ARDUINO_A11 ADC_LINE(11) -#define ARDUINO_A12 ADC_LINE(12) -#define ARDUINO_A13 ADC_LINE(13) -#define ARDUINO_A14 ADC_LINE(14) -#define ARDUINO_A15 ADC_LINE(15) +#define ARDUINO_A8 ADC_LINE(0, 8) +#define ARDUINO_A9 ADC_LINE(0, 9) +#define ARDUINO_A10 ADC_LINE(0, 10) +#define ARDUINO_A11 ADC_LINE(0, 11) +#define ARDUINO_A12 ADC_LINE(0, 12) +#define ARDUINO_A13 ADC_LINE(0, 13) +#define ARDUINO_A14 ADC_LINE(0, 14) +#define ARDUINO_A15 ADC_LINE(0, 15) #endif /** @} */ diff --git a/boards/common/arduino-due/include/arduino_pinmap.h b/boards/common/arduino-due/include/arduino_pinmap.h index 266f985efd04..24cf913b269e 100644 --- a/boards/common/arduino-due/include/arduino_pinmap.h +++ b/boards/common/arduino-due/include/arduino_pinmap.h @@ -118,18 +118,18 @@ extern "C" { * @name Mapping of Arduino analog pins to RIOT ADC lines * @{ */ -#define ARDUINO_A0 ADC_LINE(7) -#define ARDUINO_A1 ADC_LINE(6) -#define ARDUINO_A2 ADC_LINE(5) -#define ARDUINO_A3 ADC_LINE(4) -#define ARDUINO_A4 ADC_LINE(3) -#define ARDUINO_A5 ADC_LINE(2) -#define ARDUINO_A6 ADC_LINE(1) -#define ARDUINO_A7 ADC_LINE(0) -#define ARDUINO_A8 ADC_LINE(10) -#define ARDUINO_A9 ADC_LINE(11) -#define ARDUINO_A10 ADC_LINE(12) -#define ARDUINO_A11 ADC_LINE(13) +#define ARDUINO_A0 ADC_LINE(0, 7) +#define ARDUINO_A1 ADC_LINE(0, 6) +#define ARDUINO_A2 ADC_LINE(0, 5) +#define ARDUINO_A3 ADC_LINE(0, 4) +#define ARDUINO_A4 ADC_LINE(0, 3) +#define ARDUINO_A5 ADC_LINE(0, 2) +#define ARDUINO_A6 ADC_LINE(0, 1) +#define ARDUINO_A7 ADC_LINE(0, 0) +#define ARDUINO_A8 ADC_LINE(0, 10) +#define ARDUINO_A9 ADC_LINE(0, 11) +#define ARDUINO_A10 ADC_LINE(0, 12) +#define ARDUINO_A11 ADC_LINE(0, 13) /** @} */ /** diff --git a/boards/common/arduino-mkr/include/arduino_pinmap.h b/boards/common/arduino-mkr/include/arduino_pinmap.h index 5924aaf6d476..7448e3232cb2 100644 --- a/boards/common/arduino-mkr/include/arduino_pinmap.h +++ b/boards/common/arduino-mkr/include/arduino_pinmap.h @@ -63,13 +63,13 @@ extern "C" { * @name Mapping of Arduino analog pins to RIOT ADC lines * @{ */ -#define ARDUINO_A0 ADC_LINE(0) -#define ARDUINO_A1 ADC_LINE(1) -#define ARDUINO_A2 ADC_LINE(2) -#define ARDUINO_A3 ADC_LINE(3) -#define ARDUINO_A4 ADC_LINE(4) -#define ARDUINO_A5 ADC_LINE(5) -#define ARDUINO_A6 ADC_LINE(6) +#define ARDUINO_A0 ADC_LINE(0, 0) +#define ARDUINO_A1 ADC_LINE(0, 1) +#define ARDUINO_A2 ADC_LINE(0, 2) +#define ARDUINO_A3 ADC_LINE(0, 3) +#define ARDUINO_A4 ADC_LINE(0, 4) +#define ARDUINO_A5 ADC_LINE(0, 5) +#define ARDUINO_A6 ADC_LINE(0, 6) /** @} */ #ifdef __cplusplus diff --git a/boards/common/nucleo144/include/arduino_pinmap.h b/boards/common/nucleo144/include/arduino_pinmap.h index 77c880ec5650..fc188be21f20 100644 --- a/boards/common/nucleo144/include/arduino_pinmap.h +++ b/boards/common/nucleo144/include/arduino_pinmap.h @@ -80,12 +80,12 @@ extern "C" { * @name Mapping of Arduino analog pins to RIOT ADC lines * @{ */ -#define ARDUINO_A0 ADC_LINE(0) -#define ARDUINO_A1 ADC_LINE(1) -#define ARDUINO_A2 ADC_LINE(2) -#define ARDUINO_A3 ADC_LINE(3) -#define ARDUINO_A4 ADC_LINE(4) -#define ARDUINO_A5 ADC_LINE(5) +#define ARDUINO_A0 ADC_LINE(0, 0) +#define ARDUINO_A1 ADC_LINE(0, 1) +#define ARDUINO_A2 ADC_LINE(0, 2) +#define ARDUINO_A3 ADC_LINE(0, 3) +#define ARDUINO_A4 ADC_LINE(0, 4) +#define ARDUINO_A5 ADC_LINE(0, 5) /** @} */ #ifdef __cplusplus diff --git a/boards/common/nucleo32/include/arduino_pinmap.h b/boards/common/nucleo32/include/arduino_pinmap.h index 16d77ce757c0..1a544ca6bf85 100644 --- a/boards/common/nucleo32/include/arduino_pinmap.h +++ b/boards/common/nucleo32/include/arduino_pinmap.h @@ -67,14 +67,14 @@ extern "C" { * @name Mapping of Arduino analog pins to RIOT ADC lines * @{ */ -#define ARDUINO_A0 ADC_LINE(0) -#define ARDUINO_A1 ADC_LINE(1) -#define ARDUINO_A2 ADC_LINE(2) -#define ARDUINO_A3 ADC_LINE(3) -#define ARDUINO_A4 ADC_LINE(4) -#define ARDUINO_A5 ADC_LINE(5) -#define ARDUINO_A6 ADC_LINE(6) -#define ARDUINO_A7 ADC_LINE(7) +#define ARDUINO_A0 ADC_LINE(0, 0) +#define ARDUINO_A1 ADC_LINE(0, 1) +#define ARDUINO_A2 ADC_LINE(0, 2) +#define ARDUINO_A3 ADC_LINE(0, 3) +#define ARDUINO_A4 ADC_LINE(0, 4) +#define ARDUINO_A5 ADC_LINE(0, 5) +#define ARDUINO_A6 ADC_LINE(0, 6) +#define ARDUINO_A7 ADC_LINE(0, 7) /** @} */ #ifdef __cplusplus diff --git a/boards/common/nucleo64/include/arduino_pinmap.h b/boards/common/nucleo64/include/arduino_pinmap.h index d342fb3ab9be..7e07f818f398 100644 --- a/boards/common/nucleo64/include/arduino_pinmap.h +++ b/boards/common/nucleo64/include/arduino_pinmap.h @@ -69,12 +69,12 @@ extern "C" { * @name Mapping of Arduino analog pins to RIOT ADC lines * @{ */ -#define ARDUINO_A0 ADC_LINE(0) -#define ARDUINO_A1 ADC_LINE(1) -#define ARDUINO_A2 ADC_LINE(2) -#define ARDUINO_A3 ADC_LINE(3) -#define ARDUINO_A4 ADC_LINE(4) -#define ARDUINO_A5 ADC_LINE(5) +#define ARDUINO_A0 ADC_LINE(0, 0) +#define ARDUINO_A1 ADC_LINE(0, 1) +#define ARDUINO_A2 ADC_LINE(0, 2) +#define ARDUINO_A3 ADC_LINE(0, 3) +#define ARDUINO_A4 ADC_LINE(0, 4) +#define ARDUINO_A5 ADC_LINE(0, 5) /** @} */ #ifdef __cplusplus diff --git a/boards/firefly/include/adc_params.h b/boards/firefly/include/adc_params.h index 678b4367c4ae..4ca0619924d9 100644 --- a/boards/firefly/include/adc_params.h +++ b/boards/firefly/include/adc_params.h @@ -34,17 +34,17 @@ static const saul_adc_params_t saul_adc_params[] = { { .name = "ADC1", - .line = ADC_LINE(0), + .line = ADC_LINE(0, 0), .res = ADC_RES_12BIT, }, { .name = "ADC2", - .line = ADC_LINE(1), + .line = ADC_LINE(0, 1), .res = ADC_RES_12BIT, }, { .name = "ADC3", - .line = ADC_LINE(2), + .line = ADC_LINE(0, 2), .res = ADC_RES_12BIT, } }; diff --git a/boards/frdm-k22f/include/adc_params.h b/boards/frdm-k22f/include/adc_params.h index 3a6157a1d7f7..53d7dc3eaff0 100644 --- a/boards/frdm-k22f/include/adc_params.h +++ b/boards/frdm-k22f/include/adc_params.h @@ -33,42 +33,42 @@ static const saul_adc_params_t saul_adc_params[] = { { .name = "ADC0_DP", - .line = ADC_LINE(0), + .line = ADC_LINE(0, 0), .res = ADC_RES_16BIT, }, { .name = "ADC0_DM", - .line = ADC_LINE(1), + .line = ADC_LINE(0, 1), .res = ADC_RES_16BIT, }, { .name = "ADC1_DP", - .line = ADC_LINE(2), + .line = ADC_LINE(0, 2), .res = ADC_RES_16BIT, }, { .name = "ADC1_DM", - .line = ADC_LINE(3), + .line = ADC_LINE(0, 3), .res = ADC_RES_16BIT, }, { .name = "A0", - .line = ADC_LINE(4), + .line = ADC_LINE(0, 4), .res = ADC_RES_16BIT, }, { .name = "A1", - .line = ADC_LINE(5), + .line = ADC_LINE(0, 5), .res = ADC_RES_16BIT, }, { .name = "A2", - .line = ADC_LINE(6), + .line = ADC_LINE(0, 6), .res = ADC_RES_16BIT, }, { .name = "A3", - .line = ADC_LINE(7), + .line = ADC_LINE(0, 7), .res = ADC_RES_16BIT, }, }; diff --git a/boards/frdm-k64f/include/adc_params.h b/boards/frdm-k64f/include/adc_params.h index b5820f5968d6..91af7fb92547 100644 --- a/boards/frdm-k64f/include/adc_params.h +++ b/boards/frdm-k64f/include/adc_params.h @@ -31,26 +31,26 @@ extern "C" { */ static const saul_adc_params_t saul_adc_params[] = { - { .name = "PTB2", .line = ADC_LINE(0), .res = ADC_RES_16BIT, }, - { .name = "PTB3", .line = ADC_LINE(1), .res = ADC_RES_16BIT, }, - { .name = "PTB10", .line = ADC_LINE(2), .res = ADC_RES_16BIT, }, - { .name = "PTB11", .line = ADC_LINE(3), .res = ADC_RES_16BIT, }, - { .name = "PTC11", .line = ADC_LINE(4), .res = ADC_RES_16BIT, }, - { .name = "PTC10", .line = ADC_LINE(5), .res = ADC_RES_16BIT, }, - { .name = "ADC0_DP0", .line = ADC_LINE(6), .res = ADC_RES_16BIT, }, - { .name = "ADC0_DM0", .line = ADC_LINE(7), .res = ADC_RES_16BIT, }, - { .name = "ADC0_DP0-ADC0_DM0", .line = ADC_LINE(8), .res = ADC_RES_16BIT, }, - { .name = "ADC1_DP0", .line = ADC_LINE(9), .res = ADC_RES_16BIT, }, - { .name = "ADC1_DM0", .line = ADC_LINE(10), .res = ADC_RES_16BIT, }, - { .name = "ADC1_DP0-ADC1_DM0", .line = ADC_LINE(11), .res = ADC_RES_16BIT, }, - { .name = "ADC0_DP1", .line = ADC_LINE(12), .res = ADC_RES_16BIT, }, - { .name = "ADC0_DM1", .line = ADC_LINE(13), .res = ADC_RES_16BIT, }, - { .name = "ADC0_DP1-ADC0_DM1", .line = ADC_LINE(14), .res = ADC_RES_16BIT, }, - { .name = "ADC1_DP1", .line = ADC_LINE(15), .res = ADC_RES_16BIT, }, - { .name = "ADC1_DM1", .line = ADC_LINE(16), .res = ADC_RES_16BIT, }, - { .name = "ADC1_DP1-ADC1_DM1", .line = ADC_LINE(17), .res = ADC_RES_16BIT, }, - { .name = "coretemp", .line = ADC_LINE(18), .res = ADC_RES_16BIT, }, - { .name = "corebandgap", .line = ADC_LINE(19), .res = ADC_RES_16BIT, }, + { .name = "PTB2", .line = ADC_LINE(0, 0), .res = ADC_RES_16BIT, }, + { .name = "PTB3", .line = ADC_LINE(0, 1), .res = ADC_RES_16BIT, }, + { .name = "PTB10", .line = ADC_LINE(0, 2), .res = ADC_RES_16BIT, }, + { .name = "PTB11", .line = ADC_LINE(0, 3), .res = ADC_RES_16BIT, }, + { .name = "PTC11", .line = ADC_LINE(0, 4), .res = ADC_RES_16BIT, }, + { .name = "PTC10", .line = ADC_LINE(0, 5), .res = ADC_RES_16BIT, }, + { .name = "ADC0_DP0", .line = ADC_LINE(0, 6), .res = ADC_RES_16BIT, }, + { .name = "ADC0_DM0", .line = ADC_LINE(0, 7), .res = ADC_RES_16BIT, }, + { .name = "ADC0_DP0-ADC0_DM0", .line = ADC_LINE(0, 8), .res = ADC_RES_16BIT, }, + { .name = "ADC1_DP0", .line = ADC_LINE(0, 9), .res = ADC_RES_16BIT, }, + { .name = "ADC1_DM0", .line = ADC_LINE(0, 10), .res = ADC_RES_16BIT, }, + { .name = "ADC1_DP0-ADC1_DM0", .line = ADC_LINE(0, 11), .res = ADC_RES_16BIT, }, + { .name = "ADC0_DP1", .line = ADC_LINE(0, 12), .res = ADC_RES_16BIT, }, + { .name = "ADC0_DM1", .line = ADC_LINE(0, 13), .res = ADC_RES_16BIT, }, + { .name = "ADC0_DP1-ADC0_DM1", .line = ADC_LINE(0, 14), .res = ADC_RES_16BIT, }, + { .name = "ADC1_DP1", .line = ADC_LINE(0, 15), .res = ADC_RES_16BIT, }, + { .name = "ADC1_DM1", .line = ADC_LINE(0, 16), .res = ADC_RES_16BIT, }, + { .name = "ADC1_DP1-ADC1_DM1", .line = ADC_LINE(0, 17), .res = ADC_RES_16BIT, }, + { .name = "coretemp", .line = ADC_LINE(0, 18), .res = ADC_RES_16BIT, }, + { .name = "corebandgap", .line = ADC_LINE(0, 19), .res = ADC_RES_16BIT, }, }; #ifdef __cplusplus diff --git a/boards/frdm-kw41z/include/adc_params.h b/boards/frdm-kw41z/include/adc_params.h index ffeae672c7ad..1b1b8d08d58a 100644 --- a/boards/frdm-kw41z/include/adc_params.h +++ b/boards/frdm-kw41z/include/adc_params.h @@ -33,37 +33,37 @@ static const saul_adc_params_t saul_adc_params[] = { { .name = "ADC0_DP-DM", - .line = ADC_LINE(0), + .line = ADC_LINE(0, 0), .res = ADC_RES_16BIT, }, { .name = "ADC0_DP", - .line = ADC_LINE(1), + .line = ADC_LINE(0, 1), .res = ADC_RES_16BIT, }, { .name = "PTB2", - .line = ADC_LINE(2), + .line = ADC_LINE(0, 2), .res = ADC_RES_16BIT, }, { .name = "PTB3", - .line = ADC_LINE(3), + .line = ADC_LINE(0, 3), .res = ADC_RES_16BIT, }, { .name = "coretemp", - .line = ADC_LINE(4), + .line = ADC_LINE(0, 4), .res = ADC_RES_16BIT, }, { .name = "corebandgap", - .line = ADC_LINE(5), + .line = ADC_LINE(0, 5), .res = ADC_RES_16BIT, }, { .name = "dcdcvbat", - .line = ADC_LINE(6), + .line = ADC_LINE(0, 6), .res = ADC_RES_16BIT, }, }; diff --git a/boards/mulle/include/adc_params.h b/boards/mulle/include/adc_params.h index 36f6842cca1a..de47d9c03bad 100644 --- a/boards/mulle/include/adc_params.h +++ b/boards/mulle/include/adc_params.h @@ -33,32 +33,32 @@ static const saul_adc_params_t saul_adc_params[] = { { .name = "k60temp", - .line = ADC_LINE(0), + .line = ADC_LINE(0, 0), .res = ADC_RES_16BIT, }, { .name = "k60vrefsh", - .line = ADC_LINE(2), + .line = ADC_LINE(0, 2), .res = ADC_RES_16BIT, }, { .name = "k60vrefsl", - .line = ADC_LINE(3), + .line = ADC_LINE(0, 3), .res = ADC_RES_16BIT, }, { .name = "k60bandgap", - .line = ADC_LINE(1), + .line = ADC_LINE(0, 1), .res = ADC_RES_16BIT, }, { .name = "DAC0feedback", - .line = ADC_LINE(4), + .line = ADC_LINE(0, 4), .res = ADC_RES_16BIT, }, { .name = "VREFfeedback", - .line = ADC_LINE(5), + .line = ADC_LINE(0, 5), .res = ADC_RES_16BIT, }, { @@ -73,47 +73,47 @@ static const saul_adc_params_t saul_adc_params[] = }, { .name = "PGA0_DP", - .line = ADC_LINE(8), + .line = ADC_LINE(0, 8), .res = ADC_RES_16BIT, }, { .name = "PGA0_DM", - .line = ADC_LINE(9), + .line = ADC_LINE(0, 9), .res = ADC_RES_16BIT, }, { .name = "PTA17", - .line = ADC_LINE(10), + .line = ADC_LINE(0, 10), .res = ADC_RES_16BIT, }, { .name = "PTB0", - .line = ADC_LINE(11), + .line = ADC_LINE(0, 11), .res = ADC_RES_16BIT, }, { .name = "PTC0", - .line = ADC_LINE(12), + .line = ADC_LINE(0, 12), .res = ADC_RES_16BIT, }, { .name = "PTC8", - .line = ADC_LINE(13), + .line = ADC_LINE(0, 13), .res = ADC_RES_16BIT, }, { .name = "PTC9", - .line = ADC_LINE(14), + .line = ADC_LINE(0, 14), .res = ADC_RES_16BIT, }, { .name = "PTC10", - .line = ADC_LINE(15), + .line = ADC_LINE(0, 15), .res = ADC_RES_16BIT, }, { .name = "PTC11", - .line = ADC_LINE(16), + .line = ADC_LINE(0, 16), .res = ADC_RES_16BIT, }, }; diff --git a/boards/mulle/include/board.h b/boards/mulle/include/board.h index ba396f9e5bf2..c24a3352f580 100644 --- a/boards/mulle/include/board.h +++ b/boards/mulle/include/board.h @@ -166,8 +166,8 @@ extern mtd_dev_t *mtd0; * @name Mulle Vchr, Vbat ADC lines */ /** @{ */ -#define MULLE_VBAT_ADC_LINE ADC_LINE(6) -#define MULLE_VCHR_ADC_LINE ADC_LINE(7) +#define MULLE_VBAT_ADC_LINE ADC_LINE(0, 6) +#define MULLE_VCHR_ADC_LINE ADC_LINE(0, 7) /** @} */ #endif /* BOARD_H */ /** @} */ diff --git a/boards/remote-pa/include/adc_params.h b/boards/remote-pa/include/adc_params.h index 48def875b1b5..2dd84cb042ce 100644 --- a/boards/remote-pa/include/adc_params.h +++ b/boards/remote-pa/include/adc_params.h @@ -35,12 +35,12 @@ static const saul_adc_params_t saul_adc_params[] = { { .name = "ADC2", - .line = ADC_LINE(0), + .line = ADC_LINE(0, 0), .res = ADC_RES_12BIT, }, { .name = "ADC3", - .line = ADC_LINE(1), + .line = ADC_LINE(0, 1), .res = ADC_RES_12BIT, } }; diff --git a/boards/remote-reva/include/adc_params.h b/boards/remote-reva/include/adc_params.h index 6b27477acc83..b8a0436fa0cf 100644 --- a/boards/remote-reva/include/adc_params.h +++ b/boards/remote-reva/include/adc_params.h @@ -35,17 +35,17 @@ static const saul_adc_params_t saul_adc_params[] = { { .name = "ADC1", - .line = ADC_LINE(0), + .line = ADC_LINE(0, 0), .res = ADC_RES_12BIT, }, { .name = "ADC2", - .line = ADC_LINE(1), + .line = ADC_LINE(0, 1), .res = ADC_RES_12BIT, }, { .name = "ADC3", - .line = ADC_LINE(2), + .line = ADC_LINE(0, 2), .res = ADC_RES_12BIT, } }; diff --git a/boards/remote-revb/include/adc_params.h b/boards/remote-revb/include/adc_params.h index 28a46a3f5bc3..2a422599a961 100644 --- a/boards/remote-revb/include/adc_params.h +++ b/boards/remote-revb/include/adc_params.h @@ -35,17 +35,17 @@ static const saul_adc_params_t saul_adc_params[] = { { .name = "ADC1", - .line = ADC_LINE(0), + .line = ADC_LINE(0, 0), .res = ADC_RES_12BIT, }, { .name = "ADC2", - .line = ADC_LINE(1), + .line = ADC_LINE(0, 1), .res = ADC_RES_12BIT, }, { .name = "ADC3", - .line = ADC_LINE(2), + .line = ADC_LINE(0, 2), .res = ADC_RES_12BIT, } }; diff --git a/boards/stm32f4discovery/include/arduino_pinmap.h b/boards/stm32f4discovery/include/arduino_pinmap.h index 3be8d6bd0eb2..f4fb575b22e2 100644 --- a/boards/stm32f4discovery/include/arduino_pinmap.h +++ b/boards/stm32f4discovery/include/arduino_pinmap.h @@ -47,10 +47,10 @@ extern "C" { * @name Mapping of Arduino analog pins to RIOT ADC lines * @{ */ -#define ARDUINO_A0 ADC_LINE(0) -#define ARDUINO_A1 ADC_LINE(1) -#define ARDUINO_A2 ADC_LINE(2) -#define ARDUINO_A3 ADC_LINE(3) +#define ARDUINO_A0 ADC_LINE(0, 0) +#define ARDUINO_A1 ADC_LINE(0, 1) +#define ARDUINO_A2 ADC_LINE(0, 2) +#define ARDUINO_A3 ADC_LINE(0, 3) /** @} */ #ifdef __cplusplus diff --git a/boards/ublox-c030-u201/include/arduino_pinmap.h b/boards/ublox-c030-u201/include/arduino_pinmap.h index 729454105158..f0063ebe8ba2 100644 --- a/boards/ublox-c030-u201/include/arduino_pinmap.h +++ b/boards/ublox-c030-u201/include/arduino_pinmap.h @@ -64,12 +64,12 @@ extern "C" { * @name Mapping of Arduino analog pins to RIOT ADC lines * @{ */ -#define ARDUINO_A0 ADC_LINE(0) -#define ARDUINO_A1 ADC_LINE(1) -#define ARDUINO_A2 ADC_LINE(2) -#define ARDUINO_A3 ADC_LINE(3) -#define ARDUINO_A4 ADC_LINE(4) -#define ARDUINO_A5 ADC_LINE(5) +#define ARDUINO_A0 ADC_LINE(0, 0) +#define ARDUINO_A1 ADC_LINE(0, 1) +#define ARDUINO_A2 ADC_LINE(0, 2) +#define ARDUINO_A3 ADC_LINE(0, 3) +#define ARDUINO_A4 ADC_LINE(0, 4) +#define ARDUINO_A5 ADC_LINE(0, 5) /** @} */ #ifdef __cplusplus From 095a8ec0206e3ffe817f5fb60ac59a265bbb9857 Mon Sep 17 00:00:00 2001 From: Schorcht Date: Thu, 29 Nov 2018 08:27:20 +0100 Subject: [PATCH 3/7] drivers: adoption for API change of ADC_LINE --- drivers/io1_xplained/include/io1_xplained_internals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/io1_xplained/include/io1_xplained_internals.h b/drivers/io1_xplained/include/io1_xplained_internals.h index 19998da08b42..90a628ac9612 100644 --- a/drivers/io1_xplained/include/io1_xplained_internals.h +++ b/drivers/io1_xplained/include/io1_xplained_internals.h @@ -56,7 +56,7 @@ extern "C" { * @name IO1 Xplained Light sensor ADC configuration * @{ */ -#define IO1_LIGHT_ADC_LINE ADC_LINE(0) +#define IO1_LIGHT_ADC_LINE ADC_LINE(0, 0) #define IO1_LIGHT_ADC_RES ADC_RES_10BIT /** @} */ From 8fd7f0c47dd1744a9e51a469c06016d0bb0fa671 Mon Sep 17 00:00:00 2001 From: Schorcht Date: Thu, 29 Nov 2018 09:30:32 +0100 Subject: [PATCH 4/7] tests: adoption for API change of ADC_LINE --- tests/driver_mq3/Makefile | 2 +- tests/driver_mq3/main.c | 2 +- tests/periph_adc/main.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/driver_mq3/Makefile b/tests/driver_mq3/Makefile index 77f86499b273..57bbe23b9fb7 100644 --- a/tests/driver_mq3/Makefile +++ b/tests/driver_mq3/Makefile @@ -4,7 +4,7 @@ USEMODULE += mq3 USEMODULE += xtimer # set default device parameters in case they are undefined -MQ3_ADC_LINE ?= ADC_LINE\(0\) +MQ3_ADC_LINE ?= ADC_LINE\(0,0\) # export parameters CFLAGS += -DMQ3_ADC_LINE=$(MQ3_ADC_LINE) diff --git a/tests/driver_mq3/main.c b/tests/driver_mq3/main.c index 7bbd71a55f20..082a7fcc3ff1 100644 --- a/tests/driver_mq3/main.c +++ b/tests/driver_mq3/main.c @@ -35,7 +35,7 @@ int main(void) int res; puts("MQ-3 alcohol sensor test application\n"); - printf("Initializing MQ-3 sensor at ADC_LINE(%i)... ", (int)MQ3_ADC_LINE); + printf("Initializing MQ-3 sensor at ADC_LINE(0, %i)... ", (int)MQ3_ADC_LINE); res = mq3_init(&dev, MQ3_ADC_LINE); if (res == 0) { puts("[ok]\n"); diff --git a/tests/periph_adc/main.c b/tests/periph_adc/main.c index e11b7150aab4..4532b32d6e7b 100644 --- a/tests/periph_adc/main.c +++ b/tests/periph_adc/main.c @@ -40,21 +40,21 @@ int main(void) /* initialize all available ADC lines */ for (unsigned i = 0; i < ADC_NUMOF; i++) { - if (adc_init(ADC_LINE(i)) < 0) { - printf("Initialization of ADC_LINE(%u) failed\n", i); + if (adc_init(ADC_LINE(0, i)) < 0) { + printf("Initialization of ADC_LINE(0, %u) failed\n", i); return 1; } else { - printf("Successfully initialized ADC_LINE(%u)\n", i); + printf("Successfully initialized ADC_LINE(0, %u)\n", i); } } while (1) { for (unsigned i = 0; i < ADC_NUMOF; i++) { - sample = adc_sample(ADC_LINE(i), RES); + sample = adc_sample(ADC_LINE(0, i), RES); if (sample < 0) { - printf("ADC_LINE(%u): 10-bit resolution not applicable\n", i); + printf("ADC_LINE(0, %u): 10-bit resolution not applicable\n", i); } else { - printf("ADC_LINE(%u): %i\n", i, sample); + printf("ADC_LINE(0, %u): %i\n", i, sample); } } xtimer_periodic_wakeup(&last, DELAY); From a1ccec3946d41508c643bfc5c8a049a32d336aa6 Mon Sep 17 00:00:00 2001 From: Schorcht Date: Thu, 29 Nov 2018 09:30:54 +0100 Subject: [PATCH 5/7] periph/dac: change of DAC_LINE macro --- drivers/include/periph/dac.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/include/periph/dac.h b/drivers/include/periph/dac.h index 5e9ae1caa156..615783f88300 100644 --- a/drivers/include/periph/dac.h +++ b/drivers/include/periph/dac.h @@ -72,9 +72,12 @@ enum { /** * @brief Default DAC access macro + * + * The macro should be used to obtain the DAC line for device x and channel y, + * where the channels of device 0 are normally the MCU channels. */ #ifndef DAC_LINE -#define DAC_LINE(x) (x) +#define DAC_LINE(x,y) ((dac_t)((x & 0) | y)) #endif /** From dc12e9afbf9d48ce83c2622bae66c01097cdba41 Mon Sep 17 00:00:00 2001 From: Schorcht Date: Thu, 29 Nov 2018 09:31:33 +0100 Subject: [PATCH 6/7] boards/*: adoption for API change of DAC_LINE --- boards/common/arduino-due/include/arduino_pinmap.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boards/common/arduino-due/include/arduino_pinmap.h b/boards/common/arduino-due/include/arduino_pinmap.h index 24cf913b269e..dd6f989ca468 100644 --- a/boards/common/arduino-due/include/arduino_pinmap.h +++ b/boards/common/arduino-due/include/arduino_pinmap.h @@ -136,8 +136,8 @@ extern "C" { * @name Mapping of Arduino DAC pins to RIOT DAC lines * @{ */ -#define ARDUINO_DAC0 DAC_LINE(0) -#define ARDUINO_DAC1 DAC_LINE(1) +#define ARDUINO_DAC0 DAC_LINE(0, 0) +#define ARDUINO_DAC1 DAC_LINE(0, 1) /** @} */ #ifdef __cplusplus From 061c777f2037366e5c96495c61e40d26b189588c Mon Sep 17 00:00:00 2001 From: Schorcht Date: Thu, 29 Nov 2018 09:32:01 +0100 Subject: [PATCH 7/7] tests: adoption for API change of DAC_LINE --- tests/periph_dac/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/periph_dac/main.c b/tests/periph_dac/main.c index a5da2eb7935f..12d0e71b9d15 100644 --- a/tests/periph_dac/main.c +++ b/tests/periph_dac/main.c @@ -40,12 +40,12 @@ int main(void) /* initialize all DAC lines */ for (unsigned i = 0; i < DAC_NUMOF; i++) { - if (dac_init(DAC_LINE(i)) < 0) { - printf("Error initializing DAC_LINE(%u)\n", i); + if (dac_init(DAC_LINE(0, i)) < 0) { + printf("Error initializing DAC_LINE(0, %u)\n", i); return 1; } else { - printf("Successfully initialized DAC_LINE(%u)\n", i); + printf("Successfully initialized DAC_LINE(0, %u)\n", i); } } puts(""); @@ -53,7 +53,7 @@ int main(void) /* create saw tooth signal */ while (1) { for (unsigned i = 0; i < DAC_NUMOF; i++) { - dac_set(DAC_LINE(i), val); + dac_set(DAC_LINE(0, i), val); } val += step; xtimer_periodic_wakeup(&last, DELAY);