修改scons的脚本文件，使其适配更多芯片的工程生成

bsp/ht32/ht32f12366/applications/main.c

@@ -12,9 +12,9 @@
 #include <rtdevice.h>
 #include "board.h"
 
-/* defined the led2 pin: pd15 */
+/* defined the led1 pin: pd15 */
 #define LED1_PIN    GET_PIN(D, 15)
-/* defined the led3 pin: pe0 */
+/* defined the led2 pin: pe0 */
 #define LED2_PIN    GET_PIN(E, 0)
 
 int main(void)

bsp/ht32/ht32f12366/project.uvprojx

@@ -335,7 +335,7 @@
               <MiscControls></MiscControls>
               <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, RT_USING_LIBC, USE_HT32F12366_SK, USE_HT32F12365_66, USE_MEM_HT32F12366, __CLK_TCK=RT_TICK_PER_SECOND, USE_HT32_DRIVER, __RTTHREAD__</Define>
               <Undefine></Undefine>
-              <IncludePath>..\libraries\HT32_STD_1xxxx_FWLib\library\Device\Holtek\HT32F1xxxx\Include;..\..\..\include;..\libraries\ht32_drivers;..\..\..\components\drivers\include;.;..\libraries\HT32_STD_1xxxx_FWLib\library\CMSIS\Include;..\..\..\components\drivers\include;..\libraries\HT32_STD_1xxxx_FWLib\library\HT32F1xxxx_Driver\inc;..\..\..\components\libc\compilers\common\extension;applications;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\epoll;..\..\..\components\libc\compilers\common\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\libc\posix\io\poll;..\..\..\components\finsh;..\..\..\components\drivers\include;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board\inc;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\spi;..\..\..\libcpu\arm\common</IncludePath>
+              <IncludePath>..\..\..\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\components\drivers\spi;..\..\..\libcpu\arm\cortex-m3;..\libraries\HT32_STD_1xxxx_FWLib\library\HT32F1xxxx_Driver\inc;..\..\..\components\drivers\include;..\..\..\components\libc\posix\io\eventfd;..\..\..\components\drivers\include;..\..\..\components\drivers\include;applications;..\libraries\HT32_STD_1xxxx_FWLib\library\CMSIS\Include;..\..\..\components\finsh;..\..\..\components\libc\posix\io\epoll;.;board\inc;..\..\..\components\libc\posix\ipc;..\..\..\components\drivers\include;..\libraries\HT32_STD_1xxxx_FWLib\library\Device\Holtek\HT32F1xxxx\Include;..\libraries\ht32_drivers;..\..\..\libcpu\arm\common;..\..\..\components\libc\posix\io\poll;..\..\..\components\libc\compilers\common\extension;..\..\..\components\libc\compilers\common\include</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -1489,6 +1489,61 @@
                 </FileArmAds>
               </FileOption>
             </File>
+            <File>
+              <FileName>cpu_up.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\src\cpu_up.c</FilePath>
+              <FileOption>
+                <CommonProperty>
+                  <UseCPPCompiler>2</UseCPPCompiler>
+                  <RVCTCodeConst>0</RVCTCodeConst>
+                  <RVCTZI>0</RVCTZI>
+                  <RVCTOtherData>0</RVCTOtherData>
+                  <ModuleSelection>0</ModuleSelection>
+                  <IncludeInBuild>1</IncludeInBuild>
+                  <AlwaysBuild>0</AlwaysBuild>
+                  <GenerateAssemblyFile>0</GenerateAssemblyFile>
+                  <AssembleAssemblyFile>0</AssembleAssemblyFile>
+                  <PublicsOnly>0</PublicsOnly>
+                  <StopOnExitCode>3</StopOnExitCode>
+                  <CustomArgument></CustomArgument>
+                  <IncludeLibraryModules></IncludeLibraryModules>
+                  <ComprImg>1</ComprImg>
+                </CommonProperty>
+                <FileArmAds>
+                  <Cads>
+                    <interw>2</interw>
+                    <Optim>0</Optim>
+                    <oTime>2</oTime>
+                    <SplitLS>2</SplitLS>
+                    <OneElfS>2</OneElfS>
+                    <Strict>2</Strict>
+                    <EnumInt>2</EnumInt>
+                    <PlainCh>2</PlainCh>
+                    <Ropi>2</Ropi>
+                    <Rwpi>2</Rwpi>
+                    <wLevel>0</wLevel>
+                    <uThumb>2</uThumb>
+                    <uSurpInc>2</uSurpInc>
+                    <uC99>2</uC99>
+                    <useXO>2</useXO>
+                    <v6Lang>0</v6Lang>
+                    <v6LangP>0</v6LangP>
+                    <vShortEn>2</vShortEn>
+                    <vShortWch>2</vShortWch>
+                    <v6Lto>2</v6Lto>
+                    <v6WtE>2</v6WtE>
+                    <v6Rtti>2</v6Rtti>
+                    <VariousControls>
+                      <MiscControls> </MiscControls>
+                      <Define>__RT_KERNEL_SOURCE__</Define>
+                      <Undefine> </Undefine>
+                      <IncludePath></IncludePath>
+                    </VariousControls>
+                  </Cads>
+                </FileArmAds>
+              </FileOption>
+            </File>
             <File>
               <FileName>idle.c</FileName>
               <FileType>1</FileType>
@@ -2369,6 +2424,11 @@
               <FileType>1</FileType>
               <FilePath>..\libraries\HT32_STD_1xxxx_FWLib\library\HT32F1xxxx_Driver\src\ht32f1xxxx_cmp.c</FilePath>
             </File>
+            <File>
+              <FileName>ht32f2xxxx_csif.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\libraries\HT32_STD_1xxxx_FWLib\library\HT32F1xxxx_Driver\src\ht32f2xxxx_csif.c</FilePath>
+            </File>
             <File>
               <FileName>ht32f1xxxx_i2c.c</FileName>
               <FileType>1</FileType>

bsp/ht32/ht32f52352/applications/main.c

@@ -12,9 +12,9 @@
 #include <rtdevice.h>
 #include "board.h"
 
-/* defined the led2 pin: pc14 */
+/* defined the led1 pin: pc14 */
 #define LED1_PIN    GET_PIN(C, 14)
-/* defined the led3 pin: pc15 */
+/* defined the led2 pin: pc15 */
 #define LED2_PIN    GET_PIN(C, 15)
 
 int main(void)

bsp/ht32/libraries/HT32_STD_1xxxx_FWLib/SConscript

@@ -1,38 +1,33 @@
+import os
+import sys
 import rtconfig
 from building import *
+Import('rtconfig')
+
+tools_path = os.path.normpath(os.getcwd() + '../../..' + '/tools')
+sys.path.append(tools_path)
+from sdk_dist import get_source
+
+source_file_path = os.path.join(os.getcwd(), 'Source_file')
+base_path = 'library/HT32F1xxxx_Driver/src/'
+system_path = 'library/Device/Holtek/HT32F1xxxx/Source/'
+source_path = []
+ic_list = [
+    'HT32F1654',
+    'HT32F1656',
+    'HT32F12345',
+    'HT32F12364',
+    'HT32F12366'
+]
 
 cwd = GetCurrentDir()
+src = []
 
-src = Split("""
-    library/HT32F1xxxx_Driver/src/ht32_cm3_misc.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_adc.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_aes.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_bftm.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_ckcu.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_cmp.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_crc.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_ebi.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_exti.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_flash.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_gpio.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_i2c.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_i2s.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_mctm.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_pdma.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_pwrcu.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_rstcu.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_rtc.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_sci.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_sdio.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_spi.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_tm.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_usart.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_usbd.c
-    library/HT32F1xxxx_Driver/src/ht32f1xxxx_wdt.c
+for ic_name in ic_list:
+    if GetDepend(['SOC_' + ic_name]):
+        source_path = get_source(ic_name,source_file_path,system_path,base_path)
 
-    library/Device/Holtek/HT32F1xxxx/Source/system_ht32f1xxxx_02.c
-""")
-#HT32F1xxxx_Driver/src/ht32f1xxxx_csif.c
+src = Split(source_path)
 
 path = [
     cwd + '/library/HT32F1xxxx_Driver/inc',

bsp/ht32/libraries/HT32_STD_1xxxx_FWLib/Source_file

@@ -0,0 +1,141 @@
+
+HT32F1654
+<
+ht32_cm3_misc.c
+ht32f1xxxx_adc.c
+ht32f1xxxx_bftm.c
+ht32f1xxxx_ckcu.c
+ht32f1xxxx_cmp.c
+ht32f1xxxx_crc.c
+ht32f1xxxx_ebi.c
+ht32f1xxxx_exti.c
+ht32f1xxxx_flash.c
+ht32f1xxxx_gpio.c
+ht32f1xxxx_i2c.c
+ht32f1xxxx_i2s.c
+ht32f1xxxx_mctm.c
+ht32f1xxxx_pdma.c
+ht32f1xxxx_pwrcu.c
+ht32f1xxxx_rstcu.c
+ht32f1xxxx_rtc.c
+ht32f1xxxx_sci.c
+ht32f1xxxx_spi.c
+ht32f1xxxx_tm.c
+ht32f1xxxx_usart.c
+ht32f1xxxx_usbd.c
+ht32f1xxxx_wdt.c
+system_ht32f5xxxx_01.c
+>
+
+HT32F1656
+<
+ht32_cm3_misc.c
+ht32f1xxxx_adc.c
+ht32f1xxxx_bftm.c
+ht32f1xxxx_ckcu.c
+ht32f1xxxx_cmp_op.c
+ht32f1xxxx_crc.c
+ht32f1xxxx_ebi.c
+ht32f1xxxx_exti.c
+ht32f1xxxx_flash.c
+ht32f1xxxx_gpio.c
+ht32f1xxxx_i2c.c
+ht32f1xxxx_i2s.c
+ht32f1xxxx_mctm.c
+ht32f1xxxx_pdma.c
+ht32f1xxxx_pwrcu.c
+ht32f1xxxx_rstcu.c
+ht32f1xxxx_rtc.c
+ht32f1xxxx_sci.c
+ht32f1xxxx_spi.c
+ht32f1xxxx_tm.c
+ht32f1xxxx_usart.c
+ht32f1xxxx_usbd.c
+ht32f1xxxx_wdt.c
+system_ht32f5xxxx_01.c
+>
+
+HT32F12345
+<
+ht32_cm3_misc.c
+ht32f1xxxx_adc.c
+ht32f1xxxx_bftm.c
+ht32f1xxxx_ckcu.c
+ht32f1xxxx_cmp.c
+ht32f1xxxx_crc.c
+ht32f1xxxx_ebi.c
+ht32f1xxxx_exti.c
+ht32f1xxxx_flash.c
+ht32f1xxxx_gpio.c
+ht32f1xxxx_i2c.c
+ht32f1xxxx_i2s.c
+ht32f1xxxx_mctm.c
+ht32f1xxxx_pdma.c
+ht32f1xxxx_pwrcu.c
+ht32f1xxxx_rstcu.c
+ht32f1xxxx_rtc.c
+ht32f1xxxx_sdio.c
+ht32f1xxxx_spi.c
+ht32f1xxxx_tm.c
+ht32f1xxxx_usart.c
+ht32f1xxxx_usbd.c
+ht32f1xxxx_wdt.c
+system_ht32f1xxxx_02.c
+>
+
+HT32F12364
+<
+ht32_cm3_misc.c
+ht32f1xxxx_adc_02.c
+ht32f1xxxx_aes.c
+ht32f1xxxx_bftm.c
+ht32f1xxxx_ckcu.c
+ht32f1xxxx_crc.c
+ht32f1xxxx_ebi.c
+ht32f1xxxx_exti.c
+ht32f1xxxx_flash.c
+ht32f1xxxx_gpio.c
+ht32f1xxxx_i2c.c
+ht32f1xxxx_pdma.c
+ht32f1xxxx_pwrcu.c
+ht32f1xxxx_rstcu.c
+ht32f1xxxx_rtc.c
+ht32f1xxxx_sci.c
+ht32f1xxxx_spi.c
+ht32f1xxxx_tm.c
+ht32f1xxxx_usart.c
+ht32f1xxxx_usbd.c
+ht32f1xxxx_wdt.c
+system_ht32f1xxxx_03.c
+>
+
+HT32F12366
+<
+ht32_cm3_misc.c
+ht32f1xxxx_adc.c
+ht32f1xxxx_aes.c
+ht32f1xxxx_bftm.c
+ht32f1xxxx_ckcu.c
+ht32f1xxxx_cmp.c
+ht32f1xxxx_crc.c
+ht32f1xxxx_ebi.c
+ht32f1xxxx_exti.c
+ht32f1xxxx_flash.c
+ht32f1xxxx_gpio.c
+ht32f1xxxx_i2c.c
+ht32f1xxxx_i2s.c
+ht32f1xxxx_mctm.c
+ht32f1xxxx_pdma.c
+ht32f1xxxx_pwrcu.c
+ht32f1xxxx_rstcu.c
+ht32f1xxxx_rtc.c
+ht32f1xxxx_sci.c
+ht32f1xxxx_sdio.c
+ht32f1xxxx_spi.c
+ht32f1xxxx_tm.c
+ht32f1xxxx_usart.c
+ht32f1xxxx_usbd.c
+ht32f1xxxx_wdt.c
+ht32f2xxxx_csif.c
+system_ht32f1xxxx_02.c
+>

bsp/ht32/libraries/HT32_STD_5xxxx_FWLib/SConscript

@@ -1,39 +1,74 @@
+import os
+import sys
 import rtconfig
 from building import *
 Import('rtconfig')
 
+tools_path = os.path.normpath(os.getcwd() + '../../..' + '/tools')
+sys.path.append(tools_path)
+from sdk_dist import get_source
+
+source_file_path = os.path.join(os.getcwd(), 'Source_file')
+base_path = 'library/HT32F5xxxx_Driver/src/'
+system_path = 'library/Device/Holtek/HT32F5xxxx/Source/'
+source_path = []
+ic_list = [
+    'HT32F0006',
+    'HT32F0008',
+    'HT32F52367',
+    'HT50F3200S',
+    'HT50F3200T',
+    'HF5032',
+    'HT32F5828',
+    'HT50F32002',
+    'HT50F32003',
+    'HT32F50030',
+    'HT32F50230',
+    'HT32F50241',
+    'HT32F50343',
+    'HT32F50441',
+    'HT32F50452',
+    'HT32F52142',
+    'HT32F52230',
+    'HT32F52241',
+    'HT32F52244',
+    'HT32F52253',
+    'HT32F52341',
+    'HT32F52352',
+    'HT32F52354',
+    'HT32F52367',
+    'HT32F53241',
+    'HT32F53252',
+    'HT32F54241',
+    'HT32F54253',
+    'HT32F57341',
+    'HT32F57352',
+    'HT32F59041',
+    'HT32F59741',
+    'HT32F61141',
+    'HT32F61245',
+    'HT32F61352',
+    'HT32F61355',
+    'HT32F61356',
+    'HT32F61357',
+    'HT32F61630',
+    'HT32F61641',
+    'HT32F65232',
+    'HT32F65240',
+    'HT32F67051',
+    'HT32F67232',
+    'HT32F67233',
+    'HT32F67741'
+]
+
 cwd = GetCurrentDir()
 src = []
 
-if GetDepend(['SOC_HT32F52352']):
-    src = Split("""
-    library/HT32F5xxxx_Driver/src/ht32_cm0plus_misc.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_adc.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_bftm.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_ckcu.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_cmp.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_crc.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_ebi.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_exti.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_flash.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_gpio.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_i2c.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_i2s.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_mctm.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_pdma.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_pwrcu.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_rstcu.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_rtc.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_sci.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_spi.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_tm.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_usart.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_usbd.c
-    library/HT32F5xxxx_Driver/src/ht32f5xxxx_wdt.c
-    library/Device/Holtek/HT32F5xxxx/Source/system_ht32f5xxxx_01.c
-    """)
-
+for ic_name in ic_list:
+    if GetDepend(['SOC_' + ic_name]):
+        source_path = get_source(ic_name,source_file_path,system_path,base_path)
 
+src = Split(source_path)
 
 path = [
     cwd + '/library/HT32F5xxxx_Driver/inc',

bsp/ht32/tools/sdk_dist.py

@@ -1,4 +1,5 @@
 import os
+import re
 import sys
 import shutil
 cwd_path = os.getcwd()
@@ -37,4 +38,28 @@ def dist_do_building(BSP_ROOT, dist_dir):
     bsp_copy_files(os.path.join(library_path, 'ht32_drivers'), os.path.join(library_dir, 'ht32_drivers'))
     shutil.copyfile(os.path.join(library_path, 'Kconfig'), os.path.join(library_dir, 'Kconfig'))
     bsp_update_kconfig_library(dist_dir)
-    
+  
+def get_source(ic_model, file_path, system_path, base_path):
+    source_path = []
+    files_list = []
+    readafter = 0
+    if not os.path.isfile(file_path):
+        return
+
+    with open(file_path, 'r') as file:
+        #content = file.read()
+        for line in file:
+            if readafter == 2 and line.find('>') != -1:
+                break
+            if readafter == 2:
+                files_list.append(line.strip())
+            if line.find(ic_model) != -1:
+                readafter = 1
+            if readafter == 1 and line.find('<') != -1:
+                readafter = 2  
+    for line in files_list:
+        if line.find('system') != -1:
+            source_path.append(os.path.join(system_path, line.strip()))
+        else:
+            source_path.append(os.path.join(base_path, line.strip()))
+    return source_path