caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix integer size bug for Delay::us

Browse Source
This commit is contained in:
Jan Käberich 2022-06-26 12:46:11 +02:00
parent 69269b4179
commit 4541dcb71b
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Software/VNA_embedded/.cproject
View File

@ -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"> <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="DEBUG"/>
<listOptionValue builtIn="false" value="FW_MAJOR=1"/> <listOptionValue builtIn="false" value="FW_MAJOR=1"/>
<listOptionValue builtIn="false" value="FW_MINOR=2"/> <listOptionValue builtIn="false" value="FW_MINOR=3"/>
<listOptionValue builtIn="false" value="FW_PATCH=1"/> <listOptionValue builtIn="false" value="FW_PATCH=0"/>
<listOptionValue builtIn="false" value="HW_REVISION='B'"/> <listOptionValue builtIn="false" value="HW_REVISION='B'"/>
<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/> <listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
<listOptionValue builtIn="false" value="USE_HAL_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"> <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="DEBUG"/>
<listOptionValue builtIn="false" value="FW_MAJOR=1"/> <listOptionValue builtIn="false" value="FW_MAJOR=1"/>
<listOptionValue builtIn="false" value="FW_MINOR=2"/> <listOptionValue builtIn="false" value="FW_MINOR=3"/>
<listOptionValue builtIn="false" value="FW_PATCH=1"/> <listOptionValue builtIn="false" value="FW_PATCH=0"/>
<listOptionValue builtIn="false" value="HW_REVISION='B'"/> <listOptionValue builtIn="false" value="HW_REVISION='B'"/>
<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/> <listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/> <listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
@ -265,4 +265,12 @@
<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/> <autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo> </scannerConfigBuildInfo>
</storageModule> </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> </cproject>

4
Software/VNA_embedded/Application/Drivers/delay.cpp
View File

@ -35,8 +35,8 @@ void Delay::ms(uint32_t t) {
us(1000); us(1000);
} }
} }
void Delay::us(uint32_t t) { void Delay::us(uint16_t t) {
uint64_t start = TIM1->CNT; uint16_t start = TIM1->CNT;
while(TIM1->CNT - start < t); while(TIM1->CNT - start < t);
} }

2
Software/VNA_embedded/Application/Drivers/delay.hpp
View File

@ -9,6 +9,6 @@ void Init();
uint64_t get_us(); uint64_t get_us();
void ms(uint32_t t); void ms(uint32_t t);
void us(uint32_t t); void us(uint16_t t);
} }