yemai/ArduinoCore-AT32F4
1
0
Fork 0
mirror of https://github.com/WeActStudio/ArduinoCore-AT32F4.git synced 2026-05-21 09:22:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix uart6 7 bug

Browse Source
This commit is contained in:
ZYQ-FEIYUE
2023-01-08 17:45:49 +08:00
parent 3b44bd60f2
commit a18ff464f6
6 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cores/arduino/HardwareSerial.cpp
View File

@@ -184,6 +184,8 @@ void HardwareSerial::begin(
crm_periph_clock_enable(CRM_GPIOA_PERIPH_CLOCK, TRUE); crm_periph_clock_enable(CRM_GPIOA_PERIPH_CLOCK, TRUE);
crm_periph_clock_enable(CRM_USART6_PERIPH_CLOCK, TRUE); crm_periph_clock_enable(CRM_USART6_PERIPH_CLOCK, TRUE);
crm_periph_clock_enable(CRM_IOMUX_PERIPH_CLOCK, TRUE);
gpio_pin_remap_config(USART6_GMUX, TRUE);
} }
else if (_USARTx == UART7) else if (_USARTx == UART7)
{ {
@@ -214,12 +216,18 @@ void HardwareSerial::begin(
return; return;
} }
gpio_default_para_init(&gpio_init_struct);
gpio_init_struct.gpio_pins = Tx_Pin | Rx_Pin;
gpio_init_struct.gpio_drive_strength = GPIO_DRIVE_STRENGTH_STRONGER; gpio_init_struct.gpio_drive_strength = GPIO_DRIVE_STRENGTH_STRONGER;
gpio_init_struct.gpio_mode = GPIO_MODE_MUX;
gpio_init_struct.gpio_pull = GPIO_PULL_NONE;
gpio_init_struct.gpio_out_type = GPIO_OUTPUT_PUSH_PULL; gpio_init_struct.gpio_out_type = GPIO_OUTPUT_PUSH_PULL;
gpio_init_struct.gpio_mode = GPIO_MODE_MUX;
gpio_init_struct.gpio_pins = Tx_Pin;
gpio_init_struct.gpio_pull = GPIO_PULL_NONE;
gpio_init(GPIOx, &gpio_init_struct);
gpio_init_struct.gpio_drive_strength = GPIO_DRIVE_STRENGTH_STRONGER;
gpio_init_struct.gpio_out_type = GPIO_OUTPUT_PUSH_PULL;
gpio_init_struct.gpio_mode = GPIO_MODE_INPUT;
gpio_init_struct.gpio_pins = Rx_Pin;
gpio_init_struct.gpio_pull = GPIO_PULL_UP;
gpio_init(GPIOx, &gpio_init_struct); gpio_init(GPIOx, &gpio_init_struct);
usart_init(_USARTx, baudRate, SERIAL_ConfigGrp[config].data_bit, SERIAL_ConfigGrp[config].stop_bit); usart_init(_USARTx, baudRate, SERIAL_ConfigGrp[config].data_bit, SERIAL_ConfigGrp[config].stop_bit);

2
cores/arduino/HardwareSerial.h
View File

@@ -138,9 +138,11 @@ extern HardwareSerial Serial5;
#if SERIAL_6_ENABLE #if SERIAL_6_ENABLE
extern HardwareSerial Serial6; extern HardwareSerial Serial6;
#endif #endif
#if SERIAL_7_ENABLE #if SERIAL_7_ENABLE
extern HardwareSerial Serial7; extern HardwareSerial Serial7;
#endif #endif
#if SERIAL_8_ENABLE #if SERIAL_8_ENABLE
extern HardwareSerial Serial8; extern HardwareSerial Serial8;
#endif #endif

4
cores/arduino/libcore/gpio.c
View File

@@ -270,8 +270,8 @@ void GPIOx_Init(
*/ */
void GPIO_JTAG_Disable(void) void GPIO_JTAG_Disable(void)
{ {
// RCC_APB2PeriphClockCmd(RCC_APB2PERIPH_AFIO, ENABLE); crm_periph_clock_enable(CRM_IOMUX_PERIPH_CLOCK, TRUE);
// GPIO_PinsRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE); gpio_pin_remap_config(SWJTAG_GMUX_010, TRUE);
} }
/** /**

2
cores/arduino/libcore/mcu_core.c
View File

@@ -27,7 +27,7 @@ void Core_Init(void)
{ {
system_clock_config(); system_clock_config();
nvic_priority_group_config(NVIC_PRIORITY_GROUP_2); nvic_priority_group_config(NVIC_PRIORITY_GROUP_2);
// GPIO_JTAG_Disable(); GPIO_JTAG_Disable();
Delay_Init(); Delay_Init();
ADCx_Init(ADC1); ADCx_Init(ADC1);
} }

2
package_at32_index.json
View File

@@ -12,7 +12,7 @@
{ {
"name": "AT32F403ACGU7 Core Board", "name": "AT32F403ACGU7 Core Board",
"architecture": "at32f403a", "architecture": "at32f403a",
"version": "0.0.8", "version": "0.0.9",
"category": "Contributed", "category": "Contributed",
"url": "https://github.com/WeActStudio/ArduinoCore-AT32F4/archive/refs/heads/main.zip", "url": "https://github.com/WeActStudio/ArduinoCore-AT32F4/archive/refs/heads/main.zip",
"archiveFileName": "ArduinoCore-AT32F4-main.zip", "archiveFileName": "ArduinoCore-AT32F4-main.zip",

2
platform.txt
View File

@@ -1,6 +1,6 @@
##==============================================## ##==============================================##
name=WeActStudio AT32F403A Boards name=WeActStudio AT32F403A Boards
version=0.0.8 version=0.0.9
##==============================================## ##==============================================##
####AT32 compile variables ####AT32 compile variables