From 8e92d58be68b6aad39cb00551f27989742e17e1a Mon Sep 17 00:00:00 2001 From: Lyon Date: Sat, 10 Sep 2022 21:32:09 +0800 Subject: [PATCH] v1.10.0 for f103rc --- bsp/stm32f103rc/MDK-ARM/stm32f103rc.uvprojx | 416 ++++++++++++++------ bsp/stm32f103rc/pikascript/requestment.txt | 8 +- 2 files changed, 302 insertions(+), 122 deletions(-) diff --git a/bsp/stm32f103rc/MDK-ARM/stm32f103rc.uvprojx b/bsp/stm32f103rc/MDK-ARM/stm32f103rc.uvprojx index a6e2c0a11..935f42ad2 100644 --- a/bsp/stm32f103rc/MDK-ARM/stm32f103rc.uvprojx +++ b/bsp/stm32f103rc/MDK-ARM/stm32f103rc.uvprojx @@ -10,14 +10,13 @@ stm32f103rc 0x4 ARM-ADS - 6160000::V6.16::ARMCLANG - 6160000::V6.16::ARMCLANG + 6180000::V6.18::ARMCLANG 1 STM32F103RC STMicroelectronics - Keil.STM32F1xx_DFP.2.3.0 + Keil.STM32F1xx_DFP.2.4.0 http://www.keil.com/pack/ IRAM(0x20000000-0x2000BFFF) IROM(0x8000000-0x803FFFF) CLOCK(8000000) CPUTYPE("Cortex-M3") TZ @@ -187,6 +186,7 @@ 0 0 0 + 0 0 0 8 @@ -340,7 +340,7 @@ -Wno-error=armcc-pragma-import -Wno-error=armcc-pragma-arm USE_HAL_DRIVER,STM32F103xE - ../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;..\Booter;..\pikascript\pikascript-core;..\pikascript\pikascript-api;..\pikascript\pikascript-lib\STM32F1 + ../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;..\Booter;..\pikascript\pikascript-lib/PikaStdDevice;..\pikascript\pikascript-lib/STM32F1;..\pikascript\pikascript-lib/PikaStdLib;..\pikascript\pikascript-api;..\pikascript\pikascript-core @@ -609,185 +609,365 @@ 1 ..\pikascript\pikascript-core\TinyObj.c + + PikaCompiler.c + 1 + ..\pikascript\pikascript-core\PikaCompiler.c + pikascript-lib - PikaStdLib_MemChecker.c + PikaStdDevice_IIC.c 1 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_MemChecker.c - - - PikaStdLib_SysObj.c - 1 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_SysObj.c - - - STM32F1_common.c - 1 - ..\pikascript\pikascript-lib\STM32F1\STM32F1_common.c - - - STM32F1_GPIO.c - 1 - ..\pikascript\pikascript-lib\STM32F1\STM32F1_GPIO.c - - - STM32F1_Time.c - 1 - ..\pikascript\pikascript-lib\STM32F1\STM32F1_Time.c + ..\pikascript\pikascript-lib/PikaStdDevice/PikaStdDevice_IIC.c PikaStdDevice_ADC.c 1 - ..\pikascript\pikascript-lib\PikaStdDevice\PikaStdDevice_ADC.c + ..\pikascript\pikascript-lib/PikaStdDevice/PikaStdDevice_ADC.c + + + PikaStdDevice_BaseDev.c + 1 + ..\pikascript\pikascript-lib/PikaStdDevice/PikaStdDevice_BaseDev.c PikaStdDevice_GPIO.c 1 - ..\pikascript\pikascript-lib\PikaStdDevice\PikaStdDevice_GPIO.c + ..\pikascript\pikascript-lib/PikaStdDevice/PikaStdDevice_GPIO.c - PikaStdDevice_IIC.c + PikaStdDevice_CAN.c 1 - ..\pikascript\pikascript-lib\PikaStdDevice\PikaStdDevice_IIC.c - - - PikaStdDevice_PWM.c - 1 - ..\pikascript\pikascript-lib\PikaStdDevice\PikaStdDevice_PWM.c + ..\pikascript\pikascript-lib/PikaStdDevice/PikaStdDevice_CAN.c PikaStdDevice_Time.c 1 - ..\pikascript\pikascript-lib\PikaStdDevice\PikaStdDevice_Time.c + ..\pikascript\pikascript-lib/PikaStdDevice/PikaStdDevice_Time.c PikaStdDevice_UART.c 1 - ..\pikascript\pikascript-lib\PikaStdDevice\PikaStdDevice_UART.c + ..\pikascript\pikascript-lib/PikaStdDevice/PikaStdDevice_UART.c - STM32F1_ADC.c + PikaStdDevice_PWM.c 1 - ..\pikascript\pikascript-lib\STM32F1\STM32F1_ADC.c + ..\pikascript\pikascript-lib/PikaStdDevice/PikaStdDevice_PWM.c - STM32F1_IIC.c + PikaStdDevice_SPI.c 1 - ..\pikascript\pikascript-lib\STM32F1\STM32F1_IIC.c + ..\pikascript\pikascript-lib/PikaStdDevice/PikaStdDevice_SPI.c STM32F1_PWM.c 1 - ..\pikascript\pikascript-lib\STM32F1\STM32F1_PWM.c + ..\pikascript\pikascript-lib/STM32F1/STM32F1_PWM.c + + + STM32F1_ADC.c + 1 + ..\pikascript\pikascript-lib/STM32F1/STM32F1_ADC.c + + + STM32F1_IIC.c + 1 + ..\pikascript\pikascript-lib/STM32F1/STM32F1_IIC.c + + + STM32F1_Time.c + 1 + ..\pikascript\pikascript-lib/STM32F1/STM32F1_Time.c + + + STM32F1_common.c + 1 + ..\pikascript\pikascript-lib/STM32F1/STM32F1_common.c + + + STM32F1_GPIO.c + 1 + ..\pikascript\pikascript-lib/STM32F1/STM32F1_GPIO.c STM32F1_UART.c 1 - ..\pikascript\pikascript-lib\STM32F1\STM32F1_UART.c + ..\pikascript\pikascript-lib/STM32F1/STM32F1_UART.c + + + PikaStdLib_RangeObj.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdLib_RangeObj.c + + + PikaStdData_Dict.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdData_Dict.c + + + PikaStdTask_Task.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdTask_Task.c + + + PikaStdLib_StringObj.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdLib_StringObj.c + + + PikaStdData_Tuple.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdData_Tuple.c + + + PikaStdLib_MemChecker.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdLib_MemChecker.c + + + PikaDebuger_Debuger.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaDebuger_Debuger.c + + + PikaStdData_ByteArray.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdData_ByteArray.c + + + PikaStdData_String.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdData_String.c + + + PikaStdData_Utils.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdData_Utils.c + + + PikaStdData_List.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdData_List.c + + + PikaStdLib_SysObj.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdLib_SysObj.c + + + PikaStdData_FILEIO.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdData_FILEIO.c pikascript-api - - PikaMain-api.c - 1 - ..\pikascript\pikascript-api\PikaMain-api.c - - - pikaScript.c - 1 - ..\pikascript\pikascript-api\pikaScript.c - - - PikaStdLib_MemChecker-api.c - 1 - ..\pikascript\pikascript-api\PikaStdLib_MemChecker-api.c - - - PikaStdLib_SysObj-api.c - 1 - ..\pikascript\pikascript-api\PikaStdLib_SysObj-api.c - - - PikaStdLib-api.c - 1 - ..\pikascript\pikascript-api\PikaStdLib-api.c - - - PikaStdDevice_ADC-api.c - 1 - ..\pikascript\pikascript-api\PikaStdDevice_ADC-api.c - - - PikaStdDevice_GPIO-api.c - 1 - ..\pikascript\pikascript-api\PikaStdDevice_GPIO-api.c - - - PikaStdDevice_IIC-api.c - 1 - ..\pikascript\pikascript-api\PikaStdDevice_IIC-api.c - - - PikaStdDevice_PWM-api.c - 1 - ..\pikascript\pikascript-api\PikaStdDevice_PWM-api.c - - - PikaStdDevice_Time-api.c - 1 - ..\pikascript\pikascript-api\PikaStdDevice_Time-api.c - - - PikaStdDevice_UART-api.c - 1 - ..\pikascript\pikascript-api\PikaStdDevice_UART-api.c - - - STM32F1_GPIO-api.c - 1 - ..\pikascript\pikascript-api\STM32F1_GPIO-api.c - STM32F1_lowLevel-api.c 1 - ..\pikascript\pikascript-api\STM32F1_lowLevel-api.c - - - STM32F1_Time-api.c - 1 - ..\pikascript\pikascript-api\STM32F1_Time-api.c - - - STM32F1-api.c - 1 - ..\pikascript\pikascript-api\STM32F1-api.c + ..\pikascript\pikascript-api/STM32F1_lowLevel-api.c STM32F1_ADC-api.c 1 - ..\pikascript\pikascript-api\STM32F1_ADC-api.c + ..\pikascript\pikascript-api/STM32F1_ADC-api.c + + + PikaStdData_FILEIO-api.c + 1 + ..\pikascript\pikascript-api/PikaStdData_FILEIO-api.c + + + PikaStdLib-api.c + 1 + ..\pikascript\pikascript-api/PikaStdLib-api.c + + + PikaStdDevice_CAN-api.c + 1 + ..\pikascript\pikascript-api/PikaStdDevice_CAN-api.c + + + PikaStdDevice_BaseDev-api.c + 1 + ..\pikascript\pikascript-api/PikaStdDevice_BaseDev-api.c + + + PikaStdLib_PikaObj-api.c + 1 + ..\pikascript\pikascript-api/PikaStdLib_PikaObj-api.c STM32F1_IIC-api.c 1 - ..\pikascript\pikascript-api\STM32F1_IIC-api.c + ..\pikascript\pikascript-api/STM32F1_IIC-api.c + + + PikaStdData_Dict-api.c + 1 + ..\pikascript\pikascript-api/PikaStdData_Dict-api.c + + + pikaScript.c + 1 + ..\pikascript\pikascript-api/pikaScript.c + + + PikaStdDevice_SPI-api.c + 1 + ..\pikascript\pikascript-api/PikaStdDevice_SPI-api.c STM32F1_PWM-api.c 1 - ..\pikascript\pikascript-api\STM32F1_PWM-api.c + ..\pikascript\pikascript-api/STM32F1_PWM-api.c + + + PikaStdData_Tuple-api.c + 1 + ..\pikascript\pikascript-api/PikaStdData_Tuple-api.c + + + PikaStdTask_Task-api.c + 1 + ..\pikascript\pikascript-api/PikaStdTask_Task-api.c + + + PikaStdDevice_UART-api.c + 1 + ..\pikascript\pikascript-api/PikaStdDevice_UART-api.c + + + PikaStdDevice-api.c + 1 + ..\pikascript\pikascript-api/PikaStdDevice-api.c + + + PikaStdDevice_IIC-api.c + 1 + ..\pikascript\pikascript-api/PikaStdDevice_IIC-api.c + + + PikaStdDevice_GPIO-api.c + 1 + ..\pikascript\pikascript-api/PikaStdDevice_GPIO-api.c + + + PikaDebug-api.c + 1 + ..\pikascript\pikascript-api/PikaDebug-api.c + + + PikaStdDevice_PWM-api.c + 1 + ..\pikascript\pikascript-api/PikaStdDevice_PWM-api.c + + + PikaStdData_List-api.c + 1 + ..\pikascript\pikascript-api/PikaStdData_List-api.c + + + PikaStdDevice_Time-api.c + 1 + ..\pikascript\pikascript-api/PikaStdDevice_Time-api.c + + + PikaDebug_Debuger-api.c + 1 + ..\pikascript\pikascript-api/PikaDebug_Debuger-api.c + + + PikaStdLib_RangeObj-api.c + 1 + ..\pikascript\pikascript-api/PikaStdLib_RangeObj-api.c + + + PikaMain-api.c + 1 + ..\pikascript\pikascript-api/PikaMain-api.c + + + PikaStdData-api.c + 1 + ..\pikascript\pikascript-api/PikaStdData-api.c + + + STM32F1_GPIO-api.c + 1 + ..\pikascript\pikascript-api/STM32F1_GPIO-api.c + + + PikaStdData_ByteArray-api.c + 1 + ..\pikascript\pikascript-api/PikaStdData_ByteArray-api.c + + + PikaStdData_Utils-api.c + 1 + ..\pikascript\pikascript-api/PikaStdData_Utils-api.c + + + PikaStdLib_StringObj-api.c + 1 + ..\pikascript\pikascript-api/PikaStdLib_StringObj-api.c + + + PikaStdData_String-api.c + 1 + ..\pikascript\pikascript-api/PikaStdData_String-api.c STM32F1_UART-api.c 1 - ..\pikascript\pikascript-api\STM32F1_UART-api.c + ..\pikascript\pikascript-api/STM32F1_UART-api.c + + + STM32F1-api.c + 1 + ..\pikascript\pikascript-api/STM32F1-api.c + + + STM32F1_Time-api.c + 1 + ..\pikascript\pikascript-api/STM32F1_Time-api.c + + + PikaStdLib_MemChecker-api.c + 1 + ..\pikascript\pikascript-api/PikaStdLib_MemChecker-api.c + + + PikaStdLib_SysObj-api.c + 1 + ..\pikascript\pikascript-api/PikaStdLib_SysObj-api.c + + + PikaStdDevice_ADC-api.c + 1 + ..\pikascript\pikascript-api/PikaStdDevice_ADC-api.c + + + PikaStdTask-api.c + 1 + ..\pikascript\pikascript-api/PikaStdTask-api.c + + + PikaStdData_dict_keys-api.c + 1 + ..\pikascript\pikascript-api/PikaStdData_dict_keys-api.c + + + __asset_pikaModules_py_a.c + 1 + ..\pikascript\pikascript-api/__asset_pikaModules_py_a.c diff --git a/bsp/stm32f103rc/pikascript/requestment.txt b/bsp/stm32f103rc/pikascript/requestment.txt index e8548b4ab..07b2cbe16 100644 --- a/bsp/stm32f103rc/pikascript/requestment.txt +++ b/bsp/stm32f103rc/pikascript/requestment.txt @@ -1,4 +1,4 @@ -pikascript-core==v1.2.6 -PikaStdLib==v1.2.1 -PikaStdDevice==v1.4.3 -STM32F1==v1.0.3 \ No newline at end of file +pikascript-core==v1.10.0 +PikaStdLib==v1.10.0 +PikaStdDevice==v1.10.0 +STM32F1==v1.1.1