Skip to content

Commit 2e7ab51

Browse files
author
Owen L - SFE
committed
define AX macros as names of constant global pin numbers
now 'AX' macros can be expanded in 'arm_math.h' and other included files with relatively low consequence (if the corresponding 'ap3_analog_AX' sybol is used in included files it could be a problem - but hte odds are lowered by using a long descriptive name)
1 parent c384ca9 commit 2e7ab51

File tree

8 files changed

+127
-36
lines changed

8 files changed

+127
-36
lines changed

‎variants/artemis_thing_plus/config/variant.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,13 @@ const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = {
6060
//Serial(instance, RX, TX)
6161
Uart Serial(0, 26, 25); // Declares a Uart object called Serial using instance 0 of Apollo3 UART peripherals with RX on variant pin 26 and TX on pin 25 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad)
6262
Uart Serial1(1, 0, 1); // Declares a Uart object called Serial1 using instance 1 of Apollo3 UART peripherals with RX on pin 0 and TX on pin 1 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad)
63+
64+
// Analog pin numbers
65+
const ap3_gpio_pin_t ap3_analog_A0 = 19;
66+
const ap3_gpio_pin_t ap3_analog_A1 = 20;
67+
const ap3_gpio_pin_t ap3_analog_A2 = 21;
68+
const ap3_gpio_pin_t ap3_analog_A3 = 22;
69+
const ap3_gpio_pin_t ap3_analog_A4 = 23;
70+
const ap3_gpio_pin_t ap3_analog_A5 = 24;
71+
const ap3_gpio_pin_t ap3_analog_A6 = 3;
72+
const ap3_gpio_pin_t ap3_analog_A7 = 9;

‎variants/artemis_thing_plus/config/variant.h‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,25 @@ extern Uart Serial1;
4848
#define AP3_SPI_DUP ap3_spi_full_duplex // Specify that SPI is full-duplex (as opposed to ap3_spi_tx_only or ap3_spi_rx_only)
4949

5050
// Mapping of analog pins to digital pins of variant
51-
#define A0 19
52-
#define A1 20
53-
#define A2 21
54-
#define A3 22
55-
#define A4 23
56-
#define A5 24
57-
#define A6 3
58-
#define A7 9
51+
// (this method - aliasing the name of a constant variable - is compatible with the usage of 'AX' names in 'arm_math.h')
52+
#define A0 ap3_analog_A0
53+
#define A1 ap3_analog_A1
54+
#define A2 ap3_analog_A2
55+
#define A3 ap3_analog_A3
56+
#define A4 ap3_analog_A4
57+
#define A5 ap3_analog_A5
58+
#define A6 ap3_analog_A6
59+
#define A7 ap3_analog_A7
60+
61+
// Promise the existence of analog pin names
62+
extern const ap3_gpio_pin_t ap3_analog_A0;
63+
extern const ap3_gpio_pin_t ap3_analog_A1;
64+
extern const ap3_gpio_pin_t ap3_analog_A2;
65+
extern const ap3_gpio_pin_t ap3_analog_A3;
66+
extern const ap3_gpio_pin_t ap3_analog_A4;
67+
extern const ap3_gpio_pin_t ap3_analog_A5;
68+
extern const ap3_gpio_pin_t ap3_analog_A6;
69+
extern const ap3_gpio_pin_t ap3_analog_A7;
5970

6071
#define LED_BUILTIN 18
6172

‎variants/redboard_artemis/config/variant.cpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,16 @@ const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = {
6363
//Serial(instance, RX, TX)
6464
Uart Serial(0, 23, 22); // Declares a Uart object called Serial using instance 0 of Apollo3 UART peripherals with RX on variant pin 23 and TX on pin 24 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad)
6565
Uart Serial1(1, 0, 1); // Declares a Uart object called Serial1 using instance 1 of Apollo3 UART peripherals with RX on pin 0 and TX on pin 1 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad)
66+
67+
// Analog pin numbers
68+
const ap3_gpio_pin_t ap3_analog_A0 = 16;
69+
const ap3_gpio_pin_t ap3_analog_A1 = 17;
70+
const ap3_gpio_pin_t ap3_analog_A2 = 18;
71+
const ap3_gpio_pin_t ap3_analog_A3 = 19;
72+
const ap3_gpio_pin_t ap3_analog_A4 = 20;
73+
const ap3_gpio_pin_t ap3_analog_A5 = 21;
74+
const ap3_gpio_pin_t ap3_analog_A6 = 2;
75+
//No A7 for better alignment
76+
const ap3_gpio_pin_t ap3_analog_A8 = 8;
77+
const ap3_gpio_pin_t ap3_analog_A9 = 9;
78+
const ap3_gpio_pin_t ap3_analog_A10 = 10;

‎variants/redboard_artemis/config/variant.h‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,31 @@ extern Uart Serial1;
6060
#define AP3_SPI3_DUP ap3_spi_full_duplex
6161

6262
// Mapping of analog pins to digital pins of variant
63-
#define A0 16
64-
#define A1 17
65-
#define A2 18
66-
#define A3 19
67-
#define A4 20
68-
#define A5 21
63+
// (this method - aliasing the name of a constant variable - is compatible with the usage of 'AX' names in 'arm_math.h')
64+
#define A0 ap3_analog_A0
65+
#define A1 ap3_analog_A1
66+
#define A2 ap3_analog_A2
67+
#define A3 ap3_analog_A3
68+
#define A4 ap3_analog_A4
69+
#define A5 ap3_analog_A5
6970
//No A7 for better alignment
70-
#define A6 2
71-
#define A8 8
72-
#define A9 9
73-
#define A10 10
71+
#define A6 ap3_analog_A6
72+
#define A8 ap3_analog_A8
73+
#define A9 ap3_analog_A9
74+
#define A10 ap3_analog_A10
75+
76+
// Promise the existence of analog pin names
77+
extern const ap3_gpio_pin_t ap3_analog_A0;
78+
extern const ap3_gpio_pin_t ap3_analog_A1;
79+
extern const ap3_gpio_pin_t ap3_analog_A2;
80+
extern const ap3_gpio_pin_t ap3_analog_A3;
81+
extern const ap3_gpio_pin_t ap3_analog_A4;
82+
extern const ap3_gpio_pin_t ap3_analog_A5;
83+
extern const ap3_gpio_pin_t ap3_analog_A6;
84+
//No A7 for better alignment
85+
extern const ap3_gpio_pin_t ap3_analog_A8;
86+
extern const ap3_gpio_pin_t ap3_analog_A9;
87+
extern const ap3_gpio_pin_t ap3_analog_A10;
7488

7589
#define LED_BUILTIN 13
7690

‎variants/redboard_artemis_atp/config/variant.cpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,14 @@ const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = {
8080
//Serial(instance, RX, TX)
8181
Uart Serial(0, 49, 48); // Declares a Uart object called Serial using instance 0 of Apollo3 UART peripherals with RX on variant pin 49 and TX on pin 48 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad)
8282
Uart Serial1(1, 25, 24); // Declares a Uart object called Serial1 using instance 1 of Apollo3 UART peripherals with RX on pin 25 and TX on pin 24 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad)
83+
84+
// Mapping of analog pins to digital pins of variant
85+
extern const ap3_gpio_pin_t ap3_analog_A29 = 29;
86+
extern const ap3_gpio_pin_t ap3_analog_A11 = 11;
87+
extern const ap3_gpio_pin_t ap3_analog_A34 = 34;
88+
extern const ap3_gpio_pin_t ap3_analog_A16 = 16;
89+
extern const ap3_gpio_pin_t ap3_analog_A31 = 31;
90+
extern const ap3_gpio_pin_t ap3_analog_A13 = 13;
91+
extern const ap3_gpio_pin_t ap3_analog_A12 = 12;
92+
extern const ap3_gpio_pin_t ap3_analog_A33 = 33;
93+
extern const ap3_gpio_pin_t ap3_analog_A35 = 35;

‎variants/redboard_artemis_atp/config/variant.h‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,27 @@ extern Uart Serial1;
4747
#define AP3_SPI_DUP ap3_spi_full_duplex // Specify that SPI is full-duplex (as opposed to ap3_spi_tx_only or ap3_spi_rx_only)
4848

4949
// Mapping of analog pins to digital pins of variant
50-
#define A29 29
51-
#define A11 11
52-
#define A34 34
53-
#define A33 33
54-
#define A16 16
55-
#define A31 31
56-
#define A13 13
57-
#define A12 12
58-
#define A33 33
59-
#define A35 35
50+
// (this method - aliasing the name of a constant variable - is compatible with the usage of 'AX' names in 'arm_math.h')
51+
#define A29 ap3_analog_A29
52+
#define A11 ap3_analog_A11
53+
#define A34 ap3_analog_A34
54+
#define A16 ap3_analog_A16
55+
#define A31 ap3_analog_A31
56+
#define A13 ap3_analog_A13
57+
#define A12 ap3_analog_A12
58+
#define A33 ap3_analog_A33
59+
#define A35 ap3_analog_A35
60+
61+
// Promise the existence of analog pin names
62+
extern const ap3_gpio_pin_t ap3_analog_A29;
63+
extern const ap3_gpio_pin_t ap3_analog_A11;
64+
extern const ap3_gpio_pin_t ap3_analog_A34;
65+
extern const ap3_gpio_pin_t ap3_analog_A16;
66+
extern const ap3_gpio_pin_t ap3_analog_A31;
67+
extern const ap3_gpio_pin_t ap3_analog_A13;
68+
extern const ap3_gpio_pin_t ap3_analog_A12;
69+
extern const ap3_gpio_pin_t ap3_analog_A33;
70+
extern const ap3_gpio_pin_t ap3_analog_A35;
6071

6172
#define LED_BUILTIN 5
6273

‎variants/redboard_artemis_nano/config/variant.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,13 @@ const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = {
5555
//Serial(instance, RX, TX)
5656
Uart Serial(0, 21, 20); // Declares a Uart object called Serial using instance 0 of Apollo3 UART peripherals with RX on variant pin 49 and TX on pin 48 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad)
5757
Uart Serial1(1, 10, 9); // Declares a Uart object called Serial1 using instance 1 of Apollo3 UART peripherals with RX on pin 10 and TX on pin 9 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad)
58+
59+
// Analog pin numbers
60+
const ap3_gpio_pin_t ap3_analog_A0 = 0;
61+
const ap3_gpio_pin_t ap3_analog_A1 = 1;
62+
const ap3_gpio_pin_t ap3_analog_A2 = 2;
63+
const ap3_gpio_pin_t ap3_analog_A3 = 3;
64+
const ap3_gpio_pin_t ap3_analog_A5 = 5;
65+
const ap3_gpio_pin_t ap3_analog_A14 = 14;
66+
const ap3_gpio_pin_t ap3_analog_A15 = 15;
67+
const ap3_gpio_pin_t ap3_analog_A16 = 16;

‎variants/redboard_artemis_nano/config/variant.h‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,25 @@ extern Uart Serial1;
4747
#define AP3_SPI_DUP ap3_spi_full_duplex // Specify that SPI is full-duplex (as opposed to ap3_spi_tx_only or ap3_spi_rx_only)
4848

4949
// Mapping of analog pins to digital pins of variant
50-
#define A0 0
51-
#define A1 1
52-
#define A2 2
53-
#define A3 3
54-
#define A5 5
55-
#define A14 14
56-
#define A15 15
57-
#define A16 16
50+
// (this method - aliasing the name of a constant variable - is compatible with the usage of 'AX' names in 'arm_math.h')
51+
#define A0 ap3_analog_A0
52+
#define A1 ap3_analog_A1
53+
#define A2 ap3_analog_A2
54+
#define A3 ap3_analog_A3
55+
#define A5 ap3_analog_A5
56+
#define A14 ap3_analog_A14
57+
#define A15 ap3_analog_A15
58+
#define A16 ap3_analog_A16
59+
60+
// Promise the existence of analog pin names
61+
extern const ap3_gpio_pin_t ap3_analog_A0;
62+
extern const ap3_gpio_pin_t ap3_analog_A1;
63+
extern const ap3_gpio_pin_t ap3_analog_A2;
64+
extern const ap3_gpio_pin_t ap3_analog_A3;
65+
extern const ap3_gpio_pin_t ap3_analog_A5;
66+
extern const ap3_gpio_pin_t ap3_analog_A14;
67+
extern const ap3_gpio_pin_t ap3_analog_A15;
68+
extern const ap3_gpio_pin_t ap3_analog_A16;
5869

5970
#define LED_BUILTIN 19
6071

0 commit comments

Comments
 (0)