Skip to content

Commit a33620a

Browse files
GrumpyOldPizzaGrumpyOldPizza
committed
Map PA0/PA1/PA2/PA3 as A6/A7/A8/A9 for Dragonfly
1 parent 40f3876 commit a33620a

File tree

4 files changed

+120
-104
lines changed

4 files changed

+120
-104
lines changed

‎variants/STM32L476RE-Dragonfly/variant.cpp‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -40,83 +40,83 @@
4040
extern const PinDescription g_APinDescription[NUM_TOTAL_PINS] =
4141
{
4242
// 0..13 - Digital pins
43-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC5), GPIO_PIN_PC5, (PIN_ATTR_EXTI | PIN_ATTR_WKUP5), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
44-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC4), GPIO_PIN_PC4, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
45-
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB12), GPIO_PIN_PB12, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
46-
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB13), GPIO_PIN_PB13_TIM1_CH1N, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM1, PWM_CHANNEL_1, ADC_INPUT_NONE },
47-
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB14), GPIO_PIN_PB14_TIM1_CH2N, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM1, PWM_CHANNEL_2, ADC_INPUT_NONE },
48-
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB15), GPIO_PIN_PB15_TIM1_CH3N, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM1, PWM_CHANNEL_3, ADC_INPUT_NONE },
43+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC5), GPIO_PIN_PC5, (PIN_ATTR_EXTI | PIN_ATTR_WKUP5), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
44+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC4), GPIO_PIN_PC4, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
45+
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB12), GPIO_PIN_PB12, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
46+
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB13), GPIO_PIN_PB13_TIM1_CH1N, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM1, PWM_CHANNEL_1, ADC_INPUT_NONE },
47+
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB14), GPIO_PIN_PB14_TIM1_CH2N, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM1, PWM_CHANNEL_2, ADC_INPUT_NONE },
48+
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB15), GPIO_PIN_PB15_TIM1_CH3N, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM1, PWM_CHANNEL_3, ADC_INPUT_NONE },
4949
#if (DOSFS_SDCARD >= 2)
50-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PC9), GPIO_PIN_PC9, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
51-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PC8), GPIO_PIN_PC8, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
50+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PC9), GPIO_PIN_PC9, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
51+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PC8), GPIO_PIN_PC8, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
5252
#else /* DOSFS_SDCARD >= 2 */
53-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC9), GPIO_PIN_PC9_TIM3_CH4, (PIN_ATTR_PWM), PWM_INSTANCE_TIM3, PWM_CHANNEL_4, ADC_INPUT_NONE },
54-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC8), GPIO_PIN_PC8_TIM3_CH3, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM3, PWM_CHANNEL_3, ADC_INPUT_NONE },
53+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC9), GPIO_PIN_PC9_TIM3_CH4, (PIN_ATTR_PWM), PWM_INSTANCE_TIM3, PWM_CHANNEL_4, ADC_INPUT_NONE },
54+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC8), GPIO_PIN_PC8_TIM3_CH3, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM3, PWM_CHANNEL_3, ADC_INPUT_NONE },
5555
#endif /* DOSFS_SDCARD >= 2 */
56-
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA3), GPIO_PIN_PA3_TIM5_CH4, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM5, PWM_CHANNEL_4, ADC_INPUT_NONE },
57-
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA2), GPIO_PIN_PA2_TIM5_CH3, (PIN_ATTR_PWM | PIN_ATTR_EXTI | PIN_ATTR_WKUP4), PWM_INSTANCE_TIM5, PWM_CHANNEL_3, ADC_INPUT_NONE },
56+
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA3), GPIO_PIN_PA3_TIM5_CH4, (PIN_ATTR_ADC | PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM5, PWM_CHANNEL_4, ADC_INPUT_8 },
57+
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA2), GPIO_PIN_PA2_TIM5_CH3, (PIN_ATTR_ADC | PIN_ATTR_PWM | PIN_ATTR_EXTI | PIN_ATTR_WKUP4), PWM_INSTANCE_TIM5, PWM_CHANNEL_3, ADC_INPUT_7 },
5858
#if (DOSFS_SDCARD >= 1)
59-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PD2), GPIO_PIN_PD2, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
60-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PC12), GPIO_PIN_PC12, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
61-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PC11), GPIO_PIN_PC11, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
62-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PC10), GPIO_PIN_PC10, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
59+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PD2), GPIO_PIN_PD2, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
60+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PC12), GPIO_PIN_PC12, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
61+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PC11), GPIO_PIN_PC11, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
62+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PC10), GPIO_PIN_PC10, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
6363
#else /* DOSFS_SDCARD >= 1 */
64-
{ GPIOD, GPIO_PIN_MASK(GPIO_PIN_PD2), GPIO_PIN_PD2, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
65-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC12), GPIO_PIN_PC12, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
66-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC11), GPIO_PIN_PC11, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
67-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC10), GPIO_PIN_PC10, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
64+
{ GPIOD, GPIO_PIN_MASK(GPIO_PIN_PD2), GPIO_PIN_PD2, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
65+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC12), GPIO_PIN_PC12, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
66+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC11), GPIO_PIN_PC11, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
67+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC10), GPIO_PIN_PC10, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
6868
#endif /* DOSFS_SDCARD >= 1 */
6969

7070
// 14..19 - Analog pins
71-
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA4), GPIO_PIN_PA4, (PIN_ATTR_ADC | PIN_ATTR_DAC | PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_9 },
72-
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA5), GPIO_PIN_PA5, (PIN_ATTR_ADC | PIN_ATTR_DAC | PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_10 },
73-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC3), GPIO_PIN_PC3, (PIN_ATTR_ADC | PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_4 },
74-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC2), GPIO_PIN_PC2, (PIN_ATTR_ADC | PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_3 },
75-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC1), GPIO_PIN_PC1, (PIN_ATTR_ADC | PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_2 },
76-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC0), GPIO_PIN_PC0, (PIN_ATTR_ADC | PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_1 },
71+
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA4), GPIO_PIN_PA4, (PIN_ATTR_ADC | PIN_ATTR_DAC | PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_9 },
72+
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA5), GPIO_PIN_PA5, (PIN_ATTR_ADC | PIN_ATTR_DAC | PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_10 },
73+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC3), GPIO_PIN_PC3, (PIN_ATTR_ADC | PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_4 },
74+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC2), GPIO_PIN_PC2, (PIN_ATTR_ADC | PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_3 },
75+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC1), GPIO_PIN_PC1, (PIN_ATTR_ADC | PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_2 },
76+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC0), GPIO_PIN_PC0, (PIN_ATTR_ADC | PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_1 },
7777

7878
// 20..21 - I2C pins (SDA,SCL)
79-
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB9), GPIO_PIN_PB9_TIM4_CH4, (PIN_ATTR_PWM), PWM_INSTANCE_TIM4, PWM_CHANNEL_4, ADC_INPUT_NONE },
80-
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB8), GPIO_PIN_PB8_TIM4_CH3, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM4, PWM_CHANNEL_3, ADC_INPUT_NONE },
79+
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB9), GPIO_PIN_PB9_TIM4_CH4, (PIN_ATTR_PWM), PWM_INSTANCE_TIM4, PWM_CHANNEL_4, ADC_INPUT_NONE },
80+
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB8), GPIO_PIN_PB8_TIM4_CH3, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM4, PWM_CHANNEL_3, ADC_INPUT_NONE },
8181

8282
// 22..24 - SPI/ICSP pins (MISO,MOSI,SCK)
83-
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB4), GPIO_PIN_PB4, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
84-
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB5), GPIO_PIN_PB5, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
85-
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB3), GPIO_PIN_PB3, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
83+
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB4), GPIO_PIN_PB4, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
84+
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB5), GPIO_PIN_PB5, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
85+
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB3), GPIO_PIN_PB3, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
8686

8787
// 25..26 - RX/TX LEDS (output only)
88-
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB2), GPIO_PIN_PB2, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
89-
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA10), GPIO_PIN_PA10, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
88+
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB2), GPIO_PIN_PB2, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
89+
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA10), GPIO_PIN_PA10, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
9090

9191
// 27..29 - USB (VBUS,DM,DP)
92-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PA9), GPIO_PIN_PA9, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
93-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PA11), GPIO_PIN_PA11, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
94-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PA12), GPIO_PIN_PA12, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
92+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PA9), GPIO_PIN_PA9, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
93+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PA11), GPIO_PIN_PA11, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
94+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PA12), GPIO_PIN_PA12, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
9595

9696
// 30..31 - UART pins (TX,RX)
97-
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA0), GPIO_PIN_PA0_TIM5_CH1, (PIN_ATTR_PWM | PIN_ATTR_EXTI | PIN_ATTR_WKUP1), PWM_INSTANCE_TIM5, PWM_CHANNEL_1, ADC_INPUT_NONE },
98-
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA1), GPIO_PIN_PA1_TIM5_CH2, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM5, PWM_CHANNEL_2, ADC_INPUT_NONE },
97+
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA0), GPIO_PIN_PA0_TIM5_CH1, (PIN_ATTR_ADC | PIN_ATTR_PWM | PIN_ATTR_EXTI | PIN_ATTR_WKUP1), PWM_INSTANCE_TIM5, PWM_CHANNEL_1, ADC_INPUT_5 },
98+
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA1), GPIO_PIN_PA1_TIM5_CH2, (PIN_ATTR_ADC | PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM5, PWM_CHANNEL_2, ADC_INPUT_6 },
9999

100100
// 32..37 QSPI pins (NCS,CK,IO0,IO1,IO2,IO3)
101-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PB11), GPIO_PIN_PB11, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
102-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PB10), GPIO_PIN_PB10, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
103-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PB1), GPIO_PIN_PB1, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
104-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PB0), GPIO_PIN_PB0, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
105-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PA7), GPIO_PIN_PA7, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
106-
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PA6), GPIO_PIN_PA6, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
101+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PB11), GPIO_PIN_PB11, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
102+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PB10), GPIO_PIN_PB10, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
103+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PB1), GPIO_PIN_PB1, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
104+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PB0), GPIO_PIN_PB0, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
105+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PA7), GPIO_PIN_PA7, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
106+
{ NULL, GPIO_PIN_MASK(GPIO_PIN_PA6), GPIO_PIN_PA6, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
107107

108108
// 38..40 - Digital pins (ATN,39,40)
109-
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA8), GPIO_PIN_PA8, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
110-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC7), GPIO_PIN_PC7_TIM3_CH2, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM3, PWM_CHANNEL_2, ADC_INPUT_NONE },
111-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC6), GPIO_PIN_PC6_TIM3_CH1, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM3, PWM_CHANNEL_1, ADC_INPUT_NONE },
109+
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA8), GPIO_PIN_PA8, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
110+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC7), GPIO_PIN_PC7_TIM3_CH2, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM3, PWM_CHANNEL_2, ADC_INPUT_NONE },
111+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC6), GPIO_PIN_PC6_TIM3_CH1, (PIN_ATTR_PWM | PIN_ATTR_EXTI), PWM_INSTANCE_TIM3, PWM_CHANNEL_1, ADC_INPUT_NONE },
112112

113113
// 41..43 - PAD pins (INT,SDA,SCL)
114-
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA15), GPIO_PIN_PA15, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
115-
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB7), GPIO_PIN_PB7, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
116-
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB6), GPIO_PIN_PB6, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
114+
{ GPIOA, GPIO_PIN_MASK(GPIO_PIN_PA15), GPIO_PIN_PA15, (PIN_ATTR_EXTI), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
115+
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB7), GPIO_PIN_PB7, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
116+
{ GPIOB, GPIO_PIN_MASK(GPIO_PIN_PB6), GPIO_PIN_PB6, 0, PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
117117

118118
// 44 - Button
119-
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC13), GPIO_PIN_PC13, (PIN_ATTR_EXTI | PIN_ATTR_WKUP2), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
119+
{ GPIOC, GPIO_PIN_MASK(GPIO_PIN_PC13), GPIO_PIN_PC13, (PIN_ATTR_EXTI | PIN_ATTR_WKUP2), PWM_INSTANCE_NONE, PWM_CHANNEL_NONE, ADC_INPUT_NONE },
120120
};
121121

122122
extern const unsigned int g_PWMInstances[PWM_INSTANCE_COUNT] = {

‎variants/STM32L476RE-Dragonfly/variant.h‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ extern "C"
6868
#define PINS_COUNT (26u)
6969
#define NUM_DIGITAL_PINS (20u)
7070
#define NUM_TOTAL_PINS (45u)
71-
#define NUM_ANALOG_INPUTS (6u)
71+
#define NUM_ANALOG_INPUTS (10u)
7272
#define NUM_ANALOG_OUTPUTS (2u)
7373
#define analogInputToDigitalPin(p) ((p < 6u) ? (p) + 14u : -1)
7474

@@ -90,6 +90,10 @@ extern "C"
9090
#define PIN_A3 (17ul)
9191
#define PIN_A4 (18ul)
9292
#define PIN_A5 (19ul)
93+
#define PIN_A6 (8ul)
94+
#define PIN_A7 (9ul)
95+
#define PIN_A8 (30ul)
96+
#define PIN_A9 (31ul)
9397
#define PIN_DAC0 (14ul)
9498
#define PIN_DAC1 (15ul)
9599

@@ -99,6 +103,10 @@ static const uint8_t A2 = PIN_A2;
99103
static const uint8_t A3 = PIN_A3;
100104
static const uint8_t A4 = PIN_A4;
101105
static const uint8_t A5 = PIN_A5;
106+
static const uint8_t A6 = PIN_A6;
107+
static const uint8_t A7 = PIN_A7;
108+
static const uint8_t A8 = PIN_A8;
109+
static const uint8_t A9 = PIN_A9;
102110
static const uint8_t DAC0 = PIN_DAC0;
103111
static const uint8_t DAC1 = PIN_DAC1;
104112
#define ADC_RESOLUTION 12

0 commit comments

Comments
 (0)