From 4541dcb71ba268e89349a0a028eb2031336faab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=A4berich?= <j.kaeberich@gmx.de>
Date: Sun, 26 Jun 2022 12:46:11 +0200
Subject: [PATCH] Fix integer size bug for Delay::us

---
 Software/VNA_embedded/.cproject                  | 16 ++++++++++++----
 .../VNA_embedded/Application/Drivers/delay.cpp   |  4 ++--
 .../VNA_embedded/Application/Drivers/delay.hpp   |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Software/VNA_embedded/.cproject b/Software/VNA_embedded/.cproject
index 3cc9c10..40b1540 100644
--- a/Software/VNA_embedded/.cproject
+++ b/Software/VNA_embedded/.cproject
@@ -39,8 +39,8 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.806735368" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
 									<listOptionValue builtIn="false" value="FW_MAJOR=1"/>
-									<listOptionValue builtIn="false" value="FW_MINOR=2"/>
-									<listOptionValue builtIn="false" value="FW_PATCH=1"/>
+									<listOptionValue builtIn="false" value="FW_MINOR=3"/>
+									<listOptionValue builtIn="false" value="FW_PATCH=0"/>
 									<listOptionValue builtIn="false" value="HW_REVISION='B'"/>
 									<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
@@ -86,8 +86,8 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols.536220696" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
 									<listOptionValue builtIn="false" value="FW_MAJOR=1"/>
-									<listOptionValue builtIn="false" value="FW_MINOR=2"/>
-									<listOptionValue builtIn="false" value="FW_PATCH=1"/>
+									<listOptionValue builtIn="false" value="FW_MINOR=3"/>
+									<listOptionValue builtIn="false" value="FW_PATCH=0"/>
 									<listOptionValue builtIn="false" value="HW_REVISION='B'"/>
 									<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
@@ -265,4 +265,12 @@
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Debug">
+			<resource resourceType="PROJECT" workspacePath="/VNA_embedded"/>
+		</configuration>
+		<configuration configurationName="Release">
+			<resource resourceType="PROJECT" workspacePath="/VNA_embedded"/>
+		</configuration>
+	</storageModule>
 </cproject>
\ No newline at end of file
diff --git a/Software/VNA_embedded/Application/Drivers/delay.cpp b/Software/VNA_embedded/Application/Drivers/delay.cpp
index 65a9a2f..3d9915c 100644
--- a/Software/VNA_embedded/Application/Drivers/delay.cpp
+++ b/Software/VNA_embedded/Application/Drivers/delay.cpp
@@ -35,8 +35,8 @@ void Delay::ms(uint32_t t) {
 		us(1000);
 	}
 }
-void Delay::us(uint32_t t) {
-	uint64_t start = TIM1->CNT;
+void Delay::us(uint16_t t) {
+	uint16_t start = TIM1->CNT;
 	while(TIM1->CNT - start < t);
 }
 
diff --git a/Software/VNA_embedded/Application/Drivers/delay.hpp b/Software/VNA_embedded/Application/Drivers/delay.hpp
index 27e8492..b6eedf1 100644
--- a/Software/VNA_embedded/Application/Drivers/delay.hpp
+++ b/Software/VNA_embedded/Application/Drivers/delay.hpp
@@ -9,6 +9,6 @@ void Init();
 uint64_t get_us();
 
 void ms(uint32_t t);
-void us(uint32_t t);
+void us(uint16_t t);
 
 }