Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
[submodule "system/Air32F103-Drivers"]
path = system/Air32F103-Drivers
url = https://github.com/Air-duino/Air32F103-Drivers.git
[submodule "system/Air401-Drivers"]
path = system/Air401-Drivers
url = https://github.com/Air-duino/Air401-Drivers.git
116 changes: 115 additions & 1 deletion boards.txt
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,121 @@ Air001Dev.menu.BootConnection.direct=direct connect
Air001Dev.menu.BootConnection.direct.upload.boot=direct_connect

Air001Dev.build.extra_flags={build.temp} -DF_CPU={build.f_cpu} {build.lsc_temp} {build.sv_tmp} -DAIR001_DEV
# Upload menu

###############################
# Air401 Dev
###############################

Air401Dev.name=Air401 Dev Chip

Air401Dev.upload.maximum_size=20480
Air401Dev.upload.maximum_data_size=3072

Air401Dev.upload.tool=AirISP
Air401Dev.upload.tool.default=AirISP

Air401Dev.build.core=AirMCU
Air401Dev.build.board=AIR401_DEV
Air401Dev.build.mcu=cortex-m0plus
Air401Dev.build.series=AIR401xx
Air401Dev.build.cmsis_lib_gcc=arm_cortexM0l_math
Air401Dev.build.product_line=AIR401
Air401Dev.build.variant=AIR401/AIR401_DEV
Air401Dev.build.air_extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
Air401Dev.build.drivers_include="-I{build.system.path}/Air401-Drivers/{build.series}_HAL_Driver/Inc" "-I{build.system.path}/Air401-Drivers/{build.series}_HAL_Driver/Src" "-I{build.system.path}/{build.series}" "-I{build.system.path}/Air401-Drivers/CMSIS/Device/{build.series}/Include/" "-I{build.system.path}/Air401-Drivers/CMSIS/Device/{build.series}/Source/gcc/"

Air401Dev.menu.UploadSpeed.115200=115200
Air401Dev.menu.UploadSpeed.115200.upload.speed=115200
Air401Dev.menu.UploadSpeed.57600=57600
Air401Dev.menu.UploadSpeed.57600.upload.speed=57600
Air401Dev.menu.UploadSpeed.38400=38400
Air401Dev.menu.UploadSpeed.38400.upload.speed=38400
Air401Dev.menu.UploadSpeed.19200=19200
Air401Dev.menu.UploadSpeed.19200.upload.speed=19200
Air401Dev.menu.UploadSpeed.9600=9600
Air401Dev.menu.UploadSpeed.9600.upload.speed=9600
Air401Dev.menu.UploadSpeed.4800=4800
Air401Dev.menu.UploadSpeed.4800.upload.speed=4800
Air401Dev.menu.UploadSpeed.2400=2400
Air401Dev.menu.UploadSpeed.2400.upload.speed=2400
Air401Dev.menu.UploadSpeed.1200=1200
Air401Dev.menu.UploadSpeed.1200.upload.speed=1200

# HSI/HSE选择和主频

Air401Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M=HSI 24Mhz, HCLK 24Mhz
Air401Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M.build.temp=-D{build.series}_HSI_24M_HCLK_24M
Air401Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M.build.f_cpu=24000000L

Air401Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M=HSE 24Mhz, HCLK 24Mhz
Air401Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M.build.temp=-D{build.series}_HSE_24M_HCLK_24M
Air401Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M.build.f_cpu=24000000L

Air401Dev.menu.LowSpeedClockSource.None=None
Air401Dev.menu.LowSpeedClockSource.None.build.lsc_temp=-D{build.series}_LSC_NONE

Air401Dev.menu.LowSpeedClockSource.LSI=LSI 32.768Khz
Air401Dev.menu.LowSpeedClockSource.LSI.build.lsc_temp=-D{build.series}_LSC_LSI

Air401Dev.menu.LowSpeedClockSource.LSE=LSE 32.768Khz
Air401Dev.menu.LowSpeedClockSource.LSE.build.lsc_temp=-D{build.series}_LSC_LSE

Air401Dev.menu.xserial.generic=Enabled (generic 'Serial')
Air401Dev.menu.xserial.none=Enabled (no generic 'Serial')
Air401Dev.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
Air401Dev.menu.xserial.disabled=Disabled (no Serial support)
Air401Dev.menu.xserial.disabled.build.xSerial=

# debug
Air401Dev.menu.dbg.none=None
Air401Dev.menu.dbg.enable_sym=Symbols Enabled (-g)
Air401Dev.menu.dbg.enable_sym.build.flags.debug=-g -DNDEBUG
Air401Dev.menu.dbg.enable_log=Core logs Enabled
Air401Dev.menu.dbg.enable_log.build.flags.debug=
Air401Dev.menu.dbg.enable_all=Core Logs and Symbols Enabled (-g)
Air401Dev.menu.dbg.enable_all.build.flags.debug=-g

# optimize
Air401Dev.menu.opt.osstd=Smallest (-Os default)
Air401Dev.menu.opt.oslto=Smallest (-Os) with LTO
Air401Dev.menu.opt.oslto.build.flags.optimize=-Os -flto
Air401Dev.menu.opt.o1std=Fast (-O1)
Air401Dev.menu.opt.o1std.build.flags.optimize=-O1
Air401Dev.menu.opt.o1lto=Fast (-O1) with LTO
Air401Dev.menu.opt.o1lto.build.flags.optimize=-O1 -flto
Air401Dev.menu.opt.o2std=Faster (-O2)
Air401Dev.menu.opt.o2std.build.flags.optimize=-O2
Air401Dev.menu.opt.o2lto=Faster (-O2) with LTO
Air401Dev.menu.opt.o2lto.build.flags.optimize=-O2 -flto
Air401Dev.menu.opt.o3std=Fastest (-O3)
Air401Dev.menu.opt.o3std.build.flags.optimize=-O3
Air401Dev.menu.opt.o3lto=Fastest (-O3) with LTO
Air401Dev.menu.opt.o3lto.build.flags.optimize=-O3 -flto
Air401Dev.menu.opt.ogstd=Debug (-Og)
Air401Dev.menu.opt.ogstd.build.flags.optimize=-Og
Air401Dev.menu.opt.o0std=No Optimization (-O0)
Air401Dev.menu.opt.o0std.build.flags.optimize=-O0

Air401Dev.menu.SupplyVoltage.3V3=3.3V
Air401Dev.menu.SupplyVoltage.3V3.build.sv_tmp=-DVDD_3V3
Air401Dev.menu.SupplyVoltage.1V8=1.8V
Air401Dev.menu.SupplyVoltage.3V3.build.sv_tmp=-DVDD_1V8
Air401Dev.menu.SupplyVoltage.2V5=2.5V
Air401Dev.menu.SupplyVoltage.3V3.build.sv_tmp=-DVDD_2V5
Air401Dev.menu.SupplyVoltage.2V8=2.8V
Air401Dev.menu.SupplyVoltage.3V3.build.sv_tmp=-DVDD_2V8
Air401Dev.menu.SupplyVoltage.3V8=3.8V
Air401Dev.menu.SupplyVoltage.3V3.build.sv_tmp=-DVDD_3V8
Air401Dev.menu.SupplyVoltage.5V=5V
Air401Dev.menu.SupplyVoltage.5V.build.sv_tmp=-DVDD_5V

# boot
Air401Dev.menu.BootConnection.defaule=default isp circuit
Air401Dev.menu.BootConnection.defaule.upload.boot=default_reset
Air401Dev.menu.BootConnection.direct=direct connect
Air401Dev.menu.BootConnection.direct.upload.boot=direct_connect

Air401Dev.build.extra_flags={build.temp} -DF_CPU={build.f_cpu} {build.lsc_temp} {build.sv_tmp} -DAIR401_DEV

###############################
# Air32F103xx
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_adc.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_adc.h"
#elif defined(AIR401xx)
#include "air401xx_ll_adc.h"
#elif defined(AIR32F103xx)
#include "air32f1xx_ll_adc.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_bus.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_bus.h"
#elif defined(AIR401xxs)
#include "air401xx_ll_bus.h"
#elif defined(AIR32F103xx)
#include "air32f1xx_ll_bus.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_comp.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_comp.h"
#elif defined(AIR401xx)
#include "air401xx_ll_comp.h"
#elif defined(AIR32F103xx)
#include "air32f1xx_ll_comp.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_cortex.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_cortex.h"
#elif defined AIR401xx
#include "air401xx_ll_cortex.h"
#elif defined AIR32F103xx
#include "air32f1xx_ll_cortex.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_crc.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_crc.h"
#elif defined(AIR401xx)
#include "air401xx_ll_crc.h"
#elif defined(AIR32F103xx)
#include "air32f1xx_ll_crc.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_exti.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_exti.h"
#elif defined(AIR401xx)
#include "air401xx_ll_exti.h"
#elif defined(AIR32F103xx)
#include "air32f1xx_ll_exti.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_gpio.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_gpio.h"
#elif defined(AIR401xx)
#include "air401xx_ll_gpio.h"
#elif defined(AIR32F103xx)
#include "air32f1xx_ll_gpio.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_i2c.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_i2c.h"
#elif defined(AIR401xx)
#include "air401xx_ll_i2c.h"
#elif
#include "air32f1xx_ll_i2c.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_iwdg.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_iwdg.h"
#elif defined(AIR401xx)
#include "air401xx_ll_iwdg.h"
#elif defined(AIR32F103xx)
#include "air32f1xx_ll_iwdg.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_pwr.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_pwr.h"
#elif defined(AIR401xx)
#include "air401xx_ll_pwr.h"
#elif
#include "air32f1xx_ll_pwr.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_rcc.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_rcc.h"
#elif defined(AIR401xx)
#include "air401xx_ll_rcc.h"
#elif defined(AIR32F103xx)
#include "air32f1xx_ll_rcc.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_spi.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_spi.h"
#elif defined(AIR401xx)
#include "air401xx_ll_spi.h"
#elif defined(AIR32F103xx)
#include "air32f1xx_ll_spi.h"
#endif /* AIR001xx */
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_tim.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_tim.h"
#elif defined(AIR401xx)
#include "air401xx_ll_tim.h"
#elif defined(AIR32F103xx)
#include "air32f1xx_ll_tim.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_usart.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_usart.h"
#elif defined(AIR401xx)
#include "air401xx_ll_usart.h"
#elif defined(AIR32F103xx)
#include "air32f1xx_ll_usart.h"
#endif
Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/LL/airyyxx_ll_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

#ifdef AIR001xx
#include "air001xx_ll_utils.h"
#elif defined(AIR401xx)
#include "air401xx_ll_utils.h"
#elif defined(AIR32F103xx)
#include "air32f1xx_ll_utils.h"
#endif
Expand Down
4 changes: 3 additions & 1 deletion cores/AirMCU/air/air_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
#include "air001xx.h"
#elif defined(AIR32F103xx)
#include "air32f1xx.h"
#elif defined(AIR401xx)
#include "air401xx.h"
#else
#error "AIRYYxx chip series is not defined in boards.txt."
#endif
Expand Down Expand Up @@ -67,7 +69,7 @@
* to 0x7F (max value of the AFNUM i.e. AIR_PIN_AFNUM_MASK)
* See GitHub issue #1798.
*/
#if defined(AIR001xx) && !defined(GPIO_AF0_TIM3)
#if (defined(AIR001xx) || defined(AIR401xx)) && !defined(GPIO_AF0_TIM3)
#define GPIO_AF0_TIM3 AIR_PIN_AFNUM_MASK
#endif

Expand Down
2 changes: 2 additions & 0 deletions cores/AirMCU/air/air_def_build.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#define CMSIS_STARTUP_FILE "startup_air001xx.s"
#elif defined(AIR32F103xx)
#define CMSIS_STARTUP_FILE "startup_air32f10x.s"
#elif defined(AIR401_DEV)
#define CMSIS_STARTUP_FILE "startup_air401xx.s"
#else
#error UNKNOWN CHIP
#endif
Expand Down
2 changes: 1 addition & 1 deletion cores/AirMCU/air/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ extern "C" {
#endif

#if defined(TIM1_BASE) && !defined(TIM1_IRQn)
#if defined(AIRC0xx) || defined(AIR001xx) || defined(AIRG0xx)
#if defined(AIRC0xx) || defined(AIR001xx) || defined(AIRG0xx) || defined(AIR401xx)
#define TIM1_IRQn TIM1_BRK_UP_TRG_COM_IRQn
#define TIM1_IRQHandler TIM1_BRK_UP_TRG_COM_IRQHandler
#elif defined(AIR32F1xx) ||defined(AIRG4xx)
Expand Down
2 changes: 1 addition & 1 deletion cores/AirMCU/wiring_analog.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#ifndef _WIRING_ANALOG_
#define _WIRING_ANALOG_

#if defined(AIR001xx) || defined(AIR32F1xx)
#if defined(AIR001xx) || defined(AIR32F1xx) || defined (AIR401xx)
/* Analog read resolution */
#define LL_ADC_RESOLUTION LL_ADC_RESOLUTION_12B
#define ADC_RANGE 4096
Expand Down
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/HAL/airyyxx_hal.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "airc0xx_hal.c"
#elif AIR001xx
#include "air001xx_hal.c"
#elif AIR401xx
#include "air401xx_hal.c"
#elif AIR32F1xx
#include "AIR32F1xx_hal.c"
#elif AIRF2xx
Expand Down
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/HAL/airyyxx_hal_adc.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "airc0xx_hal_adc.c"
#elif AIR001xx
#include "air001xx_hal_adc.c"
#elif AIR401xx
#include "air401xx_hal_adc.c"
#elif AIR32F1xx
#include "AIR32F1xx_hal_adc.c"
#elif AIRF2xx
Expand Down
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/HAL/airyyxx_hal_comp.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#ifdef AIR001xx
#include "air001xx_hal_comp.c"
#elif AIR401xx
#include "air401xx_hal_comp.c"
#elif AIRF3xx
#include "airf3xx_hal_comp.c"
#elif AIRG0xx
Expand Down
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/HAL/airyyxx_hal_cortex.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "airc0xx_hal_cortex.c"
#elif AIR001xx
#include "air001xx_hal_cortex.c"
#elif AIR401xx
#include "air401xx_hal_cortex.c"
#elif AIR32F1xx
#include "AIR32F1xx_hal_cortex.c"
#elif AIRF2xx
Expand Down
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/HAL/airyyxx_hal_crc.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "airc0xx_hal_crc.c"
#elif AIR001xx
#include "air001xx_hal_crc.c"
#elif AIR401xx
#include "air401xx_hal_crc.c"
#elif AIR32F1xx
#include "AIR32F1xx_hal_crc.c"
#elif AIRF2xx
Expand Down
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/HAL/airyyxx_hal_exti.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "airc0xx_hal_exti.c"
#elif AIR001xx
#include "air001xx_hal_exti.c"
#elif AIR401xx
#include "air401xx_hal_exti.c"
#elif AIR32F1xx
#include "AIR32F1xx_hal_exti.c"
#elif AIRF2xx
Expand Down
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/HAL/airyyxx_hal_flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "airc0xx_hal_flash.c"
#elif AIR001xx
#include "air001xx_hal_flash.c"
#elif AIR401xx
#include "air401xx_hal_flash.c"
#elif AIR32F1xx
#include "AIR32F1xx_hal_flash.c"
#elif AIRF2xx
Expand Down
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/HAL/airyyxx_hal_gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "airc0xx_hal_gpio.c"
#elif AIR001xx
#include "air001xx_hal_gpio.c"
#elif AIR401xx
#include "air401xx_hal_gpio.c"
#elif AIR32F1xx
#include "AIR32F1xx_hal_gpio.c"
#elif AIRF2xx
Expand Down
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/HAL/airyyxx_hal_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "airc0xx_hal_i2c.c"
#elif AIR001xx
#include "air001xx_hal_i2c.c"
#elif AIR401xx
#include "air401xx_hal_i2c.c"
#elif AIR32F1xx
#include "AIR32F1xx_hal_i2c.c"
#elif AIRF2xx
Expand Down
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/HAL/airyyxx_hal_iwdg.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "airc0xx_hal_iwdg.c"
#elif AIR001xx
#include "air001xx_hal_iwdg.c"
#elif AIR401xx
#include "air401xx_hal_iwdg.c"
#elif AIR32F1xx
#include "AIR32F1xx_hal_iwdg.c"
#elif AIRF2xx
Expand Down
Loading