From 2d96c9ea7ea67b21378d01afd413d4c052956274 Mon Sep 17 00:00:00 2001 From: Lyon Date: Wed, 17 Aug 2022 09:01:47 +0800 Subject: [PATCH] update to v1.10 for w806 --- bsp/w806/Project/W806_SDK.cdkproj | 13 +++++++ bsp/w806/Project/W806_SDK.mk | 40 +++++++++++++++++---- bsp/w806/Project/pikascript/requestment.txt | 6 ++-- 3 files changed, 49 insertions(+), 10 deletions(-) diff --git a/bsp/w806/Project/W806_SDK.cdkproj b/bsp/w806/Project/W806_SDK.cdkproj index b654fb510..16e49e9c6 100644 --- a/bsp/w806/Project/W806_SDK.cdkproj +++ b/bsp/w806/Project/W806_SDK.cdkproj @@ -254,6 +254,13 @@ + + + + + + + @@ -476,6 +483,12 @@ + + + + + + diff --git a/bsp/w806/Project/W806_SDK.mk b/bsp/w806/Project/W806_SDK.mk index 79599a1ad..09f2eb808 100644 --- a/bsp/w806/Project/W806_SDK.mk +++ b/bsp/w806/Project/W806_SDK.mk @@ -10,7 +10,7 @@ ProjectPath :=./ IntermediateDirectory :=Obj OutDir :=$(IntermediateDirectory) User :=lyon -Date :=06/07/2022 +Date :=17/08/2022 CDKPath :=D:/C-Sky/CDK ToolchainPath :=D:/C-Sky/CDKRepo/Toolchain/CKV2ElfMinilib/V3.10.29/R/ LinkerName :=csky-elfabiv2-gcc @@ -79,13 +79,14 @@ Objects0=$(IntermediateDirectory)/src_main$(ObjectSuffix) $(IntermediateDirector Objects1=$(IntermediateDirectory)/pikascript-api_PikaStdDevice_ADC-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdDevice_BaseDev-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdDevice_CAN-api$(ObjectSuffix) \ $(IntermediateDirectory)/pikascript-api_PikaStdDevice_GPIO-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdDevice_IIC-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdDevice_PWM-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdDevice_SPI-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdDevice_Time-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdDevice_UART-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdLib-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdLib_MemChecker-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdLib_PikaObj-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdLib_RangeObj-api$(ObjectSuffix) \ $(IntermediateDirectory)/pikascript-api_PikaStdLib_StringObj-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdLib_SysObj-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdTask-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdTask_Task-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_W801Device-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_W801Device_ADC-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_W801Device_GPIO-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_W801Device_IIC-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_W801Device_PWM-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_W801Device_Time-api$(ObjectSuffix) \ - $(IntermediateDirectory)/pikascript-api_W801Device_UART-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api___asset_pikaModules_py_a$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_BaseObj$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataArg$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataArgs$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataLink$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataLinkNode$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataMemory$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataQueue$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataQueueObj$(ObjectSuffix) \ - $(IntermediateDirectory)/pikascript-core_dataStack$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataString$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataStrs$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_PikaCompiler$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_PikaObj$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_PikaParser$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_PikaPlatform$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_PikaVM$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_TinyObj$(ObjectSuffix) + $(IntermediateDirectory)/pikascript-api_W801Device_UART-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api___asset_pikaModules_py_a$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdData_Tuple-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-api_PikaStdData_FILEIO-api$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_BaseObj$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataArg$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataArgs$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataLink$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataLinkNode$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataMemory$(ObjectSuffix) \ + $(IntermediateDirectory)/pikascript-core_dataQueue$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataQueueObj$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataStack$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataString$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_dataStrs$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_PikaCompiler$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_PikaObj$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_PikaParser$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_PikaPlatform$(ObjectSuffix) $(IntermediateDirectory)/pikascript-core_PikaVM$(ObjectSuffix) \ + $(IntermediateDirectory)/pikascript-core_TinyObj$(ObjectSuffix) -Objects2=$(IntermediateDirectory)/W801Device_fifo$(ObjectSuffix) \ - $(IntermediateDirectory)/W801Device_W801_ADC$(ObjectSuffix) $(IntermediateDirectory)/W801Device_W801_common$(ObjectSuffix) $(IntermediateDirectory)/W801Device_W801_GPIO$(ObjectSuffix) $(IntermediateDirectory)/W801Device_W801_IIC$(ObjectSuffix) $(IntermediateDirectory)/W801Device_W801_PWM$(ObjectSuffix) $(IntermediateDirectory)/W801Device_W801_Time$(ObjectSuffix) $(IntermediateDirectory)/W801Device_W801_Uart$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_ADC$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_BaseDev$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_CAN$(ObjectSuffix) \ - $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_GPIO$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_IIC$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_PWM$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_SPI$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_Time$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_UART$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaDebuger_Debuger$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdData_Dict$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdData_List$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdData_String$(ObjectSuffix) \ - $(IntermediateDirectory)/PikaStdLib_PikaStdData_Utils$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdLib_MemChecker$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdLib_RangeObj$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdLib_StringObj$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdLib_SysObj$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdTask_Task$(ObjectSuffix) $(IntermediateDirectory)/__rt_entry$(ObjectSuffix) +Objects2=$(IntermediateDirectory)/W801Device_fifo$(ObjectSuffix) $(IntermediateDirectory)/W801Device_W801_ADC$(ObjectSuffix) $(IntermediateDirectory)/W801Device_W801_common$(ObjectSuffix) $(IntermediateDirectory)/W801Device_W801_GPIO$(ObjectSuffix) $(IntermediateDirectory)/W801Device_W801_IIC$(ObjectSuffix) $(IntermediateDirectory)/W801Device_W801_PWM$(ObjectSuffix) $(IntermediateDirectory)/W801Device_W801_Time$(ObjectSuffix) $(IntermediateDirectory)/W801Device_W801_Uart$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_ADC$(ObjectSuffix) \ + $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_BaseDev$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_CAN$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_GPIO$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_IIC$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_PWM$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_SPI$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_Time$(ObjectSuffix) $(IntermediateDirectory)/PikaStdDevice_PikaStdDevice_UART$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaDebuger_Debuger$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdData_Dict$(ObjectSuffix) \ + $(IntermediateDirectory)/PikaStdLib_PikaStdData_List$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdData_String$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdData_Utils$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdLib_MemChecker$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdLib_RangeObj$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdLib_StringObj$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdLib_SysObj$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdTask_Task$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdData_ByteArray$(ObjectSuffix) $(IntermediateDirectory)/PikaStdLib_PikaStdData_FILEIO$(ObjectSuffix) \ + $(IntermediateDirectory)/PikaStdLib_PikaStdData_Tuple$(ObjectSuffix) $(IntermediateDirectory)/__rt_entry$(ObjectSuffix) @@ -473,6 +474,16 @@ $(IntermediateDirectory)/pikascript-api___asset_pikaModules_py_a$(ObjectSuffix): Lst/pikascript-api___asset_pikaModules_py_a$(PreprocessSuffix): pikascript/pikascript-api/__asset_pikaModules_py_a.c $(CC) $(CFLAGS)$(IncludeCPath) $(PreprocessOnlySwitch) $(OutputSwitch) Lst/pikascript-api___asset_pikaModules_py_a$(PreprocessSuffix) pikascript/pikascript-api/__asset_pikaModules_py_a.c +$(IntermediateDirectory)/pikascript-api_PikaStdData_Tuple-api$(ObjectSuffix): pikascript/pikascript-api/PikaStdData_Tuple-api.c + $(CC) $(SourceSwitch) pikascript/pikascript-api/PikaStdData_Tuple-api.c $(CFLAGS) -MMD -MP -MT$(IntermediateDirectory)/pikascript-api_PikaStdData_Tuple-api$(ObjectSuffix) -MF$(IntermediateDirectory)/pikascript-api_PikaStdData_Tuple-api$(DependSuffix) $(ObjectSwitch)$(IntermediateDirectory)/pikascript-api_PikaStdData_Tuple-api$(ObjectSuffix) $(IncludeCPath) $(IncludePackagePath) +Lst/pikascript-api_PikaStdData_Tuple-api$(PreprocessSuffix): pikascript/pikascript-api/PikaStdData_Tuple-api.c + $(CC) $(CFLAGS)$(IncludeCPath) $(PreprocessOnlySwitch) $(OutputSwitch) Lst/pikascript-api_PikaStdData_Tuple-api$(PreprocessSuffix) pikascript/pikascript-api/PikaStdData_Tuple-api.c + +$(IntermediateDirectory)/pikascript-api_PikaStdData_FILEIO-api$(ObjectSuffix): pikascript/pikascript-api/PikaStdData_FILEIO-api.c + $(CC) $(SourceSwitch) pikascript/pikascript-api/PikaStdData_FILEIO-api.c $(CFLAGS) -MMD -MP -MT$(IntermediateDirectory)/pikascript-api_PikaStdData_FILEIO-api$(ObjectSuffix) -MF$(IntermediateDirectory)/pikascript-api_PikaStdData_FILEIO-api$(DependSuffix) $(ObjectSwitch)$(IntermediateDirectory)/pikascript-api_PikaStdData_FILEIO-api$(ObjectSuffix) $(IncludeCPath) $(IncludePackagePath) +Lst/pikascript-api_PikaStdData_FILEIO-api$(PreprocessSuffix): pikascript/pikascript-api/PikaStdData_FILEIO-api.c + $(CC) $(CFLAGS)$(IncludeCPath) $(PreprocessOnlySwitch) $(OutputSwitch) Lst/pikascript-api_PikaStdData_FILEIO-api$(PreprocessSuffix) pikascript/pikascript-api/PikaStdData_FILEIO-api.c + $(IntermediateDirectory)/pikascript-core_BaseObj$(ObjectSuffix): pikascript/pikascript-core/BaseObj.c $(CC) $(SourceSwitch) pikascript/pikascript-core/BaseObj.c $(CFLAGS) -MMD -MP -MT$(IntermediateDirectory)/pikascript-core_BaseObj$(ObjectSuffix) -MF$(IntermediateDirectory)/pikascript-core_BaseObj$(DependSuffix) $(ObjectSwitch)$(IntermediateDirectory)/pikascript-core_BaseObj$(ObjectSuffix) $(IncludeCPath) $(IncludePackagePath) Lst/pikascript-core_BaseObj$(PreprocessSuffix): pikascript/pikascript-core/BaseObj.c @@ -693,6 +704,21 @@ $(IntermediateDirectory)/PikaStdLib_PikaStdTask_Task$(ObjectSuffix): pikascript/ Lst/PikaStdLib_PikaStdTask_Task$(PreprocessSuffix): pikascript/pikascript-lib/PikaStdLib/PikaStdTask_Task.c $(CC) $(CFLAGS)$(IncludeCPath) $(PreprocessOnlySwitch) $(OutputSwitch) Lst/PikaStdLib_PikaStdTask_Task$(PreprocessSuffix) pikascript/pikascript-lib/PikaStdLib/PikaStdTask_Task.c +$(IntermediateDirectory)/PikaStdLib_PikaStdData_ByteArray$(ObjectSuffix): pikascript/pikascript-lib/PikaStdLib/PikaStdData_ByteArray.c + $(CC) $(SourceSwitch) pikascript/pikascript-lib/PikaStdLib/PikaStdData_ByteArray.c $(CFLAGS) -MMD -MP -MT$(IntermediateDirectory)/PikaStdLib_PikaStdData_ByteArray$(ObjectSuffix) -MF$(IntermediateDirectory)/PikaStdLib_PikaStdData_ByteArray$(DependSuffix) $(ObjectSwitch)$(IntermediateDirectory)/PikaStdLib_PikaStdData_ByteArray$(ObjectSuffix) $(IncludeCPath) $(IncludePackagePath) +Lst/PikaStdLib_PikaStdData_ByteArray$(PreprocessSuffix): pikascript/pikascript-lib/PikaStdLib/PikaStdData_ByteArray.c + $(CC) $(CFLAGS)$(IncludeCPath) $(PreprocessOnlySwitch) $(OutputSwitch) Lst/PikaStdLib_PikaStdData_ByteArray$(PreprocessSuffix) pikascript/pikascript-lib/PikaStdLib/PikaStdData_ByteArray.c + +$(IntermediateDirectory)/PikaStdLib_PikaStdData_FILEIO$(ObjectSuffix): pikascript/pikascript-lib/PikaStdLib/PikaStdData_FILEIO.c + $(CC) $(SourceSwitch) pikascript/pikascript-lib/PikaStdLib/PikaStdData_FILEIO.c $(CFLAGS) -MMD -MP -MT$(IntermediateDirectory)/PikaStdLib_PikaStdData_FILEIO$(ObjectSuffix) -MF$(IntermediateDirectory)/PikaStdLib_PikaStdData_FILEIO$(DependSuffix) $(ObjectSwitch)$(IntermediateDirectory)/PikaStdLib_PikaStdData_FILEIO$(ObjectSuffix) $(IncludeCPath) $(IncludePackagePath) +Lst/PikaStdLib_PikaStdData_FILEIO$(PreprocessSuffix): pikascript/pikascript-lib/PikaStdLib/PikaStdData_FILEIO.c + $(CC) $(CFLAGS)$(IncludeCPath) $(PreprocessOnlySwitch) $(OutputSwitch) Lst/PikaStdLib_PikaStdData_FILEIO$(PreprocessSuffix) pikascript/pikascript-lib/PikaStdLib/PikaStdData_FILEIO.c + +$(IntermediateDirectory)/PikaStdLib_PikaStdData_Tuple$(ObjectSuffix): pikascript/pikascript-lib/PikaStdLib/PikaStdData_Tuple.c + $(CC) $(SourceSwitch) pikascript/pikascript-lib/PikaStdLib/PikaStdData_Tuple.c $(CFLAGS) -MMD -MP -MT$(IntermediateDirectory)/PikaStdLib_PikaStdData_Tuple$(ObjectSuffix) -MF$(IntermediateDirectory)/PikaStdLib_PikaStdData_Tuple$(DependSuffix) $(ObjectSwitch)$(IntermediateDirectory)/PikaStdLib_PikaStdData_Tuple$(ObjectSuffix) $(IncludeCPath) $(IncludePackagePath) +Lst/PikaStdLib_PikaStdData_Tuple$(PreprocessSuffix): pikascript/pikascript-lib/PikaStdLib/PikaStdData_Tuple.c + $(CC) $(CFLAGS)$(IncludeCPath) $(PreprocessOnlySwitch) $(OutputSwitch) Lst/PikaStdLib_PikaStdData_Tuple$(PreprocessSuffix) pikascript/pikascript-lib/PikaStdLib/PikaStdData_Tuple.c + $(IntermediateDirectory)/__rt_entry$(ObjectSuffix): $(IntermediateDirectory)/__rt_entry$(DependSuffix) @$(AS) $(SourceSwitch) $(ProjectPath)/$(IntermediateDirectory)/__rt_entry.S $(ASFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/__rt_entry$(ObjectSuffix) $(IncludeAPath) diff --git a/bsp/w806/Project/pikascript/requestment.txt b/bsp/w806/Project/pikascript/requestment.txt index 88fc28517..ba60193b4 100644 --- a/bsp/w806/Project/pikascript/requestment.txt +++ b/bsp/w806/Project/pikascript/requestment.txt @@ -1,4 +1,4 @@ -pikascript-core==v1.9.0 -PikaStdLib==v1.9.0 -PikaStdDevice==v1.9.0 +pikascript-core==v1.10.0 +PikaStdLib==v1.10.0 +PikaStdDevice==v1.10.0 W801Device==v1.1.0