From f71a287a68f33ce086c8cd0db6bfd85a3f53d632 Mon Sep 17 00:00:00 2001 From: liyangyang <941843540@qq.com> Date: Tue, 20 Sep 2022 16:51:40 +0800 Subject: [PATCH] =?UTF-8?q?[RTduino]=E6=9B=B4=E6=96=B0stm32f469=E7=9A=84?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arduino_pinout/pins_arduino.h | 2 +- .../arduino_pinout/pins_arduino.c | 65 ++++++++--------- .../arduino_pinout/pins_arduino.h | 70 ++++++++++--------- 3 files changed, 70 insertions(+), 67 deletions(-) diff --git a/bsp/stm32/stm32f401-st-nucleo/applications/arduino_pinout/pins_arduino.h b/bsp/stm32/stm32f401-st-nucleo/applications/arduino_pinout/pins_arduino.h index 3d4cff8712..1ac4c95788 100644 --- a/bsp/stm32/stm32f401-st-nucleo/applications/arduino_pinout/pins_arduino.h +++ b/bsp/stm32/stm32f401-st-nucleo/applications/arduino_pinout/pins_arduino.h @@ -40,7 +40,7 @@ #define F_CPU 84000000L /* CPU:84MHz */ -#define LED_BUITIN D13 /* Default Built-in LED */ +#define LED_BUILTIN D13 /* Default Built-in LED */ /* i2c1 - PB9-SDA PB8-SCL */ #define RTDUINO_DEFAULT_IIC_BUS_NAME "i2c1" diff --git a/bsp/stm32/stm32f469-st-disco/applications/arduino_pinout/pins_arduino.c b/bsp/stm32/stm32f469-st-disco/applications/arduino_pinout/pins_arduino.c index 70ab3d03fe..58e545677c 100644 --- a/bsp/stm32/stm32f469-st-disco/applications/arduino_pinout/pins_arduino.c +++ b/bsp/stm32/stm32f469-st-disco/applications/arduino_pinout/pins_arduino.c @@ -1,52 +1,53 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes - * 2022-07-04 solar first version + * 2022-09-20 liYony first version */ + #include #include #include "pins_arduino.h" /* - {Arduino Pin, RT-Thread Pin [, Device Name(PWM or ADC), Channel]} - [] means optional - Digital pins must NOT give the device name and channel. - Analog pins MUST give the device name and channel(ADC, PWM or DAC). - Arduino Pin must keep in sequence. -*/ + * {Arduino Pin, RT-Thread Pin [, Device Name, Channel]} + * [] means optional + * Digital pins must NOT give the device name and channel. + * Analog pins MUST give the device name and channel(ADC, PWM or DAC). + * Arduino Pin must keep in sequence. + */ const pin_map_t pin_map_table[]= { - {D0}, /* RX */ - {D1}, /* TX */ + {D0, GET_PIN(G,9), "uart6"}, /* Serial-Rx */ + {D1, GET_PIN(G,14), "uart6"}, /* Serial-Tx */ {D2, GET_PIN(G,13)}, - {D3, GET_PIN(A,1), "pwm2", 2}, /* PWM */ + {D3, GET_PIN(A,1), "pwm2", 2}, /* PWM */ {D4, GET_PIN(G,12)}, - {D5, GET_PIN(A,2), "pwm2", 3}, /* PWM */ - {D6, GET_PIN(A,6), "pwm3", 1}, /* PWM */ + {D5, GET_PIN(A,2), "pwm2", 3}, /* PWM */ + {D6, GET_PIN(A,6), "pwm3", 1}, /* PWM */ {D7, GET_PIN(G,11)}, {D8, GET_PIN(G,10)}, - {D9, GET_PIN(A,7), "pwm3", 2}, /* PWM */ - {D10, GET_PIN(H,6),"pwm12", 1}, /* PWM */ - {D11, GET_PIN(B,15),"pwm12", 2}, /* PWM */ + {D9, GET_PIN(A,7), "pwm3", 2}, /* PWM */ + {D10, GET_PIN(H,6), "pwm12", 1}, /* PWM */ + {D11, GET_PIN(B,15), "pwm12", 2}, /* PWM */ {D12, GET_PIN(B,14)}, - {D13, GET_PIN(D,3)}, /* LED_BUILTIN */ - {D14}, /* I2C1-SDA */ - {D15}, /* I2C1-SCL */ - {D16, GET_PIN(A,0)}, /* user button */ - {D17, GET_PIN(G,6)}, /* user LED */ - {D18, GET_PIN(D,4)}, /* user LED */ - {D19, GET_PIN(D,5)}, /* user LED */ - {D20, GET_PIN(K,3)}, /* user LED */ - {A0, GET_PIN(B,1), "adc1", 9}, /* ADC */ - {A1, GET_PIN(C,2), "adc1", 12}, /* ADC */ - {A2, GET_PIN(C,3), "adc1", 13}, /* ADC */ - {A3, GET_PIN(C,4), "adc1", 14}, /* ADC */ - {A4, GET_PIN(C,5), "adc1", 15}, /* ADC */ - {A5, GET_PIN(A,4), "adc1", 4}, /* ADC */ - {A6, RT_NULL, "adc1", 17}, /* ADC, On-Chip: internal reference voltage, ADC_CHANNEL_VREFINT */ - {A7, RT_NULL, "adc1", 16} /* ADC, On-Chip: internal temperature sensor, ADC_CHANNEL_TEMPSENSOR */ + {D13, GET_PIN(D,3)}, /* LED_BUILTIN */ + {D14, GET_PIN(B,9), "i2c1"}, /* I2C-SDA (Wire) */ + {D15, GET_PIN(B,8), "i2c1"}, /* I2C-SCL (Wire) */ + {D16, GET_PIN(A,0)}, /* user button */ + {D17, GET_PIN(G,6)}, /* user LED */ + {D18, GET_PIN(D,4)}, /* user LED */ + {D19, GET_PIN(D,5)}, /* user LED */ + {D20, GET_PIN(K,3)}, /* user LED */ + {A0, GET_PIN(B,1), "adc1", 9}, /* ADC */ + {A1, GET_PIN(C,2), "adc1", 12}, /* ADC */ + {A2, GET_PIN(C,3), "adc1", 13}, /* ADC */ + {A3, GET_PIN(C,4), "adc1", 14}, /* ADC */ + {A4, GET_PIN(C,5), "adc1", 15}, /* ADC */ + {A5, GET_PIN(A,4), "adc1", 4}, /* ADC */ + {A6, RT_NULL, "adc1", 17}, /* ADC, On-Chip: internal reference voltage, ADC_CHANNEL_VREFINT */ + {A7, RT_NULL, "adc1", 16}, /* ADC, On-Chip: internal temperature sensor, ADC_CHANNEL_TEMPSENSOR */ }; diff --git a/bsp/stm32/stm32f469-st-disco/applications/arduino_pinout/pins_arduino.h b/bsp/stm32/stm32f469-st-disco/applications/arduino_pinout/pins_arduino.h index 6539ca0422..07718be63c 100644 --- a/bsp/stm32/stm32f469-st-disco/applications/arduino_pinout/pins_arduino.h +++ b/bsp/stm32/stm32f469-st-disco/applications/arduino_pinout/pins_arduino.h @@ -1,50 +1,52 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * * Change Logs: * Date Author Notes - * 2022-07-04 solar first version + * 2022-09-20 liYony first version */ #ifndef Pins_Arduino_h #define Pins_Arduino_h /* pins alias. Must keep in sequence */ -#define D0 (0) -#define D1 (1) -#define D2 (2) -#define D3 (3) -#define D4 (4) -#define D5 (5) -#define D6 (6) -#define D7 (7) -#define D8 (8) -#define D9 (9) -#define D10 (10) -#define D11 (11) -#define D12 (12) -#define D13 (13) -#define D14 (14) -#define D15 (15) -#define D16 (16) -#define D17 (17) -#define D18 (18) -#define D19 (19) -#define D20 (20) -#define A0 (21) -#define A1 (22) -#define A2 (23) -#define A3 (24) -#define A4 (25) -#define A5 (26) -#define A6 (27) -#define A7 (28) +#define D0 (0) +#define D1 (1) +#define D2 (2) +#define D3 (3) +#define D4 (4) +#define D5 (5) +#define D6 (6) +#define D7 (7) +#define D8 (8) +#define D9 (9) +#define D10 (10) +#define D11 (11) +#define D12 (12) +#define D13 (13) +#define D14 (14) +#define D15 (15) +#define D16 (16) +#define D17 (17) +#define D18 (18) +#define D19 (19) +#define D20 (20) +#define A0 (21) +#define A1 (22) +#define A2 (23) +#define A3 (24) +#define A4 (25) +#define A5 (26) +#define A6 (27) +#define A7 (28) -#define F_CPU 180000000L /* CPU: 180MHz */ -#define LED_BUILTIN D13 /* Default Built-in LED */ +#define F_CPU 180000000L /* CPU:180MHz */ -#define RTDUINO_DEFAULT_IIC_BUS_NAME "i2c1" +#define LED_BUILTIN D13 /* Default Built-in LED */ + +/* i2c1 : PB9-SDA PB8-SCL */ +#define RTDUINO_DEFAULT_IIC_BUS_NAME "i2c1" #endif /* Pins_Arduino_h */ -- GitLab