Parcourir la source

Merge pull request #2 from Maihuanyi/main

1.Fixed error in getting mcu model number;
Yuqiang Wang il y a 6 mois
Parent
commit
21b71d514d
1 fichiers modifiés avec 4 ajouts et 2 suppressions
  1. 4 2
      SConscript

+ 4 - 2
SConscript

@@ -18,8 +18,10 @@ mcu_startup_files = {
 }
 
 # Check each defined MCU, match the platform and append the appropriate startup file
+cpp_defines_tuple = env.get('CPPDEFINES', [])
+cpp_defines_list = [item[0] if isinstance(item, tuple) else item for item in cpp_defines_tuple]
 for mcu, startup_file in mcu_startup_files.items():
-    if mcu in env.get('CPPDEFINES', []):
+    if mcu in cpp_defines_list:
         if rtconfig.PLATFORM in ['gcc', 'llvm-arm']:
             src += [os.path.join(cwd, 'Source', 'Templates', 'gcc', startup_file)]
         elif rtconfig.PLATFORM in ['armcc', 'armclang']:
@@ -32,4 +34,4 @@ for mcu, startup_file in mcu_startup_files.items():
 group = DefineGroup('STM32U5-CMSIS', src, depend=['PKG_USING_STM32U5_CMSIS_DRIVER'], CPPPATH=path)
 
 # Return the build group
-Return('group')
+Return('group')