Merge pull request #5724 from mysterywolf/arduino

处理多处细节问题(合并时采用merge方式)
2022-03-29 10:09:23 +08:00 · 2022-03-29 10:09:23 +08:00 · 846bec58a4
parent 7fee6530f9 4f97d6e1d3
commit 846bec58a4
185 changed files with 49 additions and 42 deletions
--- a/bsp/Vango/v85xx/.config
+++ b/bsp/Vango/v85xx/.config
--- a/bsp/Vango/v85xx/Kconfig
+++ b/bsp/Vango/v85xx/Kconfig
--- a/bsp/Vango/v85xx/Libraries/.ignore_format.yml
+++ b/bsp/Vango/v85xx/Libraries/.ignore_format.yml
@ -3,4 +3,5 @@
 # If you need to exclude a file, add the path to the file in file_path.

 dir_path:
- Libraries/VangoV85xx_standard_peripheral
+- CMSIS
+- VangoV85xx_standard_peripheral
--- a/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Include/lib_CodeRAM.h
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Include/lib_CodeRAM.h
--- a/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Include/lib_LoadNVR.h
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Include/lib_LoadNVR.h
--- a/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Include/lib_conf.h
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Include/lib_conf.h
--- a/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Include/lib_cortex.h
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Include/lib_cortex.h
--- a/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Include/system_target.h
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Include/system_target.h
--- a/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Include/target.h
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Include/target.h
--- a/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Include/type_def.h
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Include/type_def.h
--- a/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Source/GCC/startup_target.S
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Source/GCC/startup_target.S
--- a/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Source/keil5/startup_target.S
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Source/keil5/startup_target.S
--- a/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Source/lib_CodeRAM.c
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Source/lib_CodeRAM.c
--- a/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Source/lib_LoadNVR.c
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Source/lib_LoadNVR.c
--- a/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Source/lib_cortex.c
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Source/lib_cortex.c
--- a/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Source/system_target.c
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/Vango/V85xx/Source/system_target.c
--- a/bsp/Vango/v85xx/Libraries/CMSIS/cmsis_armcc.h
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/cmsis_armcc.h
--- a/bsp/Vango/v85xx/Libraries/CMSIS/cmsis_compiler.h
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/cmsis_compiler.h
--- a/bsp/Vango/v85xx/Libraries/CMSIS/cmsis_gcc.h
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/cmsis_gcc.h
--- a/bsp/Vango/v85xx/Libraries/CMSIS/cmsis_version.h
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/cmsis_version.h
--- a/bsp/Vango/v85xx/Libraries/CMSIS/core_cm0.h
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/core_cm0.h
--- a/bsp/Vango/v85xx/Libraries/CMSIS/core_cmFunc.h
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/core_cmFunc.h
--- a/bsp/Vango/v85xx/Libraries/CMSIS/core_cmInstr.h
+++ b/bsp/Vango/v85xx/Libraries/CMSIS/core_cmInstr.h
--- a/bsp/Vango/v85xx/Libraries/SConscript
+++ b/bsp/Vango/v85xx/Libraries/SConscript
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_adc.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_adc.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_adc_tiny.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_adc_tiny.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_ana.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_ana.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_clk.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_clk.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_comp.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_comp.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_crypt.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_crypt.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_dma.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_dma.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_flash.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_flash.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_gpio.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_gpio.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_i2c.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_i2c.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_iso7816.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_iso7816.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_lcd.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_lcd.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_misc.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_misc.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_pmu.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_pmu.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_pwm.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_pwm.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_rtc.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_rtc.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_spi.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_spi.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_tmr.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_tmr.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_u32k.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_u32k.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_uart.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_uart.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_version.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_version.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_wdt.h
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Include/lib_wdt.h
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_adc.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_adc.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_adc_tiny.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_adc_tiny.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_ana.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_ana.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_clk.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_clk.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_comp.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_comp.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_crypt.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_crypt.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_dma.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_dma.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_flash.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_flash.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_gpio.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_gpio.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_i2c.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_i2c.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_iso7816.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_iso7816.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_lcd.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_lcd.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_misc.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_misc.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_pmu.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_pmu.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_pwm.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_pwm.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_rtc.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_rtc.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_spi.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_spi.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_tmr.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_tmr.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_u32k.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_u32k.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_uart.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_uart.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_version.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_version.c
--- a/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_wdt.c
+++ b/bsp/Vango/v85xx/Libraries/VangoV85xx_standard_peripheral/Source/lib_wdt.c
--- a/bsp/Vango/v85xx/README.md
+++ b/bsp/Vango/v85xx/README.md
--- a/bsp/Vango/v85xx/SConscript
+++ b/bsp/Vango/v85xx/SConscript
--- a/bsp/Vango/v85xx/SConstruct
+++ b/bsp/Vango/v85xx/SConstruct
--- a/bsp/Vango/v85xx/Target_FLASH.icf
+++ b/bsp/Vango/v85xx/Target_FLASH.icf
--- a/bsp/Vango/v85xx/Target_FLASH.ld
+++ b/bsp/Vango/v85xx/Target_FLASH.ld
--- a/bsp/Vango/v85xx/Target_FLASH.sct
+++ b/bsp/Vango/v85xx/Target_FLASH.sct
--- a/bsp/Vango/v85xx/Vango.V85XX.4.0.2.pack
+++ b/bsp/Vango/v85xx/Vango.V85XX.4.0.2.pack
--- a/bsp/Vango/v85xx/applications/SConscript
+++ b/bsp/Vango/v85xx/applications/SConscript
--- a/bsp/Vango/v85xx/applications/main.c
+++ b/bsp/Vango/v85xx/applications/main.c
--- a/bsp/Vango/v85xx/drivers/SConscript
+++ b/bsp/Vango/v85xx/drivers/SConscript
--- a/bsp/Vango/v85xx/drivers/board.c
+++ b/bsp/Vango/v85xx/drivers/board.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2021, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
 *
 * SPDX-License-Identifier: Apache-2.0
 *
--- a/bsp/Vango/v85xx/drivers/board.h
+++ b/bsp/Vango/v85xx/drivers/board.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2021, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
 *
 * SPDX-License-Identifier: Apache-2.0
 *
--- a/bsp/Vango/v85xx/drivers/drv_comm.h
+++ b/bsp/Vango/v85xx/drivers/drv_comm.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2021, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
 *
 * SPDX-License-Identifier: Apache-2.0
 *
--- a/bsp/Vango/v85xx/drivers/drv_gpio.c
+++ b/bsp/Vango/v85xx/drivers/drv_gpio.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2021, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
 *
 * SPDX-License-Identifier: Apache-2.0
 *
--- a/bsp/Vango/v85xx/drivers/drv_gpio.h
+++ b/bsp/Vango/v85xx/drivers/drv_gpio.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2021, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
 *
 * SPDX-License-Identifier: Apache-2.0
 *
--- a/bsp/Vango/v85xx/drivers/drv_spi.c
+++ b/bsp/Vango/v85xx/drivers/drv_spi.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2021, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
 *
 * SPDX-License-Identifier: Apache-2.0
 *
--- a/bsp/Vango/v85xx/drivers/drv_spi.h
+++ b/bsp/Vango/v85xx/drivers/drv_spi.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2021, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
 *
 * SPDX-License-Identifier: Apache-2.0
 *
--- a/bsp/Vango/v85xx/drivers/drv_usart.c
+++ b/bsp/Vango/v85xx/drivers/drv_usart.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2021, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@ -7,7 +7,7 @@
 * Date           Author            Notes
 * 2021-01-04     iysheng           first version
 * 2021-09-07     FuC               Suit for Vango V85XX
- * 2021·09-12     ZhuXW             fix UART5
+ * 2021-09-12     ZhuXW             fix UART5
 */

 #include <target.h>
--- a/bsp/Vango/v85xx/drivers/drv_usart.h
+++ b/bsp/Vango/v85xx/drivers/drv_usart.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2021, RT-Thread Development Team
+ * Copyright (c) 2006-2022, RT-Thread Development Team
 *
 * SPDX-License-Identifier: Apache-2.0
 *
--- a/bsp/Vango/v85xx/project.uvprojx
+++ b/bsp/Vango/v85xx/project.uvprojx
--- a/bsp/Vango/v85xx/rtconfig.h
+++ b/bsp/Vango/v85xx/rtconfig.h
--- a/bsp/Vango/v85xx/rtconfig.py
+++ b/bsp/Vango/v85xx/rtconfig.py
--- a/bsp/Vango/v85xx/template.uvprojx
+++ b/bsp/Vango/v85xx/template.uvprojx
--- a/bsp/Vango/v85xxp/Kconfig
+++ b/bsp/Vango/v85xxp/Kconfig
--- a/bsp/Vango/v85xxp/Libraries/.ignore_format.yml
+++ b/bsp/Vango/v85xxp/Libraries/.ignore_format.yml
@ -3,4 +3,5 @@
 # If you need to exclude a file, add the path to the file in file_path.

 dir_path:
- Libraries/VangoV85xxP_standard_peripheral
+- CMSIS
+- VangoV85xxP_standard_peripheral
--- a/bsp/Vango/v85xxp/Libraries/CMSIS/Vango/V85xxP/Include/lib_CodeRAM.h
+++ b/bsp/Vango/v85xxp/Libraries/CMSIS/Vango/V85xxP/Include/lib_CodeRAM.h
--- a/bsp/Vango/v85xxp/Libraries/CMSIS/Vango/V85xxP/Include/lib_LoadNVR.h
+++ b/bsp/Vango/v85xxp/Libraries/CMSIS/Vango/V85xxP/Include/lib_LoadNVR.h
--- a/bsp/Vango/v85xxp/Libraries/CMSIS/Vango/V85xxP/Include/lib_conf.h
+++ b/bsp/Vango/v85xxp/Libraries/CMSIS/Vango/V85xxP/Include/lib_conf.h
--- a/bsp/Vango/v85xxp/Libraries/CMSIS/Vango/V85xxP/Include/lib_cortex.h
+++ b/bsp/Vango/v85xxp/Libraries/CMSIS/Vango/V85xxP/Include/lib_cortex.h
--- a/bsp/Vango/v85xxp/Libraries/CMSIS/Vango/V85xxP/Include/system_target.h
+++ b/bsp/Vango/v85xxp/Libraries/CMSIS/Vango/V85xxP/Include/system_target.h
--- a/bsp/Vango/v85xxp/Libraries/CMSIS/Vango/V85xxP/Include/target.h
+++ b/bsp/Vango/v85xxp/Libraries/CMSIS/Vango/V85xxP/Include/target.h
--- a/bsp/Vango/v85xxp/Libraries/CMSIS/Vango/V85xxP/Include/type_def.h
+++ b/bsp/Vango/v85xxp/Libraries/CMSIS/Vango/V85xxP/Include/type_def.h
--- a/Show More
+++ b/Show More