Skip to content

Commit d7926d5

Browse files
pieterjanbuntinxpieterjanbuntinx
committed
Added more ADCs, added pin defs for I2C and UART
1 parent 3f64a45 commit d7926d5

File tree

3 files changed

+80
-33
lines changed

3 files changed

+80
-33
lines changed

‎variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/PeripheralPins_ETHERCAT_DUINO.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ WEAK const PinMap PinMap_ADC[] = {
4848
{PA_3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
4949
{PA_3_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
5050
{PA_3_ALT2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_IN3
51-
// {PA_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
52-
// {PA_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
53-
// {PA_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
54-
// {PA_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
51+
{PA_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
52+
{PA_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
53+
{PA_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
54+
{PA_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
5555
{PA_6, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
5656
{PA_6_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
5757
{PA_7, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
@@ -76,8 +76,8 @@ WEAK const PinMap PinMap_ADC[] = {
7676
{PC_4_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
7777
{PC_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
7878
{PC_5_ALT1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
79-
// {PF_3, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_IN9
80-
// {PF_4, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC3_IN14
79+
{PF_3, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_IN9
80+
{PF_4, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC3_IN14
8181
// {PF_5, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC3_IN15
8282
// {PF_6, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC3_IN4
8383
// {PF_7, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC3_IN5
@@ -210,8 +210,8 @@ WEAK const PinMap PinMap_TIM[] = {
210210

211211
#ifdef HAL_UART_MODULE_ENABLED
212212
WEAK const PinMap PinMap_UART_TX[] = {
213-
// {PA_0, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
214-
// {PA_2, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
213+
{PA_0, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
214+
{PA_2, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
215215
{PA_9, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
216216
// {PB_6, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
217217
{PB_10, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},

‎variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/variant_ETHERCAT_DUINO.cpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ const PinName digitalPin[] = {
5959
PG_13, // D41
6060
PG_14, // D42
6161
PF_10, // D43
62-
PF_4, // D44
63-
PF_3, // D45
62+
PF_4, // D44 / A14
63+
PF_3, // D45 / A15
6464
PC_14, // D46
6565
PC_15, // D47
6666
PC_13, // D48
@@ -81,8 +81,8 @@ const PinName digitalPin[] = {
8181
PA_7, // A9
8282
PC_4, // A10
8383
PC_5, // A11
84-
PA_5, // DAC0
85-
PA_4, // DAC1
84+
PA_5, // DAC0 / A12
85+
PA_4, // DAC1 / A13
8686
PD_0, // CANRX
8787
PD_1, // CANTX
8888
PB_3, // LED_1 / LED_BUILTIN
@@ -121,7 +121,11 @@ const uint32_t analogInputPin[] = {
121121
62, // A8, PA6
122122
63, // A9, PA7
123123
64, // A10, PC4
124-
65 // A11, PC5
124+
65, // A11, PC5
125+
66, // A12, PA5
126+
67, // A13, PA4
127+
44, // A14, PF4
128+
45 // A15, PF3
125129
};
126130

127131
#ifdef __cplusplus

‎variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/variant_ETHERCAT_DUINO.h

Lines changed: 63 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
#define PG13 41
6060
#define PG14 42
6161
#define PF10 43
62-
#define PF4 44
63-
#define PF3 45
62+
#define PF4 PIN_A14 // A14
63+
#define PF3 PIN_A15 // A15
6464
#define PC14 46
6565
#define PC15 47
6666
#define PC13 48
@@ -81,8 +81,8 @@
8181
#define PA7 PIN_A9 // A9
8282
#define PC4 PIN_A10 // A10
8383
#define PC5 PIN_A11 // A11
84-
#define PA5 66 // DAC0
85-
#define PA4 67 // DAC1
84+
#define PA5 PIN_A12 // DAC0 / A12
85+
#define PA4 PIN_A13 // DAC1 / A13
8686
#define PD0 68 // CANRX
8787
#define PD1 69 // CANTX
8888
#define PB3 70 // LED_1 / LED_BUILTIN
@@ -107,21 +107,6 @@
107107
#define PB5 89 // ECAT_LED_ERR
108108
#define PB6 90 // ECAT_CS
109109

110-
#define CANRX PD0
111-
#define CANTX PD1
112-
113-
#define ECAT_SYNC0 PF0
114-
#define ECAT_SYNC1 PF1
115-
#define ECAT_IRQ PF2
116-
#define ECAT_RST PF5
117-
#define ECAT_D3 PF6
118-
#define ECAT_D2 PF7
119-
#define ECAT_D0 PF8
120-
#define ECAT_D1 PF9
121-
#define ECAT_SCK PB2
122-
#define ECAT_LED_RUN PB4
123-
#define ECAT_LED_ERR PB5
124-
#define ECAT_CS PB6
125110

126111
// Alternate pins number
127112
#define PA0_ALT1 (PA0 | ALT1)
@@ -162,7 +147,65 @@
162147
#define PC11_ALT1 (PC11 | ALT1)
163148

164149
#define NUM_DIGITAL_PINS 91
165-
#define NUM_ANALOG_INPUTS 12
150+
#define NUM_ANALOG_INPUTS 16
151+
152+
#define CANRX PD0
153+
#define CANTX PD1
154+
155+
// EtherCAT controller pins (not broken out)
156+
#define ECAT_SYNC0 PF0
157+
#define ECAT_SYNC1 PF1
158+
#define ECAT_IRQ PF2
159+
#define ECAT_RST PF5
160+
#define ECAT_D3 PF6
161+
#define ECAT_D2 PF7
162+
#define ECAT_D0 PF8
163+
#define ECAT_D1 PF9
164+
#define ECAT_SCK PB2
165+
#define ECAT_LED_RUN PB4
166+
#define ECAT_LED_ERR PB5
167+
#define ECAT_CS PB6
168+
169+
// Serial pins
170+
#define TX1 PA9
171+
172+
#define TX2 PD5
173+
#define RX2 PD6
174+
#define TX2_ALT PA2
175+
#define RX2_ALT PA3
176+
177+
#define TX3 PB10
178+
#define RX3 PB11
179+
#define TX3_ALT PC10_ALT1
180+
#define RX3_ALT PC11_ALT1
181+
182+
#define TX4 PC10
183+
#define RX4 PC11
184+
#define TX4_ALT PA0
185+
#define RX4_ALT PA1
186+
187+
#define TX6 PC6
188+
#define RX6 PC7
189+
#define TX6_ALT PG14
190+
#define RX6_ALT PG9
191+
192+
#define TX7 PE8
193+
#define RX7 PE7
194+
195+
// I2C pins
196+
#define SDA1 PB9
197+
#define SCL1 PB8
198+
199+
#define SDA2 PB11
200+
#define SCL2 PB10
201+
202+
#define SDA3 PC9
203+
#define SCL3 PA8
204+
205+
#define SDA4 PD13
206+
#define SCL4 PD12
207+
#define SDA4_ALT PF15
208+
#define SCL4_ALT PF14
166209

167210
// On-board LED pin number
168211
#ifndef LED_BUILTIN

0 commit comments

Comments
 (0)