diff --git a/bsp/stm32f10x_HAL/.config b/bsp/stm32f10x_HAL/.config index 3e20fd03cc41fd0903c118235cdba7f105bb8fbf..6c72818bed02bd708e3aa964b84b5a359fcc27e3 100644 --- a/bsp/stm32f10x_HAL/.config +++ b/bsp/stm32f10x_HAL/.config @@ -98,6 +98,10 @@ CONFIG_RT_USING_PIN=y # CONFIG_RT_USING_SDIO is not set # CONFIG_RT_USING_SPI is not set # CONFIG_RT_USING_WDT is not set + +# +# Using USB +# # CONFIG_RT_USING_USB_HOST is not set # CONFIG_RT_USING_USB_DEVICE is not set @@ -174,10 +178,83 @@ CONFIG_RT_USING_PIN=y # miscellaneous packages # # CONFIG_PKG_USING_HELLO is not set - -# -# BSP_SPECIAL CONFIG -# +# CONFIG_STM32F100C8 is not set +# CONFIG_STM32F100CB is not set +# CONFIG_STM32F100R8 is not set +# CONFIG_STM32F100RB is not set +# CONFIG_STM32F100RC is not set +# CONFIG_STM32F100RD is not set +# CONFIG_STM32F100RE is not set +# CONFIG_STM32F100V8 is not set +# CONFIG_STM32F100VB is not set +# CONFIG_STM32F100VC is not set +# CONFIG_STM32F100VD is not set +# CONFIG_STM32F100VE is not set +# CONFIG_STM32F100ZC is not set +# CONFIG_STM32F100ZD is not set +# CONFIG_STM32F100ZE is not set +# CONFIG_STM32F101C8 is not set +# CONFIG_STM32F101CB is not set +# CONFIG_STM32F101R8 is not set +# CONFIG_STM32F101RB is not set +# CONFIG_STM32F101RC is not set +# CONFIG_STM32F101RD is not set +# CONFIG_STM32F101RE is not set +# CONFIG_STM32F101RF is not set +# CONFIG_STM32F101RG is not set +# CONFIG_STM32F101T8 is not set +# CONFIG_STM32F101TB is not set +# CONFIG_STM32F101V8 is not set +# CONFIG_STM32F101VB is not set +# CONFIG_STM32F101VC is not set +# CONFIG_STM32F101VD is not set +# CONFIG_STM32F101VE is not set +# CONFIG_STM32F101VF is not set +# CONFIG_STM32F101VG is not set +# CONFIG_STM32F101ZC is not set +# CONFIG_STM32F101ZD is not set +# CONFIG_STM32F101ZE is not set +# CONFIG_STM32F101ZF is not set +# CONFIG_STM32F101ZG is not set +# CONFIG_STM32F102C8 is not set +# CONFIG_STM32F102CB is not set +# CONFIG_STM32F102R8 is not set +# CONFIG_STM32F102RB is not set +# CONFIG_STM32F103C8 is not set +# CONFIG_STM32F103CB is not set +# CONFIG_STM32F103R8 is not set +CONFIG_STM32F103RB=y +# CONFIG_STM32F103RC is not set +# CONFIG_STM32F103RD is not set +# CONFIG_STM32F103RE is not set +# CONFIG_STM32F103RF is not set +# CONFIG_STM32F103RG is not set +# CONFIG_STM32F103T8 is not set +# CONFIG_STM32F103TB is not set +# CONFIG_STM32F103V8 is not set +# CONFIG_STM32F103VB is not set +# CONFIG_STM32F103VC is not set +# CONFIG_STM32F103VD is not set +# CONFIG_STM32F103VE is not set +# CONFIG_STM32F103VF is not set +# CONFIG_STM32F103VG is not set +# CONFIG_STM32F103ZC is not set +# CONFIG_STM32F103ZD is not set +# CONFIG_STM32F103ZE is not set +# CONFIG_STM32F103ZF is not set +# CONFIG_STM32F103ZG is not set +# CONFIG_STM32F105R8 is not set +# CONFIG_STM32F105RB is not set +# CONFIG_STM32F105RC is not set +# CONFIG_STM32F105V8 is not set +# CONFIG_STM32F105VB is not set +# CONFIG_STM32F105VC is not set +# CONFIG_STM32F107RB is not set +# CONFIG_STM32F107RC is not set +# CONFIG_STM32F107VB is not set +# CONFIG_STM32F107VC is not set +# CONFIG_RT_USING_HSI is not set +CONFIG_RT_HSE_VALUE=8000000 CONFIG_STM32F10X_PIN_NUMBERS=64 # CONFIG_RT_USING_UART1 is not set CONFIG_RT_USING_UART2=y diff --git a/bsp/stm32f10x_HAL/KConfig b/bsp/stm32f10x_HAL/KConfig index 16cac7e8fb0b995cb2e5f9166ee8e186cabcf64f..3ebeb013f0217b4eefaca78d035008db728581c3 100644 --- a/bsp/stm32f10x_HAL/KConfig +++ b/bsp/stm32f10x_HAL/KConfig @@ -18,14 +18,144 @@ config $PKGS_DIR source "$RTT_DIR/KConfig" source "$PKGS_DIR/KConfig" +choice + prompt "Device type" + default STM32F103RB + config STM32F100RC + bool "STM32F100RC" + config STM32F100RD + bool "STM32F100RD" + config STM32F100RE + bool "STM32F100RE" + config STM32F100VC + bool "STM32F100VC" + config STM32F100VD + bool "STM32F100VD" + config STM32F100VE + bool "STM32F100VE" + config STM32F100ZC + bool "STM32F100ZC" + config STM32F100ZD + bool "STM32F100ZD" + config STM32F100ZE + bool "STM32F100ZE" + config STM32F101CB + bool "STM32F101CB" + config STM32F101RB + bool "STM32F101RB" + config STM32F101RC + bool "STM32F101RC" + config STM32F101RD + bool "STM32F101RD" + config STM32F101RE + bool "STM32F101RE" + config STM32F101RF + bool "STM32F101RF" + config STM32F101RG + bool "STM32F101RG" + config STM32F101TB + bool "STM32F101TB" + config STM32F101VB + bool "STM32F101VB" + config STM32F101VC + bool "STM32F101VC" + config STM32F101VD + bool "STM32F101VD" + config STM32F101VE + bool "STM32F101VE" + config STM32F101VF + bool "STM32F101VF" + config STM32F101VG + bool "STM32F101VG" + config STM32F101ZC + bool "STM32F101ZC" + config STM32F101ZD + bool "STM32F101ZD" + config STM32F101ZE + bool "STM32F101ZE" + config STM32F101ZF + bool "STM32F101ZF" + config STM32F101ZG + bool "STM32F101ZG" + config STM32F102CB + bool "STM32F102CB" + config STM32F102RB + bool "STM32F102RB" + config STM32F103C8 + bool "STM32F103C8" + config STM32F103CB + bool "STM32F103CB" + config STM32F103R8 + bool "STM32F103R8" + config STM32F103RB + bool "STM32F103RB" + config STM32F103RC + bool "STM32F103RC" + config STM32F103RD + bool "STM32F103RD" + config STM32F103RE + bool "STM32F103RE" + config STM32F103RF + bool "STM32F103RF" + config STM32F103RG + bool "STM32F103RG" + config STM32F103T8 + bool "STM32F103T8" + config STM32F103TB + bool "STM32F103TB" + config STM32F103V8 + bool "STM32F103V8" + config STM32F103VB + bool "STM32F103VB" + config STM32F103VC + bool "STM32F103VC" + config STM32F103VD + bool "STM32F103VD" + config STM32F103VE + bool "STM32F103VE" + config STM32F103VF + bool "STM32F103VF" + config STM32F103VG + bool "STM32F103VG" + config STM32F103ZC + bool "STM32F103ZC" + config STM32F103ZD + bool "STM32F103ZD" + config STM32F103ZE + bool "STM32F103ZE" + config STM32F103ZF + bool "STM32F103ZF" + config STM32F103ZG + bool "STM32F103ZG" + config STM32F105R8 + bool "STM32F105R8" + config STM32F105RB + bool "STM32F105RB" + config STM32F105RC + bool "STM32F105RC" + config STM32F105V8 + bool "STM32F105V8" + config STM32F105VB + bool "STM32F105VB" + config STM32F105VC + bool "STM32F105VC" + config STM32F107RB + bool "STM32F107RB" + config STM32F107RC + bool "STM32F107RC" + config STM32F107VB + bool "STM32F107VB" + config STM32F107VC + bool "STM32F107VC" +endchoice +config RT_USING_HSI + bool "Using HSI as clock source" + default n +config RT_HSE_VALUE + int "HSE Value" + default 8000000 + depends on !RT_USING_HSI -if RT_USING_PIN - - config STM32F10X_PIN_NUMBERS - int "number of stm32 pin numbers" - default 64 - -endif if RT_USING_SERIAL diff --git a/bsp/stm32f10x_HAL/Libraries/SConscript b/bsp/stm32f10x_HAL/Libraries/SConscript index b4c4c68e1a1c3e980ad3e2045cbe171b3bfb94b5..ba24882c6fb279c0ac2cb2e3ce189be1e4a7550d 100644 --- a/bsp/stm32f10x_HAL/Libraries/SConscript +++ b/bsp/stm32f10x_HAL/Libraries/SConscript @@ -53,34 +53,56 @@ STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_utils.c """) -if rtconfig.STM32_TYPE == 'STM32F100xB' or rtconfig.STM32_TYPE == 'STM32F100xE': +#device options +if GetDepend(['STM32F100RC']) or GetDepend(['STM32F100RC']) or GetDepend(['STM32F100RC']) or GetDepend(['STM32F100RD']) or GetDepend(['STM32F100RE']) or GetDepend(['STM32F100VD']) or GetDepend(['STM32F100VE']) or GetDepend(['STM32F100ZD']) or GetDepend(['STM32F100ZE']): + STM32_TYPE = 'STM32F100xE' +if GetDepend(['STM32F101TB']) or GetDepend(['STM32F101CB']) or GetDepend(['STM32F101RB']) or GetDepend(['STM32F101VB']): + STM32_TYPE = 'STM32F101xB' +if GetDepend(['STM32F101RC']) or GetDepend(['STM32F101VC']) or GetDepend(['STM32F101ZC']) or GetDepend(['STM32F101RD']) or GetDepend(['STM32F101RE']) or GetDepend(['STM32F101VD']) or GetDepend(['STM32F101VE']) or GetDepend(['STM32F101ZD']) or GetDepend(['STM32F101ZE']): + STM32_TYPE = 'STM32F101xE' +if GetDepend(['STM32F101RF']) or GetDepend(['STM32F101RG']) or GetDepend(['STM32F101VF']) or GetDepend(['STM32F101VG']) or GetDepend(['STM32F101ZF']) or GetDepend(['STM32F101ZG']): + STM32_TYPE = 'STM32F101xG' +if GetDepend(['STM32F102CB']) or GetDepend(['STM32F102RB']): + STM32_TYPE = 'STM32F102xB' +if GetDepend(['STM32F103T8']) or GetDepend(['STM32F103TB']) or GetDepend(['STM32F103C8']) or GetDepend(['STM32F103CB']) or GetDepend(['STM32F103R8']) or GetDepend(['STM32F103RB']) or GetDepend(['STM32F103V8']) or GetDepend(['STM32F103VB']): + STM32_TYPE = 'STM32F103xB' +if GetDepend(['STM32F103RC']) or GetDepend(['STM32F103VC']) or GetDepend(['STM32F103ZC']) or GetDepend(['STM32F103RD']) or GetDepend(['STM32F103RE']) or GetDepend(['STM32F103VD']) or GetDepend(['STM32F103VE']) or GetDepend(['STM32F103ZD']) or GetDepend(['STM32F103ZE']): + STM32_TYPE = 'STM32F103xE' +if GetDepend(['STM32F103RF']) or GetDepend(['STM32F103RG']) or GetDepend(['STM32F103VF']) or GetDepend(['STM32F103VG']) or GetDepend(['STM32F103ZF']) or GetDepend(['STM32F103ZG']): + STM32_TYPE = 'STM32F103xG' +if GetDepend(['STM32F105R8']) or GetDepend(['STM32F105RB']) or GetDepend(['STM32F105RC']) or GetDepend(['STM32F105V8']) or GetDepend(['STM32F105VB']) or GetDepend(['STM32F105VC']): + STM32_TYPE = 'STM32F105xC' +if GetDepend(['STM32F107RB']) or GetDepend(['STM32F107RC']) or GetDepend(['STM32F107VB']) or GetDepend(['STM32F107VC']): + STM32_TYPE = 'STM32F107xC' + +if STM32_TYPE == 'STM32F100xB' or STM32_TYPE == 'STM32F100xE': src = src + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cec.c'] -if rtconfig.STM32_TYPE == 'STM32F103x6' or rtconfig.STM32_TYPE == 'STM32F103xB' or rtconfig.STM32_TYPE == 'STM32F103xE' or rtconfig.STM32_TYPE == 'STM32F103xG' or rtconfig.STM32_TYPE == 'STM32F105xC' or rtconfig.STM32_TYPE == 'STM32F107xC': +if STM32_TYPE == 'STM32F103x6' or STM32_TYPE == 'STM32F103xB' or STM32_TYPE == 'STM32F103xE' or STM32_TYPE == 'STM32F103xG' or STM32_TYPE == 'STM32F105xC' or STM32_TYPE == 'STM32F107xC': src = src + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c'] -if rtconfig.STM32_TYPE == 'STM32F100xB' or rtconfig.STM32_TYPE == 'STM32F100xE' or rtconfig.STM32_TYPE == 'STM32F101xE' or rtconfig.STM32_TYPE == 'STM32F101xG' or rtconfig.STM32_TYPE == 'STM32F103xE' or rtconfig.STM32_TYPE == 'STM32F103xG' or rtconfig.STM32_TYPE == 'STM32F105xC' or rtconfig.STM32_TYPE == 'STM32F107xC': +if STM32_TYPE == 'STM32F100xB' or STM32_TYPE == 'STM32F100xE' or STM32_TYPE == 'STM32F101xE' or STM32_TYPE == 'STM32F101xG' or STM32_TYPE == 'STM32F103xE' or STM32_TYPE == 'STM32F103xG' or STM32_TYPE == 'STM32F105xC' or STM32_TYPE == 'STM32F107xC': src = src + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac.c'] + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac_ex.c'] -if rtconfig.STM32_TYPE == 'STM32F107xC': +if STM32_TYPE == 'STM32F107xC': src = src + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_eth.c'] -if rtconfig.STM32_TYPE == 'STM32F107xC' or rtconfig.STM32_TYPE == 'STM32F105xC': +if STM32_TYPE == 'STM32F107xC' or STM32_TYPE == 'STM32F105xC': src = src + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_hcd.c'] -if rtconfig.STM32_TYPE == 'STM32F107xC' or rtconfig.STM32_TYPE == 'STM32F105xC' or rtconfig.STM32_TYPE == 'STM32F103xE' or rtconfig.STM32_TYPE == 'STM32F103xG': +if STM32_TYPE == 'STM32F107xC' or STM32_TYPE == 'STM32F105xC' or STM32_TYPE == 'STM32F103xE' or STM32_TYPE == 'STM32F103xG': src = src + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2s.c'] -if rtconfig.STM32_TYPE == 'STM32F103xE' or rtconfig.STM32_TYPE == 'STM32F103xG': +if STM32_TYPE == 'STM32F103xE' or STM32_TYPE == 'STM32F103xG': src = src + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_mmc.c'] + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sd.c'] -if rtconfig.STM32_TYPE == 'STM32F101xE' or rtconfig.STM32_TYPE == 'STM32F103xE' or rtconfig.STM32_TYPE == 'STM32F101xG' or rtconfig.STM32_TYPE == 'STM32F103xG': +if STM32_TYPE == 'STM32F101xE' or STM32_TYPE == 'STM32F103xE' or STM32_TYPE == 'STM32F101xG' or STM32_TYPE == 'STM32F103xG': src = src + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nand.c'] + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pccard.c'] -if rtconfig.STM32_TYPE == 'STM32F101xE' or rtconfig.STM32_TYPE == 'STM32F103xE' or rtconfig.STM32_TYPE == 'STM32F101xG' or rtconfig.STM32_TYPE == 'STM32F103xG' or rtconfig.STM32_TYPE == 'STM32F100xE': +if STM32_TYPE == 'STM32F101xE' or STM32_TYPE == 'STM32F103xE' or STM32_TYPE == 'STM32F101xG' or STM32_TYPE == 'STM32F103xG' or STM32_TYPE == 'STM32F100xE': src = src + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nor.c'] + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sram.c'] -if rtconfig.STM32_TYPE == 'STM32F102x6' or rtconfig.STM32_TYPE == 'STM32F102xB' or rtconfig.STM32_TYPE == 'STM32F103x6' or rtconfig.STM32_TYPE == 'STM32F103xB' or rtconfig.STM32_TYPE == 'STM32F103xE' or rtconfig.STM32_TYPE == 'STM32F103xG' or rtconfig.STM32_TYPE == 'STM32F105xC' or rtconfig.STM32_TYPE == 'STM32F107xC': +if STM32_TYPE == 'STM32F102x6' or STM32_TYPE == 'STM32F102xB' or STM32_TYPE == 'STM32F103x6' or STM32_TYPE == 'STM32F103xB' or STM32_TYPE == 'STM32F103xE' or STM32_TYPE == 'STM32F103xG' or STM32_TYPE == 'STM32F105xC' or STM32_TYPE == 'STM32F107xC': src = src + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c'] + ['STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c'] # starupt scripts for each STM32 kind @@ -102,11 +124,11 @@ startup_scripts['STM32F107xC'] = 'startup_stm32f107xc.s' # add for startup script if rtconfig.CROSS_TOOL == 'gcc': - src = src + ['CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/' + startup_scripts[rtconfig.STM32_TYPE]] + src = src + ['CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/' + startup_scripts[STM32_TYPE]] elif rtconfig.CROSS_TOOL == 'keil': - src = src + ['CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/' + startup_scripts[rtconfig.STM32_TYPE]] + src = src + ['CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/' + startup_scripts[STM32_TYPE]] elif rtconfig.CROSS_TOOL == 'iar': - src = src + ['CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/' + startup_scripts[rtconfig.STM32_TYPE]] + src = src + ['CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/' + startup_scripts[STM32_TYPE]] path = [cwd + '/CMSIS/Device/ST/STM32F1xx/Include', cwd + '/STM32F1xx_HAL_Driver/Inc', @@ -115,7 +137,7 @@ path = [cwd + '/CMSIS/Device/ST/STM32F1xx/Include', if GetDepend(['RT_USING_RTT_CMSIS']): path += [RTT_ROOT + '/components/CMSIS/Include'] -CPPDEFINES = ['USE_HAL_DRIVER', rtconfig.STM32_TYPE] +CPPDEFINES = ['USE_HAL_DRIVER',STM32_TYPE] group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/stm32f10x_HAL/drivers/board.h b/bsp/stm32f10x_HAL/drivers/board.h index bb4b02c9ec1c5cd0ec8e44476f8f5d72154b632f..617b275866c57156281790c747d4551554741331 100644 --- a/bsp/stm32f10x_HAL/drivers/board.h +++ b/bsp/stm32f10x_HAL/drivers/board.h @@ -19,6 +19,184 @@ #include "stm32f1xx_hal.h" /* board configuration */ +#if \ + defined(STM32F101TB)||\ + defined(STM32F103T8)||\ + defined(STM32F103TB) +#define STM32F10X_PIN_NUMBERS 36 +#elif \ + defined(STM32F101CB)||\ + defined(STM32F102CB)||\ + defined(STM32F103C8)||\ + defined(STM32F103CB) +#define STM32F10X_PIN_NUMBERS 48 +#elif \ + defined(STM32F100RC)||\ + defined(STM32F100RD)||\ + defined(STM32F100RE)||\ + defined(STM32F101RB)||\ + defined(STM32F101RC)||\ + defined(STM32F101RD)||\ + defined(STM32F101RE)||\ + defined(STM32F101RF)||\ + defined(STM32F101RG)||\ + defined(STM32F102RB)||\ + defined(STM32F103R8)||\ + defined(STM32F103RB)||\ + defined(STM32F103RC)||\ + defined(STM32F103RD)||\ + defined(STM32F103RE)||\ + defined(STM32F103RF)||\ + defined(STM32F103RG)||\ + defined(STM32F105R8)||\ + defined(STM32F105RB)||\ + defined(STM32F105RC)||\ + defined(STM32F107RB)||\ + defined(STM32F107RC) +#define STM32F10X_PIN_NUMBERS 64 +#elif \ + defined(STM32F100VC)||\ + defined(STM32F100VD)||\ + defined(STM32F100VE)||\ + defined(STM32F101VB)||\ + defined(STM32F101VC)||\ + defined(STM32F101VD)||\ + defined(STM32F101VE)||\ + defined(STM32F101VF)||\ + defined(STM32F101VG)||\ + defined(STM32F103V8)||\ + defined(STM32F103VB)||\ + defined(STM32F103VC)||\ + defined(STM32F103VD)||\ + defined(STM32F103VE)||\ + defined(STM32F103VF)||\ + defined(STM32F103VG)||\ + defined(STM32F105V8)||\ + defined(STM32F105VB)||\ + defined(STM32F105VC)||\ + defined(STM32F107VB)||\ + defined(STM32F107VC) +#define STM32F10X_PIN_NUMBERS 100 +#elif \ + defined(STM32F100ZC)||\ + defined(STM32F100ZD)||\ + defined(STM32F100ZE)||\ + defined(STM32F101ZC)||\ + defined(STM32F101ZD)||\ + defined(STM32F101ZE)||\ + defined(STM32F101ZF)||\ + defined(STM32F101ZG)||\ + defined(STM32F103ZC)||\ + defined(STM32F103ZD)||\ + defined(STM32F103ZE)||\ + defined(STM32F103ZF)||\ + defined(STM32F103ZG) +#define STM32F10X_PIN_NUMBERS 144 +#endif + +#if \ + defined(STM32F100RC)||\ + defined(STM32F100VC)||\ + defined(STM32F100ZC) +#define STM32_SRAM_SIZE 24 +//#define STM32F100xE +#elif \ + defined(STM32F100RD)||\ + defined(STM32F100RE)||\ + defined(STM32F100VD)||\ + defined(STM32F100VE)||\ + defined(STM32F100ZD)||\ + defined(STM32F100ZE) +#define STM32_SRAM_SIZE 32 +//#define STM32F100xE +#elif \ + defined(STM32F101TB)||\ + defined(STM32F101CB)||\ + defined(STM32F101RB)||\ + defined(STM32F101VB) +#define STM32_SRAM_SIZE 16 +//#define STM32F101xB +#elif \ + defined(STM32F101RC)||\ + defined(STM32F101VC)||\ + defined(STM32F101ZC) +#define STM32_SRAM_SIZE 32 +//#define STM32F101xE +#elif \ + defined(STM32F101RD)||\ + defined(STM32F101RE)||\ + defined(STM32F101VD)||\ + defined(STM32F101VE)||\ + defined(STM32F101ZD)||\ + defined(STM32F101ZE) +#define STM32_SRAM_SIZE 48 +//#define STM32F101xE +#elif \ + defined(STM32F101RF)||\ + defined(STM32F101RG)||\ + defined(STM32F101VF)||\ + defined(STM32F101VG)||\ + defined(STM32F101ZF)||\ + defined(STM32F101ZG) +#define STM32_SRAM_SIZE 80 +//#define STM32F101xG +#elif \ + defined(STM32F102CB)||\ + defined(STM32F102RB) +#define STM32_SRAM_SIZE 16 +//#define STM32F102xB +#elif \ + defined(STM32F103T8)||\ + defined(STM32F103TB)||\ + defined(STM32F103C8)||\ + defined(STM32F103CB)||\ + defined(STM32F103R8)||\ + defined(STM32F103RB)||\ + defined(STM32F103V8)||\ + defined(STM32F103VB) +#define STM32_SRAM_SIZE 20 +//#define STM32F103xB +#elif \ + defined(STM32F103RC)||\ + defined(STM32F103VC)||\ + defined(STM32F103ZC) +#define STM32_SRAM_SIZE 48 +//#define STM32F103xE +#elif \ + defined(STM32F103RD)||\ + defined(STM32F103RE)||\ + defined(STM32F103VD)||\ + defined(STM32F103VE)||\ + defined(STM32F103ZD)||\ + defined(STM32F103ZE) +#define STM32_SRAM_SIZE 64 +//#define STM32F103xE +#elif \ + defined(STM32F103RF)||\ + defined(STM32F103RG)||\ + defined(STM32F103VF)||\ + defined(STM32F103VG)||\ + defined(STM32F103ZF)||\ + defined(STM32F103ZG) +#define STM32_SRAM_SIZE 96 +//#define STM32F103xG +#elif \ + defined(STM32F105R8)||\ + defined(STM32F105RB)||\ + defined(STM32F105RC)||\ + defined(STM32F105V8)||\ + defined(STM32F105VB)||\ + defined(STM32F105VC) +#define STM32_SRAM_SIZE 64 +//#define STM32F105xC +#elif \ + defined(STM32F107RB)||\ + defined(STM32F107RC)||\ + defined(STM32F107VB)||\ + defined(STM32F107VC) +#define STM32_SRAM_SIZE 64 +//#define STM32F107xC +#endif /* whether use board external SRAM memory */ // Use external SRAM memory on the board @@ -34,7 +212,7 @@ // Internal SRAM memory size[Kbytes] <8-64> // Default: 64 -#define STM32_SRAM_SIZE 20 + #define STM32_SRAM_END (0x20000000 + STM32_SRAM_SIZE * 1024) #ifdef __CC_ARM extern int Image$$RW_IRAM1$$ZI$$Limit; diff --git a/bsp/stm32f10x_HAL/drivers/drv_gpio.c b/bsp/stm32f10x_HAL/drivers/drv_gpio.c index 5c21b1b817896d08efa1de810b9b2e9fcb821b52..e0701e663b6e22887d56c471894dbd7790e6bea4 100644 --- a/bsp/stm32f10x_HAL/drivers/drv_gpio.c +++ b/bsp/stm32f10x_HAL/drivers/drv_gpio.c @@ -34,46 +34,50 @@ static void GPIOB_CLK_ENABLE(void) __HAL_RCC_GPIOB_CLK_ENABLE(); #endif } -static void GPIOC_CLK_ENABLE(void) -{ -#ifdef __HAL_RCC_GPIOC_CLK_ENABLE - __HAL_RCC_GPIOC_CLK_ENABLE(); -#endif -} -#if (STM32F10X_PIN_NUMBERS >48) +#if (STM32F10X_PIN_NUMBERS >36) + static void GPIOC_CLK_ENABLE(void) + { + #ifdef __HAL_RCC_GPIOC_CLK_ENABLE + __HAL_RCC_GPIOC_CLK_ENABLE(); + #endif + } + #if (STM32F10X_PIN_NUMBERS >48) -static void GPIOD_CLK_ENABLE(void) -{ -#ifdef __HAL_RCC_GPIOD_CLK_ENABLE - __HAL_RCC_GPIOD_CLK_ENABLE(); -#endif -} -#if (STM32F10X_PIN_NUMBERS >64) -static void GPIOE_CLK_ENABLE(void) -{ -#ifdef __HAL_RCC_GPIOE_CLK_ENABLE - __HAL_RCC_GPIOE_CLK_ENABLE(); -#endif -} -static void GPIOF_CLK_ENABLE(void) -{ -#ifdef __HAL_RCC_GPIOF_CLK_ENABLE - __HAL_RCC_GPIOF_CLK_ENABLE(); -#endif -} -static void GPIOG_CLK_ENABLE(void) -{ -#ifdef __HAL_RCC_GPIOG_CLK_ENABLE - __HAL_RCC_GPIOG_CLK_ENABLE(); -#endif -} -static void GPIOH_CLK_ENABLE(void) -{ -#ifdef __HAL_RCC_GPIOH_CLK_ENABLE - __HAL_RCC_GPIOH_CLK_ENABLE(); -#endif -} -#endif + static void GPIOD_CLK_ENABLE(void) + { + #ifdef __HAL_RCC_GPIOD_CLK_ENABLE + __HAL_RCC_GPIOD_CLK_ENABLE(); + #endif + } + #if (STM32F10X_PIN_NUMBERS >64) + static void GPIOE_CLK_ENABLE(void) + { + #ifdef __HAL_RCC_GPIOE_CLK_ENABLE + __HAL_RCC_GPIOE_CLK_ENABLE(); + #endif + } + #if (STM32F10X_PIN_NUMBERS >100) + static void GPIOF_CLK_ENABLE(void) + { + #ifdef __HAL_RCC_GPIOF_CLK_ENABLE + __HAL_RCC_GPIOF_CLK_ENABLE(); + #endif + } + static void GPIOG_CLK_ENABLE(void) + { + #ifdef __HAL_RCC_GPIOG_CLK_ENABLE + __HAL_RCC_GPIOG_CLK_ENABLE(); + #endif + } + static void GPIOH_CLK_ENABLE(void) + { + #ifdef __HAL_RCC_GPIOH_CLK_ENABLE + __HAL_RCC_GPIOH_CLK_ENABLE(); + #endif + } + #endif + #endif + #endif #endif /* STM32 GPIO driver */ struct pin_index @@ -86,6 +90,45 @@ struct pin_index static const struct pin_index pins[] = { +#if (STM32F10X_PIN_NUMBERS == 36) + __STM32_PIN_DEFAULT, + __STM32_PIN_DEFAULT, + __STM32_PIN_DEFAULT, + __STM32_PIN_DEFAULT, + __STM32_PIN_DEFAULT, + __STM32_PIN_DEFAULT, + __STM32_PIN_DEFAULT, + __STM32_PIN(7, A, 0), + __STM32_PIN(8, A, 1), + __STM32_PIN(9, A, 2), + __STM32_PIN(10, A, 3), + __STM32_PIN(11, A, 4), + __STM32_PIN(12, A, 5), + __STM32_PIN(13, A, 6), + __STM32_PIN(14, A, 7), + __STM32_PIN(15, B, 0), + __STM32_PIN(16, B, 1), + __STM32_PIN(17, B, 2), + __STM32_PIN_DEFAULT, + __STM32_PIN_DEFAULT, + __STM32_PIN(20, A, 8), + __STM32_PIN(21, A, 9), + __STM32_PIN(22, A, 10), + __STM32_PIN(23, A, 11), + __STM32_PIN(24, A, 12), + __STM32_PIN(25, A, 13), + __STM32_PIN_DEFAULT, + __STM32_PIN_DEFAULT, + __STM32_PIN(28, A, 14), + __STM32_PIN(29, A, 15), + __STM32_PIN(30, B, 3), + __STM32_PIN(31, B, 4), + __STM32_PIN(32, B, 5), + __STM32_PIN(33, B, 6), + __STM32_PIN(34, B, 7), + __STM32_PIN_DEFAULT, + __STM32_PIN_DEFAULT, +#endif #if (STM32F10X_PIN_NUMBERS == 48) __STM32_PIN_DEFAULT, __STM32_PIN_DEFAULT, diff --git a/bsp/stm32f10x_HAL/drivers/stm32f1xx_hal_conf.h b/bsp/stm32f10x_HAL/drivers/stm32f1xx_hal_conf.h index b47c772c3f757195547e77a1e549af7d453e4ea5..72b69a2e4b276e331d5d3f25ccaeeb6a3782ed09 100644 --- a/bsp/stm32f10x_HAL/drivers/stm32f1xx_hal_conf.h +++ b/bsp/stm32f10x_HAL/drivers/stm32f1xx_hal_conf.h @@ -101,6 +101,8 @@ * This value is used by the RCC HAL module to compute the system frequency * (when HSE is used as system clock source, directly or through the PLL). */ +#define HSE_VALUE ((unsigned int)RT_HSE_VALUE) + #if !defined (HSE_VALUE) #if defined(USE_STM3210C_EVAL) #define HSE_VALUE 25000000U /*!< Value of the External oscillator in Hz */ diff --git a/bsp/stm32f10x_HAL/project.uvoptx b/bsp/stm32f10x_HAL/project.uvoptx index d66f49fe277b59f83740e9ef2b34c27dc404a8cd..8c322741618962910ac52ab2bccb0798fda29c1e 100644 --- a/bsp/stm32f10x_HAL/project.uvoptx +++ b/bsp/stm32f10x_HAL/project.uvoptx @@ -28,7 +28,7 @@ 12000000 - 1 + 0 1 0 1 @@ -77,7 +77,7 @@ 0 1 - 0 + 18 0 1 @@ -174,7 +174,7 @@ - Drivers + Applications 0 0 0 @@ -186,55 +186,55 @@ 0 0 0 - drivers/board.c - board.c + applications\main.c + main.c 0 0 + + + + Drivers + 0 + 0 + 0 + 0 - 1 + 2 2 1 0 0 0 - drivers/stm32f1xx_it.c - stm32f1xx_it.c + drivers\board.c + board.c 0 0 - 1 + 2 3 1 0 0 0 - drivers/drv_gpio.c - drv_gpio.c + drivers\stm32f1xx_it.c + stm32f1xx_it.c 0 0 - 1 + 2 4 1 0 0 0 - drivers/drv_usart.c - drv_usart.c + drivers\drv_gpio.c + drv_gpio.c 0 0 - - - - STM32_HAL - 0 - 0 - 0 - 0 2 5 @@ -242,592 +242,592 @@ 0 0 0 - Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/system_stm32f1xx.c - system_stm32f1xx.c + drivers\drv_usart.c + drv_usart.c 0 0 + + + + STM32_HAL + 0 + 0 + 0 + 0 - 2 + 3 6 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c - stm32f1xx_hal_adc.c + Libraries\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c + system_stm32f1xx.c 0 0 - 2 + 3 7 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c - stm32f1xx_hal_adc_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_adc.c + stm32f1xx_hal_adc.c 0 0 - 2 + 3 8 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c - stm32f1xx_hal_gpio.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_adc_ex.c + stm32f1xx_hal_adc_ex.c 0 0 - 2 + 3 9 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c - stm32f1xx_hal_gpio_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c + stm32f1xx_hal_gpio.c 0 0 - 2 + 3 10 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c - stm32f1xx_hal_flash.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c + stm32f1xx_hal_gpio_ex.c 0 0 - 2 + 3 11 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c - stm32f1xx_hal_flash_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash.c + stm32f1xx_hal_flash.c 0 0 - 2 + 3 12 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c - stm32f1xx_hal_dma.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash_ex.c + stm32f1xx_hal_flash_ex.c 0 0 - 2 + 3 13 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c - stm32f1xx_hal_cortex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c + stm32f1xx_hal_dma.c 0 0 - 2 + 3 14 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_crc.c - stm32f1xx_hal_crc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c + stm32f1xx_hal_cortex.c 0 0 - 2 + 3 15 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c - stm32f1xx_hal_i2c.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c + stm32f1xx_hal_crc.c 0 0 - 2 + 3 16 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_irda.c - stm32f1xx_hal_irda.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_i2c.c + stm32f1xx_hal_i2c.c 0 0 - 2 + 3 17 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c - stm32f1xx_hal_iwdg.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_irda.c + stm32f1xx_hal_irda.c 0 0 - 2 + 3 18 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c - stm32f1xx_hal_pwr.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_iwdg.c + stm32f1xx_hal_iwdg.c 0 0 - 2 + 3 19 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c - stm32f1xx_hal_rcc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c + stm32f1xx_hal_pwr.c 0 0 - 2 + 3 20 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c - stm32f1xx_hal_rcc_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c + stm32f1xx_hal_rcc.c 0 0 - 2 + 3 21 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c - stm32f1xx_hal_rtc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c + stm32f1xx_hal_rcc_ex.c 0 0 - 2 + 3 22 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.c - stm32f1xx_hal_rtc_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rtc.c + stm32f1xx_hal_rtc.c 0 0 - 2 + 3 23 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_smartcard.c - stm32f1xx_hal_smartcard.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rtc_ex.c + stm32f1xx_hal_rtc_ex.c 0 0 - 2 + 3 24 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c - stm32f1xx_hal_spi.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_smartcard.c + stm32f1xx_hal_smartcard.c 0 0 - 2 + 3 25 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi_ex.c - stm32f1xx_hal_spi_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_spi.c + stm32f1xx_hal_spi.c 0 0 - 2 + 3 26 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c - stm32f1xx_hal_tim.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_spi_ex.c + stm32f1xx_hal_spi_ex.c 0 0 - 2 + 3 27 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c - stm32f1xx_hal_tim_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim.c + stm32f1xx_hal_tim.c 0 0 - 2 + 3 28 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c - stm32f1xx_hal_uart.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim_ex.c + stm32f1xx_hal_tim_ex.c 0 0 - 2 + 3 29 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_usart.c - stm32f1xx_hal_usart.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c + stm32f1xx_hal_uart.c 0 0 - 2 + 3 30 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_wwdg.c - stm32f1xx_hal_wwdg.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c + stm32f1xx_hal_usart.c 0 0 - 2 + 3 31 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c - stm32f1xx_hal.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_wwdg.c + stm32f1xx_hal_wwdg.c 0 0 - 2 + 3 32 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_adc.c - stm32f1xx_ll_adc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c + stm32f1xx_hal.c 0 0 - 2 + 3 33 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_crc.c - stm32f1xx_ll_crc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_adc.c + stm32f1xx_ll_adc.c 0 0 - 2 + 3 34 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_dac.c - stm32f1xx_ll_dac.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_crc.c + stm32f1xx_ll_crc.c 0 0 - 2 + 3 35 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_dma.c - stm32f1xx_ll_dma.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_dac.c + stm32f1xx_ll_dac.c 0 0 - 2 + 3 36 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_exti.c - stm32f1xx_ll_exti.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_dma.c + stm32f1xx_ll_dma.c 0 0 - 2 + 3 37 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_fsmc.c - stm32f1xx_ll_fsmc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_exti.c + stm32f1xx_ll_exti.c 0 0 - 2 + 3 38 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_gpio.c - stm32f1xx_ll_gpio.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_fsmc.c + stm32f1xx_ll_fsmc.c 0 0 - 2 + 3 39 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_i2c.c - stm32f1xx_ll_i2c.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_gpio.c + stm32f1xx_ll_gpio.c 0 0 - 2 + 3 40 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_pwr.c - stm32f1xx_ll_pwr.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_i2c.c + stm32f1xx_ll_i2c.c 0 0 - 2 + 3 41 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_rcc.c - stm32f1xx_ll_rcc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_pwr.c + stm32f1xx_ll_pwr.c 0 0 - 2 + 3 42 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_rtc.c - stm32f1xx_ll_rtc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_rcc.c + stm32f1xx_ll_rcc.c 0 0 - 2 + 3 43 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_sdmmc.c - stm32f1xx_ll_sdmmc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_rtc.c + stm32f1xx_ll_rtc.c 0 0 - 2 + 3 44 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_spi.c - stm32f1xx_ll_spi.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_sdmmc.c + stm32f1xx_ll_sdmmc.c 0 0 - 2 + 3 45 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_tim.c - stm32f1xx_ll_tim.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_spi.c + stm32f1xx_ll_spi.c 0 0 - 2 + 3 46 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usart.c - stm32f1xx_ll_usart.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_tim.c + stm32f1xx_ll_tim.c 0 0 - 2 + 3 47 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c - stm32f1xx_ll_usb.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_usart.c + stm32f1xx_ll_usart.c 0 0 - 2 + 3 48 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_utils.c - stm32f1xx_ll_utils.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_usb.c + stm32f1xx_ll_usb.c 0 0 - 2 + 3 49 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c - stm32f1xx_hal_can.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_utils.c + stm32f1xx_ll_utils.c 0 0 - 2 + 3 50 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c - stm32f1xx_hal_pcd.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_can.c + stm32f1xx_hal_can.c 0 0 - 2 + 3 51 1 0 0 0 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c - stm32f1xx_hal_pcd_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pcd.c + stm32f1xx_hal_pcd.c 0 0 - 2 + 3 52 - 2 + 1 0 0 0 - Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xb.s - startup_stm32f103xb.s + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pcd_ex.c + stm32f1xx_hal_pcd_ex.c 0 0 - - - - Applications - 0 - 0 - 0 - 0 3 53 - 1 + 2 0 0 0 - applications/main.c - main.c + Libraries\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xb.s + startup_stm32f103xb.s 0 0 @@ -846,7 +846,7 @@ 0 0 0 - ../../src/clock.c + ..\..\src\clock.c clock.c 0 0 @@ -858,7 +858,7 @@ 0 0 0 - ../../src/components.c + ..\..\src\components.c components.c 0 0 @@ -870,7 +870,7 @@ 0 0 0 - ../../src/device.c + ..\..\src\device.c device.c 0 0 @@ -882,7 +882,7 @@ 0 0 0 - ../../src/idle.c + ..\..\src\idle.c idle.c 0 0 @@ -894,7 +894,7 @@ 0 0 0 - ../../src/ipc.c + ..\..\src\ipc.c ipc.c 0 0 @@ -906,7 +906,7 @@ 0 0 0 - ../../src/irq.c + ..\..\src\irq.c irq.c 0 0 @@ -918,7 +918,7 @@ 0 0 0 - ../../src/kservice.c + ..\..\src\kservice.c kservice.c 0 0 @@ -930,7 +930,7 @@ 0 0 0 - ../../src/mem.c + ..\..\src\mem.c mem.c 0 0 @@ -942,7 +942,7 @@ 0 0 0 - ../../src/memheap.c + ..\..\src\memheap.c memheap.c 0 0 @@ -954,7 +954,7 @@ 0 0 0 - ../../src/mempool.c + ..\..\src\mempool.c mempool.c 0 0 @@ -966,7 +966,7 @@ 0 0 0 - ../../src/object.c + ..\..\src\object.c object.c 0 0 @@ -978,7 +978,7 @@ 0 0 0 - ../../src/scheduler.c + ..\..\src\scheduler.c scheduler.c 0 0 @@ -990,7 +990,7 @@ 0 0 0 - ../../src/signal.c + ..\..\src\signal.c signal.c 0 0 @@ -1002,7 +1002,7 @@ 0 0 0 - ../../src/thread.c + ..\..\src\thread.c thread.c 0 0 @@ -1014,7 +1014,7 @@ 0 0 0 - ../../src/timer.c + ..\..\src\timer.c timer.c 0 0 @@ -1034,7 +1034,7 @@ 0 0 0 - ../../libcpu/arm/cortex-m3/cpuport.c + ..\..\libcpu\arm\cortex-m3\cpuport.c cpuport.c 0 0 @@ -1046,7 +1046,7 @@ 0 0 0 - ../../libcpu/arm/cortex-m3/context_rvds.S + ..\..\libcpu\arm\cortex-m3\context_rvds.S context_rvds.S 0 0 @@ -1058,7 +1058,7 @@ 0 0 0 - ../../libcpu/arm/common/backtrace.c + ..\..\libcpu\arm\common\backtrace.c backtrace.c 0 0 @@ -1070,7 +1070,7 @@ 0 0 0 - ../../libcpu/arm/common/div0.c + ..\..\libcpu\arm\common\div0.c div0.c 0 0 @@ -1082,7 +1082,7 @@ 0 0 0 - ../../libcpu/arm/common/showmem.c + ..\..\libcpu\arm\common\showmem.c showmem.c 0 0 @@ -1102,7 +1102,7 @@ 0 0 0 - ../../components/drivers/misc/pin.c + ..\..\components\drivers\misc\pin.c pin.c 0 0 @@ -1114,7 +1114,7 @@ 0 0 0 - ../../components/drivers/serial/serial.c + ..\..\components\drivers\serial\serial.c serial.c 0 0 @@ -1126,7 +1126,7 @@ 0 0 0 - ../../components/drivers/src/completion.c + ..\..\components\drivers\src\completion.c completion.c 0 0 @@ -1138,7 +1138,7 @@ 0 0 0 - ../../components/drivers/src/dataqueue.c + ..\..\components\drivers\src\dataqueue.c dataqueue.c 0 0 @@ -1150,7 +1150,7 @@ 0 0 0 - ../../components/drivers/src/pipe.c + ..\..\components\drivers\src\pipe.c pipe.c 0 0 @@ -1162,7 +1162,7 @@ 0 0 0 - ../../components/drivers/src/ringbuffer.c + ..\..\components\drivers\src\ringbuffer.c ringbuffer.c 0 0 @@ -1174,7 +1174,7 @@ 0 0 0 - ../../components/drivers/src/waitqueue.c + ..\..\components\drivers\src\waitqueue.c waitqueue.c 0 0 @@ -1186,7 +1186,7 @@ 0 0 0 - ../../components/drivers/src/workqueue.c + ..\..\components\drivers\src\workqueue.c workqueue.c 0 0 @@ -1206,7 +1206,7 @@ 0 0 0 - ../../components/finsh/shell.c + ..\..\components\finsh\shell.c shell.c 0 0 @@ -1218,7 +1218,7 @@ 0 0 0 - ../../components/finsh/symbol.c + ..\..\components\finsh\symbol.c symbol.c 0 0 @@ -1230,7 +1230,7 @@ 0 0 0 - ../../components/finsh/cmd.c + ..\..\components\finsh\cmd.c cmd.c 0 0 @@ -1242,7 +1242,7 @@ 0 0 0 - ../../components/finsh/msh.c + ..\..\components\finsh\msh.c msh.c 0 0 @@ -1254,7 +1254,7 @@ 0 0 0 - ../../components/finsh/msh_cmd.c + ..\..\components\finsh\msh_cmd.c msh_cmd.c 0 0 @@ -1266,7 +1266,7 @@ 0 0 0 - ../../components/finsh/msh_file.c + ..\..\components\finsh\msh_file.c msh_file.c 0 0 diff --git a/bsp/stm32f10x_HAL/project.uvprojx b/bsp/stm32f10x_HAL/project.uvprojx index 67e26a0566b73e681aa4a9257cbb3838cd8f9cc9..440aa1b97ee44ffbe952d96a42de9f8a05f7c4ef 100644 --- a/bsp/stm32f10x_HAL/project.uvprojx +++ b/bsp/stm32f10x_HAL/project.uvprojx @@ -336,7 +336,7 @@ STM32F103xB, USE_HAL_DRIVER - drivers;Libraries/CMSIS/Device/ST/STM32F1xx/Include;Libraries/STM32F1xx_HAL_Driver/Inc;Libraries/CMSIS/Include;applications;.;../../include;../../libcpu/arm/cortex-m3;../../libcpu/arm/common;../../components/drivers/include;../../components/drivers/include;../../components/drivers/include;../../components/finsh + applications;.;drivers;Libraries\CMSIS\Device\ST\STM32F1xx\Include;Libraries\STM32F1xx_HAL_Driver\Inc;Libraries\CMSIS\Include;..\..\include;..\..\libcpu\arm\cortex-m3;..\..\libcpu\arm\common;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh @@ -377,28 +377,38 @@ + + Applications + + + main.c + 1 + applications\main.c + + + Drivers board.c 1 - drivers/board.c + drivers\board.c stm32f1xx_it.c 1 - drivers/stm32f1xx_it.c + drivers\stm32f1xx_it.c drv_gpio.c 1 - drivers/drv_gpio.c + drivers\drv_gpio.c drv_usart.c 1 - drivers/drv_usart.c + drivers\drv_usart.c @@ -408,252 +418,242 @@ system_stm32f1xx.c 1 - Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/system_stm32f1xx.c + Libraries\CMSIS\Device\ST\STM32F1xx\Source\Templates\system_stm32f1xx.c stm32f1xx_hal_adc.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_adc.c stm32f1xx_hal_adc_ex.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_adc_ex.c stm32f1xx_hal_gpio.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c stm32f1xx_hal_gpio_ex.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c stm32f1xx_hal_flash.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash.c stm32f1xx_hal_flash_ex.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash_ex.c stm32f1xx_hal_dma.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c stm32f1xx_hal_cortex.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c stm32f1xx_hal_crc.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_crc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_crc.c stm32f1xx_hal_i2c.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_i2c.c stm32f1xx_hal_irda.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_irda.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_irda.c stm32f1xx_hal_iwdg.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_iwdg.c stm32f1xx_hal_pwr.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c stm32f1xx_hal_rcc.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c stm32f1xx_hal_rcc_ex.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c stm32f1xx_hal_rtc.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rtc.c stm32f1xx_hal_rtc_ex.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rtc_ex.c stm32f1xx_hal_smartcard.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_smartcard.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_smartcard.c stm32f1xx_hal_spi.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_spi.c stm32f1xx_hal_spi_ex.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_spi_ex.c stm32f1xx_hal_tim.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim.c stm32f1xx_hal_tim_ex.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim_ex.c stm32f1xx_hal_uart.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_uart.c stm32f1xx_hal_usart.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_usart.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_usart.c stm32f1xx_hal_wwdg.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_wwdg.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_wwdg.c stm32f1xx_hal.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c stm32f1xx_ll_adc.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_adc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_adc.c stm32f1xx_ll_crc.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_crc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_crc.c stm32f1xx_ll_dac.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_dac.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_dac.c stm32f1xx_ll_dma.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_dma.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_dma.c stm32f1xx_ll_exti.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_exti.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_exti.c stm32f1xx_ll_fsmc.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_fsmc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_fsmc.c stm32f1xx_ll_gpio.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_gpio.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_gpio.c stm32f1xx_ll_i2c.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_i2c.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_i2c.c stm32f1xx_ll_pwr.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_pwr.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_pwr.c stm32f1xx_ll_rcc.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_rcc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_rcc.c stm32f1xx_ll_rtc.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_rtc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_rtc.c stm32f1xx_ll_sdmmc.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_sdmmc.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_sdmmc.c stm32f1xx_ll_spi.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_spi.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_spi.c stm32f1xx_ll_tim.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_tim.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_tim.c stm32f1xx_ll_usart.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usart.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_usart.c stm32f1xx_ll_usb.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_usb.c stm32f1xx_ll_utils.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_utils.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_ll_utils.c stm32f1xx_hal_can.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_can.c stm32f1xx_hal_pcd.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pcd.c stm32f1xx_hal_pcd_ex.c 1 - Libraries/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c + Libraries\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pcd_ex.c startup_stm32f103xb.s 2 - Libraries/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xb.s - - - - - Applications - - - main.c - 1 - applications/main.c + Libraries\CMSIS\Device\ST\STM32F1xx\Source\Templates\arm\startup_stm32f103xb.s @@ -663,77 +663,77 @@ clock.c 1 - ../../src/clock.c + ..\..\src\clock.c components.c 1 - ../../src/components.c + ..\..\src\components.c device.c 1 - ../../src/device.c + ..\..\src\device.c idle.c 1 - ../../src/idle.c + ..\..\src\idle.c ipc.c 1 - ../../src/ipc.c + ..\..\src\ipc.c irq.c 1 - ../../src/irq.c + ..\..\src\irq.c kservice.c 1 - ../../src/kservice.c + ..\..\src\kservice.c mem.c 1 - ../../src/mem.c + ..\..\src\mem.c memheap.c 1 - ../../src/memheap.c + ..\..\src\memheap.c mempool.c 1 - ../../src/mempool.c + ..\..\src\mempool.c object.c 1 - ../../src/object.c + ..\..\src\object.c scheduler.c 1 - ../../src/scheduler.c + ..\..\src\scheduler.c signal.c 1 - ../../src/signal.c + ..\..\src\signal.c thread.c 1 - ../../src/thread.c + ..\..\src\thread.c timer.c 1 - ../../src/timer.c + ..\..\src\timer.c @@ -743,27 +743,27 @@ cpuport.c 1 - ../../libcpu/arm/cortex-m3/cpuport.c + ..\..\libcpu\arm\cortex-m3\cpuport.c context_rvds.S 2 - ../../libcpu/arm/cortex-m3/context_rvds.S + ..\..\libcpu\arm\cortex-m3\context_rvds.S backtrace.c 1 - ../../libcpu/arm/common/backtrace.c + ..\..\libcpu\arm\common\backtrace.c div0.c 1 - ../../libcpu/arm/common/div0.c + ..\..\libcpu\arm\common\div0.c showmem.c 1 - ../../libcpu/arm/common/showmem.c + ..\..\libcpu\arm\common\showmem.c @@ -773,42 +773,42 @@ pin.c 1 - ../../components/drivers/misc/pin.c + ..\..\components\drivers\misc\pin.c serial.c 1 - ../../components/drivers/serial/serial.c + ..\..\components\drivers\serial\serial.c completion.c 1 - ../../components/drivers/src/completion.c + ..\..\components\drivers\src\completion.c dataqueue.c 1 - ../../components/drivers/src/dataqueue.c + ..\..\components\drivers\src\dataqueue.c pipe.c 1 - ../../components/drivers/src/pipe.c + ..\..\components\drivers\src\pipe.c ringbuffer.c 1 - ../../components/drivers/src/ringbuffer.c + ..\..\components\drivers\src\ringbuffer.c waitqueue.c 1 - ../../components/drivers/src/waitqueue.c + ..\..\components\drivers\src\waitqueue.c workqueue.c 1 - ../../components/drivers/src/workqueue.c + ..\..\components\drivers\src\workqueue.c @@ -818,32 +818,32 @@ shell.c 1 - ../../components/finsh/shell.c + ..\..\components\finsh\shell.c symbol.c 1 - ../../components/finsh/symbol.c + ..\..\components\finsh\symbol.c cmd.c 1 - ../../components/finsh/cmd.c + ..\..\components\finsh\cmd.c msh.c 1 - ../../components/finsh/msh.c + ..\..\components\finsh\msh.c msh_cmd.c 1 - ../../components/finsh/msh_cmd.c + ..\..\components\finsh\msh_cmd.c msh_file.c 1 - ../../components/finsh/msh_file.c + ..\..\components\finsh\msh_file.c diff --git a/bsp/stm32f10x_HAL/rtconfig.h b/bsp/stm32f10x_HAL/rtconfig.h index 9dffe5d697f30df9dd2f9aad4976dfd9fb539384..c3ac9c004219bf4802b6881bde23804d4f9b039b 100644 --- a/bsp/stm32f10x_HAL/rtconfig.h +++ b/bsp/stm32f10x_HAL/rtconfig.h @@ -90,6 +90,9 @@ /* RT_USING_SDIO is not set */ /* RT_USING_SPI is not set */ /* RT_USING_WDT is not set */ + +/* Using USB */ + /* RT_USING_USB_HOST is not set */ /* RT_USING_USB_DEVICE is not set */ @@ -149,9 +152,83 @@ /* miscellaneous packages */ /* PKG_USING_HELLO is not set */ - -/* BSP_SPECIAL CONFIG */ - +/* STM32F100C8 is not set */ +/* STM32F100CB is not set */ +/* STM32F100R8 is not set */ +/* STM32F100RB is not set */ +/* STM32F100RC is not set */ +/* STM32F100RD is not set */ +/* STM32F100RE is not set */ +/* STM32F100V8 is not set */ +/* STM32F100VB is not set */ +/* STM32F100VC is not set */ +/* STM32F100VD is not set */ +/* STM32F100VE is not set */ +/* STM32F100ZC is not set */ +/* STM32F100ZD is not set */ +/* STM32F100ZE is not set */ +/* STM32F101C8 is not set */ +/* STM32F101CB is not set */ +/* STM32F101R8 is not set */ +/* STM32F101RB is not set */ +/* STM32F101RC is not set */ +/* STM32F101RD is not set */ +/* STM32F101RE is not set */ +/* STM32F101RF is not set */ +/* STM32F101RG is not set */ +/* STM32F101T8 is not set */ +/* STM32F101TB is not set */ +/* STM32F101V8 is not set */ +/* STM32F101VB is not set */ +/* STM32F101VC is not set */ +/* STM32F101VD is not set */ +/* STM32F101VE is not set */ +/* STM32F101VF is not set */ +/* STM32F101VG is not set */ +/* STM32F101ZC is not set */ +/* STM32F101ZD is not set */ +/* STM32F101ZE is not set */ +/* STM32F101ZF is not set */ +/* STM32F101ZG is not set */ +/* STM32F102C8 is not set */ +/* STM32F102CB is not set */ +/* STM32F102R8 is not set */ +/* STM32F102RB is not set */ +/* STM32F103C8 is not set */ +/* STM32F103CB is not set */ +/* STM32F103R8 is not set */ +#define STM32F103RB +/* STM32F103RC is not set */ +/* STM32F103RD is not set */ +/* STM32F103RE is not set */ +/* STM32F103RF is not set */ +/* STM32F103RG is not set */ +/* STM32F103T8 is not set */ +/* STM32F103TB is not set */ +/* STM32F103V8 is not set */ +/* STM32F103VB is not set */ +/* STM32F103VC is not set */ +/* STM32F103VD is not set */ +/* STM32F103VE is not set */ +/* STM32F103VF is not set */ +/* STM32F103VG is not set */ +/* STM32F103ZC is not set */ +/* STM32F103ZD is not set */ +/* STM32F103ZE is not set */ +/* STM32F103ZF is not set */ +/* STM32F103ZG is not set */ +/* STM32F105R8 is not set */ +/* STM32F105RB is not set */ +/* STM32F105RC is not set */ +/* STM32F105V8 is not set */ +/* STM32F105VB is not set */ +/* STM32F105VC is not set */ +/* STM32F107RB is not set */ +/* STM32F107RC is not set */ +/* STM32F107VB is not set */ +/* STM32F107VC is not set */ +/* RT_USING_HSI is not set */ +#define RT_HSE_VALUE 8000000 #define STM32F10X_PIN_NUMBERS 64 /* RT_USING_UART1 is not set */ #define RT_USING_UART2 diff --git a/bsp/stm32f10x_HAL/rtconfig.py b/bsp/stm32f10x_HAL/rtconfig.py index 01cdaf8fb7ec8aca53d5da02cd61ed60312d3962..87ab8293b0ca78cd3d674f2866c257b2082d4132 100644 --- a/bsp/stm32f10x_HAL/rtconfig.py +++ b/bsp/stm32f10x_HAL/rtconfig.py @@ -8,27 +8,6 @@ CROSS_TOOL='gcc' if os.getenv('RTT_CC'): CROSS_TOOL = os.getenv('RTT_CC') -#device options -# STM32_TYPE = -# 'STM32F100xB' -# 'STM32F100xE' -# 'STM32F101x6' -# 'STM32F101xB' -# 'STM32F101xE' -# 'STM32F101xG' -# 'STM32F102x6' -# 'STM32F102xB' -# 'STM32F103x6' -# 'STM32F103xB' -# 'STM32F103xE' -# 'STM32F103xG' -# 'STM32F105xC' -# 'STM32F107xC' -STM32_TYPE = 'STM32F103xB' - -# lcd panel options -# 'FMT0371','ILI932X', 'SSD1289' -RT_USING_LCD_TYPE = 'SSD1289' # cross_tool provides the cross compiler # EXEC_PATH is the compiler execute path, for example, CodeSourcery, Keil MDK, IAR @@ -38,7 +17,7 @@ if CROSS_TOOL == 'gcc': EXEC_PATH = '/usr/local/gcc-arm-none-eabi-5_4-2016q3/bin/' elif CROSS_TOOL == 'keil': PLATFORM = 'armcc' - EXEC_PATH = 'C:/Keil' + EXEC_PATH = 'C:/Keilv5' elif CROSS_TOOL == 'iar': PLATFORM = 'iar' IAR_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench 6.0 Evaluation' @@ -111,7 +90,7 @@ elif PLATFORM == 'iar': LINK = 'ilinkarm' TARGET_EXT = 'out' - DEVICE = ' -D USE_STDPERIPH_DRIVER' + ' -D STM32F10X_HD' + DEVICE = ' -D USE_HAL_DRIVER' CFLAGS = DEVICE CFLAGS += ' --diag_suppress Pa050' diff --git a/bsp/stm32f10x_HAL/stm32_rom.sct b/bsp/stm32f10x_HAL/stm32_rom.sct deleted file mode 100644 index f67cd68761e812f27e537c403f9d3af7b4cdeb5d..0000000000000000000000000000000000000000 --- a/bsp/stm32f10x_HAL/stm32_rom.sct +++ /dev/null @@ -1,15 +0,0 @@ -; ************************************************************* -; *** Scatter-Loading Description File generated by uVision *** -; ************************************************************* - -LR_IROM1 0x08000000 0x00020000 { ; load region size_region - ER_IROM1 0x08000000 0x00020000 { ; load address = execution address - *.o (RESET, +First) - *(InRoot$$Sections) - .ANY (+RO) - } - RW_IRAM1 0x20000000 0x00005000 { ; RW data - .ANY (+RW +ZI) - } -} -