Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

periph: API change of macros ADC_LINE and DAC_LINE #10504

Closed
wants to merge 7 commits into from
Closed

periph: API change of macros ADC_LINE and DAC_LINE #10504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
16b8caa
periph/adc: change of ADC_LINE macro
gschorcht Nov 29, 2018
df539e7
boards/*: adoption for API change of ADC_LINE
gschorcht Nov 29, 2018
095a8ec
drivers: adoption for API change of ADC_LINE
gschorcht Nov 29, 2018
8fd7f0c
tests: adoption for API change of ADC_LINE
gschorcht Nov 29, 2018
a1ccec3
periph/dac: change of DAC_LINE macro
gschorcht Nov 29, 2018
dc12e9a
boards/*: adoption for API change of DAC_LINE
gschorcht Nov 29, 2018
061c777
tests: adoption for API change of DAC_LINE
gschorcht Nov 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions boards/arduino-zero/include/arduino_pinmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 16 additions & 16 deletions boards/common/arduino-atmega/include/arduino_pinmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
/** @} */

Expand Down
28 changes: 14 additions & 14 deletions boards/common/arduino-due/include/arduino_pinmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,26 +118,26 @@ 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)
/** @} */

/**
* @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
Expand Down
14 changes: 7 additions & 7 deletions boards/common/arduino-mkr/include/arduino_pinmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions boards/common/nucleo144/include/arduino_pinmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions boards/common/nucleo32/include/arduino_pinmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions boards/common/nucleo64/include/arduino_pinmap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions boards/firefly/include/adc_params.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
};
Expand Down
16 changes: 8 additions & 8 deletions boards/frdm-k22f/include/adc_params.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
};
Expand Down
40 changes: 20 additions & 20 deletions boards/frdm-k64f/include/adc_params.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions boards/frdm-kw41z/include/adc_params.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
};
Expand Down
Loading