Merge pull request #12 from imahjoub/9-add-target-nucleo-l432kc

add stm32l432kc to repo
imahjoub · Aug 3, 2024 · 3f3125d · 3f3125d
2 parents 0f69de4 + 775beb4
commit 3f3125d
Show file tree

Hide file tree

Showing 48 changed files with 1,392 additions and 72 deletions.
diff --git a/.github/workflows/UniversalBareMetal.yml b/.github/workflows/UniversalBareMetal.yml
@@ -30,8 +30,8 @@ jobs:
       - name: target-ubuntu-${{ matrix.suite }}
         working-directory: ./Build/VS
         run: |
-          make -f ../Make/make_000.gmk ${{ matrix.suite }} TYP_OS=unix
-          ls -la ../Bin/Stm32f446re_x64/stm32f446re.elf ../Bin/Stm32f446re_x64/stm32f446re.hex
+          make -f ../Make/make_000.gmk ${{ matrix.suite }} TYP_OS=unix TYP_MCU=stm32f446re
+          ls -la ../Bin/stm32f446re_x64/stm32f446re.elf ../Bin/stm32f446re_x64/stm32f446re.hex
 
   msvc-msbuild:
     runs-on: windows-latest

diff --git a/.github/workflows/UniversalBareMetal_CodeQl.yml b/.github/workflows/UniversalBareMetal_CodeQl.yml
@@ -44,8 +44,8 @@ jobs:
       - name: target-ubuntu-${{ matrix.suite }}
         working-directory: ./Build/VS
         run: |
-          make -f ../Make/make_000.gmk ${{ matrix.suite }} TYP_OS=unix
-          ls -la ../Bin/Stm32f446re_x64/stm32f446re.elf ../Bin/Stm32f446re_x64/stm32f446re.hex
+          make -f ../Make/make_000.gmk ${{ matrix.suite }} TYP_OS=unix TYP_MCU=stm32f446re
+          ls -la ../Bin/stm32f446re_x64/stm32f446re.elf ../Bin/stm32f446re_x64/stm32f446re.hex
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
         with:

diff --git a/Build/Make/make_000.gmk b/Build/Make/make_000.gmk
@@ -3,5 +3,11 @@
 PATH_ENV        = $(CURDIR)/../Make
 PATH_SRC        = $(CURDIR)/../../Src
 
+ifeq ($(TYP_MCU),stm32f446re)
+include $(PATH_SRC)/Target/stm32f446re/Make/make_stm32f446re.gmk
+endif
+
+ifeq ($(TYP_MCU),stm32l432kc)
+include $(PATH_SRC)/Target/stm32l432kc/Make/make_stm32l432kc.gmk
+endif
 
-include $(PATH_SRC)/Target/Stm32f446re/Make/make_stm32f446re.gmk
diff --git a/Build/VS/UniversalBareMetal.sln b/Build/VS/UniversalBareMetal.sln
@@ -33,6 +33,7 @@ Global
 		Debug|x64 = Debug|x64
 		Release|x64 = Release|x64
 		stm32f446re|x64 = stm32f446re|x64
+		stm32l432kc|x64 = stm32l432kc|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{32D529D9-6963-472C-9BB3-1E4E1933FC56}.Debug|x64.ActiveCfg = Debug|x64
@@ -41,6 +42,8 @@ Global
 		{32D529D9-6963-472C-9BB3-1E4E1933FC56}.Release|x64.Build.0 = Release|x64
 		{32D529D9-6963-472C-9BB3-1E4E1933FC56}.stm32f446re|x64.ActiveCfg = stm32f446re|x64
 		{32D529D9-6963-472C-9BB3-1E4E1933FC56}.stm32f446re|x64.Build.0 = stm32f446re|x64
+		{32D529D9-6963-472C-9BB3-1E4E1933FC56}.stm32l432kc|x64.ActiveCfg = stm32l432kc|x64
+		{32D529D9-6963-472C-9BB3-1E4E1933FC56}.stm32l432kc|x64.Build.0 = stm32l432kc|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Build/VS/UniversalBareMetal.vcxproj b/Build/VS/UniversalBareMetal.vcxproj
@@ -13,14 +13,24 @@
       <Configuration>stm32f446re</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="stm32l432kc|x64">
+      <Configuration>stm32l432kc</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Src\App\App.cpp" />
+    <ClCompile Include="..\..\Src\App\Cpp\App.cpp" />
+    <ClCompile Include="..\..\Src\App\C\App.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\Src\Target\Host\Mcal\mcal.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\Src\Target\Host\Mcal\mcal_gpt.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\Src\Target\Stm32f446re\Mcal\mcal.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -62,23 +72,59 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\Src\Target\stm32l432kc\Mcal\Gpt.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Target\stm32l432kc\Mcal\Mcu.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Target\stm32l432kc\Mcal\SysTick.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Target\stm32l432kc\Startup\IntVect.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Target\stm32l432kc\Startup\SysStartup.c">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Src\target\stm32f446re\make\make_stm32f446re.gmk" />
-    <None Include="..\..\Src\target\stm32f446re\make\stm32f446re.ld" />
+    <None Include="..\..\Src\Target\stm32f446re\Make\make_stm32f446re.gmk" />
+    <None Include="..\..\Src\Target\stm32f446re\Make\stm32f446re.ld" />
+    <None Include="..\..\Src\Target\stm32l432kc\Make\make_stm32l432kc.gmk" />
+    <None Include="..\..\Src\Target\stm32l432kc\Make\stm32l432kc.ld" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Src\Target\Host\Mcal\mcal.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\..\Src\Target\Host\Mcal\mcal_cpu.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\..\Src\Target\Host\Mcal\mcal_gpt.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\..\Src\Target\Host\Mcal\mcal_irq.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
     </ClInclude>
     <ClInclude Include="..\..\Src\Target\Stm32f446re\Mcal\mcal.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
@@ -116,8 +162,33 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClInclude>
-    <ClInclude Include="..\..\Src\Util\util_noncopyable.h" />
-    <ClInclude Include="..\..\Src\Util\util_time.h" />
+    <ClInclude Include="..\..\Src\Target\stm32l432kc\Mcal\Gpt.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Target\stm32l432kc\Mcal\Mcu.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Target\stm32l432kc\Mcal\Reg.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Target\stm32l432kc\Mcal\SysTick.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\Src\Util\Cpp\util_noncopyable.h" />
+    <ClInclude Include="..\..\Src\Util\Cpp\util_time.h" />
+    <ClInclude Include="..\..\Src\Util\C\UtilTimer.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>
@@ -140,6 +211,10 @@
     <PlatformToolset>v143</PlatformToolset>
     <ConfigurationType>Makefile</ConfigurationType>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'" Label="Configuration">
+    <PlatformToolset>v143</PlatformToolset>
+    <ConfigurationType>Makefile</ConfigurationType>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -175,14 +250,25 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='stm32f446re|x64'">
     <OutDir>$(SolutionDir)..\Bin\$(Configuration)_$(Platform)\</OutDir>
     <IntDir>$(SolutionDir)..\Tmp\$(Configuration)_$(Platform)\</IntDir>
-    <NMakeBuildCommandLine>..\build.bat build</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>..\build.bat all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>..\build.bat clean</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine>..\build.bat build stm32f446re win</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>..\build.bat all stm32f446re win</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>..\build.bat clean stm32f446re win</NMakeCleanCommandLine>
     <NMakeOutput>
     </NMakeOutput>
     <NMakePreprocessorDefinitions>__GNUC__=12;__attribute__()=</NMakePreprocessorDefinitions>
     <NMakeIncludeSearchPath>$(SolutionDir)../../Src/Target/Stm32f446re;$(SolutionDir)../../Src</NMakeIncludeSearchPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">
+    <OutDir>$(SolutionDir)..\Bin\$(Configuration)_$(Platform)\</OutDir>
+    <IntDir>$(SolutionDir)..\Tmp\$(Configuration)_$(Platform)\</IntDir>
+    <NMakeBuildCommandLine>..\build.bat build stm32l432kc win</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>..\build.bat all stm32l432kc win</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>..\build.bat clean stm32l432kc win</NMakeCleanCommandLine>
+    <NMakeOutput>
+    </NMakeOutput>
+    <NMakePreprocessorDefinitions>__GNUC__=12;__attribute__()=</NMakePreprocessorDefinitions>
+    <NMakeIncludeSearchPath>$(SolutionDir)../../Src/Target/Stm32l432kc;$(SolutionDir)../../Src</NMakeIncludeSearchPath>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <BuildLog>
       <Path>$(OutDir)$(Configuration)_$(Platform)_BuildLog.htm</Path>
@@ -198,6 +284,11 @@
       <Path>$(SolutionDir)..\Tmp\$(Configuration)_$(Platform)\$(Configuration)_BuildLog.htm</Path>
     </BuildLog>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='stm32l432kc|x64'">
+    <BuildLog>
+      <Path>$(SolutionDir)..\Tmp\$(Configuration)_$(Platform)\$(Configuration)_BuildLog.htm</Path>
+    </BuildLog>
+  </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>