Merge branch 'main' into NVM

main on 6990753
Lord448 · Jul 29, 2024 · b30bf1f · b30bf1f
2 parents b038afd + 6990753
commit b30bf1f
Show file tree

Hide file tree

Showing 38 changed files with 2,083 additions and 583 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@
 [Dd]ebug
 .launch
 **/Debug/*
+DaughterBoardTest/DaughterBoardTest Debug.launch
 .~lock.**
diff --git a/.project b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>PneumaticLevitator</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/DaughterBoardTest/DaughterBoardTest Debug.launch b/DaughterBoardTest/DaughterBoardTest Debug.launch
diff --git a/Daughterboard/.cproject b/Daughterboard/.cproject
@@ -62,6 +62,9 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Daughterboard/Source/SWC/DiagAppl}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Daughterboard/Source/SWC/GPUResMan}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Daughterboard/Source/SWC/OSHandler}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Daughterboard/Source/SWC/UI/Menus}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Daughterboard/Source/SWC/UI/Menus/MainMenu}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Daughterboard/Source/SWC/HMI}&quot;"/>
 								</option>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.893277119" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
@@ -89,7 +92,7 @@
 					</folderInfo>
 					<sourceEntries>
 						<entry excluding="__uGUI|UGUI/ugui_sim.c|UGUI/ugui_sim_x11.c" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Drivers"/>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Source"/>
+						<entry excluding="**/ImageOrigins/" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="Source"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
 					</sourceEntries>