diff --git a/bsp/simulation-keil/MDK-ARM/mimiscript-demo.uvoptx b/bsp/simulation-keil/MDK-ARM/mimiscript-demo.uvoptx index cf86d2c42..0814c7136 100644 --- a/bsp/simulation-keil/MDK-ARM/mimiscript-demo.uvoptx +++ b/bsp/simulation-keil/MDK-ARM/mimiscript-demo.uvoptx @@ -495,8 +495,8 @@ 0 0 0 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_SysObj.c - PikaStdLib_SysObj.c + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdLib_RangeObj.c + PikaStdLib_RangeObj.c 0 0 @@ -507,8 +507,8 @@ 0 0 0 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_MemChecker.c - PikaStdLib_MemChecker.c + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdData_Dict.c + PikaStdData_Dict.c 0 0 @@ -519,8 +519,8 @@ 0 0 0 - ..\pikascript\pikascript-lib\Device\Device_Led.c - Device_Led.c + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdTask_Task.c + PikaStdTask_Task.c 0 0 @@ -531,8 +531,8 @@ 0 0 0 - ..\pikascript\pikascript-lib\Device\Device_Uart.c - Device_Uart.c + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdLib_StringObj.c + PikaStdLib_StringObj.c 0 0 @@ -543,8 +543,8 @@ 0 0 0 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_RangeObj.c - PikaStdLib_RangeObj.c + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdLib_MemChecker.c + PikaStdLib_MemChecker.c 0 0 @@ -555,7 +555,7 @@ 0 0 0 - ..\pikascript\pikascript-lib\PikaStdLib\PikaDebuger_Debuger.c + ..\pikascript\pikascript-lib/PikaStdLib/PikaDebuger_Debuger.c PikaDebuger_Debuger.c 0 0 @@ -567,8 +567,8 @@ 0 0 0 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_Dict.c - PikaStdData_Dict.c + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdData_String.c + PikaStdData_String.c 0 0 @@ -579,7 +579,7 @@ 0 0 0 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_List.c + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdData_List.c PikaStdData_List.c 0 0 @@ -591,8 +591,8 @@ 0 0 0 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_String.c - PikaStdData_String.c + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdLib_SysObj.c + PikaStdLib_SysObj.c 0 0 @@ -603,8 +603,8 @@ 0 0 0 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_StringObj.c - PikaStdLib_StringObj.c + ..\pikascript\pikascript-lib/Device/Device_Uart.c + Device_Uart.c 0 0 @@ -615,8 +615,8 @@ 0 0 0 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdTask_Task.c - PikaStdTask_Task.c + ..\pikascript\pikascript-lib/Device/Device_Led.c + Device_Led.c 0 0 @@ -835,8 +835,8 @@ 0 0 0 - ..\pikascript\pikascript-api\Device_LED-api.c - Device_LED-api.c + ..\pikascript\pikascript-api/PikaStdLib-api.c + PikaStdLib-api.c 0 0 @@ -847,8 +847,8 @@ 0 0 0 - ..\pikascript\pikascript-api\Device_Uart-api.c - Device_Uart-api.c + ..\pikascript\pikascript-api/PikaStdLib_PikaObj-api.c + PikaStdLib_PikaObj-api.c 0 0 @@ -859,8 +859,8 @@ 0 0 0 - ..\pikascript\pikascript-api\Device-api.c - Device-api.c + ..\pikascript\pikascript-api/PikaStdData_Dict-api.c + PikaStdData_Dict-api.c 0 0 @@ -871,8 +871,8 @@ 0 0 0 - ..\pikascript\pikascript-api\PikaMain-api.c - PikaMain-api.c + ..\pikascript\pikascript-api/pikaScript.c + pikaScript.c 0 0 @@ -883,8 +883,8 @@ 0 0 0 - ..\pikascript\pikascript-api\pikaScript.c - pikaScript.c + ..\pikascript\pikascript-api/PikaStdTask_Task-api.c + PikaStdTask_Task-api.c 0 0 @@ -895,8 +895,8 @@ 0 0 0 - ..\pikascript\pikascript-api\PikaStdLib_MemChecker-api.c - PikaStdLib_MemChecker-api.c + ..\pikascript\pikascript-api/PikaDebug-api.c + PikaDebug-api.c 0 0 @@ -907,8 +907,8 @@ 0 0 0 - ..\pikascript\pikascript-api\PikaStdLib_SysObj-api.c - PikaStdLib_SysObj-api.c + ..\pikascript\pikascript-api/PikaStdData_List-api.c + PikaStdData_List-api.c 0 0 @@ -919,8 +919,8 @@ 0 0 0 - ..\pikascript\pikascript-api\PikaStdLib-api.c - PikaStdLib-api.c + ..\pikascript\pikascript-api/PikaDebug_Debuger-api.c + PikaDebug_Debuger-api.c 0 0 @@ -931,7 +931,7 @@ 0 0 0 - ..\pikascript\pikascript-api\PikaStdLib_RangeObj-api.c + ..\pikascript\pikascript-api/PikaStdLib_RangeObj-api.c PikaStdLib_RangeObj-api.c 0 0 @@ -943,22 +943,142 @@ 0 0 0 - ..\pikascript\pikascript-api\PikaStdLib_StringObj-api.c + ..\pikascript\pikascript-api/PikaMain-api.c + PikaMain-api.c + 0 + 0 + + + 7 + 59 + 1 + 0 + 0 + 0 + ..\pikascript\pikascript-api/PikaStdData-api.c + PikaStdData-api.c + 0 + 0 + + + 7 + 60 + 1 + 0 + 0 + 0 + ..\pikascript\pikascript-api/PikaStdData_ByteArray-api.c + PikaStdData_ByteArray-api.c + 0 + 0 + + + 7 + 61 + 1 + 0 + 0 + 0 + ..\pikascript\pikascript-api/PikaStdLib_StringObj-api.c PikaStdLib_StringObj-api.c 0 0 + + 7 + 62 + 1 + 0 + 0 + 0 + ..\pikascript\pikascript-api/PikaStdData_String-api.c + PikaStdData_String-api.c + 0 + 0 + + + 7 + 63 + 1 + 0 + 0 + 0 + ..\pikascript\pikascript-api/PikaStdLib_MemChecker-api.c + PikaStdLib_MemChecker-api.c + 0 + 0 + + + 7 + 64 + 1 + 0 + 0 + 0 + ..\pikascript\pikascript-api/PikaStdLib_SysObj-api.c + PikaStdLib_SysObj-api.c + 0 + 0 + + + 7 + 65 + 1 + 0 + 0 + 0 + ..\pikascript\pikascript-api/PikaStdTask-api.c + PikaStdTask-api.c + 0 + 0 + + + 7 + 66 + 1 + 0 + 0 + 0 + ..\pikascript\pikascript-api\Device_LED-api.c + Device_LED-api.c + 0 + 0 + + + 7 + 67 + 1 + 0 + 0 + 0 + ..\pikascript\pikascript-api\Device_Uart-api.c + Device_Uart-api.c + 0 + 0 + + + 7 + 68 + 1 + 0 + 0 + 0 + ..\pikascript\pikascript-api\Device-api.c + Device-api.c + 0 + 0 + Python - 0 + 1 0 0 0 8 - 59 + 69 5 0 0 @@ -970,43 +1090,43 @@ 8 - 60 + 70 5 0 0 0 - ..\pikascript\Device.py - Device.py + ..\pikascript\Device.pyi + Device.pyi 0 0 8 - 61 + 71 5 0 0 0 - ..\pikascript\PikaObj.py - PikaObj.py + ..\pikascript\PikaObj.pyi + PikaObj.pyi 0 0 8 - 62 + 72 5 0 0 0 - ..\pikascript\PikaStdLib.py - PikaStdLib.py + ..\pikascript\PikaStdLib.pyi + PikaStdLib.pyi 0 0 8 - 63 + 73 5 0 0 diff --git a/bsp/simulation-keil/MDK-ARM/mimiscript-demo.uvprojx b/bsp/simulation-keil/MDK-ARM/mimiscript-demo.uvprojx index b6e600723..c2e95c01f 100644 --- a/bsp/simulation-keil/MDK-ARM/mimiscript-demo.uvprojx +++ b/bsp/simulation-keil/MDK-ARM/mimiscript-demo.uvprojx @@ -339,7 +339,7 @@ USE_HAL_DRIVER,STM32F103xE - ../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;..\pikascript\pikascript-core;..\pikascript\pikascript-api + ../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;..\pikascript\pikascript-lib/PikaStdLib;..\pikascript\pikascript-lib/Device;..\pikascript\pikascript-api;..\pikascript\pikascript-core @@ -508,60 +508,60 @@ pikascript-lib - - PikaStdLib_SysObj.c - 1 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_SysObj.c - - - PikaStdLib_MemChecker.c - 1 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_MemChecker.c - - - Device_Led.c - 1 - ..\pikascript\pikascript-lib\Device\Device_Led.c - - - Device_Uart.c - 1 - ..\pikascript\pikascript-lib\Device\Device_Uart.c - PikaStdLib_RangeObj.c 1 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_RangeObj.c - - - PikaDebuger_Debuger.c - 1 - ..\pikascript\pikascript-lib\PikaStdLib\PikaDebuger_Debuger.c + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdLib_RangeObj.c PikaStdData_Dict.c 1 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_Dict.c - - - PikaStdData_List.c - 1 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_List.c - - - PikaStdData_String.c - 1 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdData_String.c - - - PikaStdLib_StringObj.c - 1 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdLib_StringObj.c + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdData_Dict.c PikaStdTask_Task.c 1 - ..\pikascript\pikascript-lib\PikaStdLib\PikaStdTask_Task.c + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdTask_Task.c + + + PikaStdLib_StringObj.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdLib_StringObj.c + + + PikaStdLib_MemChecker.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdLib_MemChecker.c + + + PikaDebuger_Debuger.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaDebuger_Debuger.c + + + PikaStdData_String.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdData_String.c + + + PikaStdData_List.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdData_List.c + + + PikaStdLib_SysObj.c + 1 + ..\pikascript\pikascript-lib/PikaStdLib/PikaStdLib_SysObj.c + + + Device_Uart.c + 1 + ..\pikascript\pikascript-lib/Device/Device_Uart.c + + + Device_Led.c + 1 + ..\pikascript\pikascript-lib/Device/Device_Led.c @@ -653,6 +653,91 @@ pikascript-api + + PikaStdLib-api.c + 1 + ..\pikascript\pikascript-api/PikaStdLib-api.c + + + PikaStdLib_PikaObj-api.c + 1 + ..\pikascript\pikascript-api/PikaStdLib_PikaObj-api.c + + + PikaStdData_Dict-api.c + 1 + ..\pikascript\pikascript-api/PikaStdData_Dict-api.c + + + pikaScript.c + 1 + ..\pikascript\pikascript-api/pikaScript.c + + + PikaStdTask_Task-api.c + 1 + ..\pikascript\pikascript-api/PikaStdTask_Task-api.c + + + PikaDebug-api.c + 1 + ..\pikascript\pikascript-api/PikaDebug-api.c + + + PikaStdData_List-api.c + 1 + ..\pikascript\pikascript-api/PikaStdData_List-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 + + + PikaStdData_ByteArray-api.c + 1 + ..\pikascript\pikascript-api/PikaStdData_ByteArray-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 + + + PikaStdLib_MemChecker-api.c + 1 + ..\pikascript\pikascript-api/PikaStdLib_MemChecker-api.c + + + PikaStdLib_SysObj-api.c + 1 + ..\pikascript\pikascript-api/PikaStdLib_SysObj-api.c + + + PikaStdTask-api.c + 1 + ..\pikascript\pikascript-api/PikaStdTask-api.c + Device_LED-api.c 1 @@ -668,41 +753,6 @@ 1 ..\pikascript\pikascript-api\Device-api.c - - 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 - - - PikaStdLib_RangeObj-api.c - 1 - ..\pikascript\pikascript-api\PikaStdLib_RangeObj-api.c - - - PikaStdLib_StringObj-api.c - 1 - ..\pikascript\pikascript-api\PikaStdLib_StringObj-api.c - @@ -714,19 +764,19 @@ ..\pikascript\main.py - Device.py + Device.pyi 5 - ..\pikascript\Device.py + ..\pikascript\Device.pyi - PikaObj.py + PikaObj.pyi 5 - ..\pikascript\PikaObj.py + ..\pikascript\PikaObj.pyi - PikaStdLib.py + PikaStdLib.pyi 5 - ..\pikascript\PikaStdLib.py + ..\pikascript\PikaStdLib.pyi requestment.txt diff --git a/bsp/simulation-keil/pikascript/Device.py b/bsp/simulation-keil/pikascript/Device.pyi similarity index 100% rename from bsp/simulation-keil/pikascript/Device.py rename to bsp/simulation-keil/pikascript/Device.pyi diff --git a/bsp/simulation-keil/pikascript/requestment.txt b/bsp/simulation-keil/pikascript/requestment.txt index bd8db6975..c9404faea 100644 --- a/bsp/simulation-keil/pikascript/requestment.txt +++ b/bsp/simulation-keil/pikascript/requestment.txt @@ -1,2 +1,2 @@ -pikascript-core==v1.7.1 -PikaStdLib==v1.7.1 +pikascript-core==v1.7.2 +PikaStdLib==v1.7.2