Skip to content

Commit 707d62d

Browse files
committed
Split calc_ADC_temp() to distinct functions
calc_ADC_temp_reduced_div(), fixed point math to reduce divisions calc_ADC_temp_int(), normal integer math calc_ADC_temp_float(), floating point math They return HAL status, results are passed as arguments. Formatted adc.c
1 parent 3317ee5 commit 707d62d

5 files changed

Lines changed: 241 additions & 165 deletions

File tree

code/CM7/.cproject

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.698213086" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="NUCLEO-H755ZI-Q" valueType="string"/>
2626
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1991574620" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.6 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || NUCLEO-H755ZI-Q || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../../Drivers/STM32H7xx_HAL_Driver/Inc | ../../Drivers/STM32H7xx_HAL_Driver/Inc/Legacy | ../../Middlewares/Third_Party/FreeRTOS/Source/include | ../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 | ../../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F | ../../Drivers/CMSIS/RTOS2/Include | ../../Drivers/BSP/STM32H7xx_Nucleo | ../../Drivers/CMSIS/Device/ST/STM32H7xx/Include | ../../Drivers/CMSIS/Include || ../Core/Inc | ../../Drivers/STM32H7xx_HAL_Driver/Inc | ../../Drivers/STM32H7xx_HAL_Driver/Inc/Legacy | ../../Middlewares/Third_Party/FreeRTOS/Source/include | ../../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2 | ../../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F | ../../Drivers/CMSIS/RTOS2/Include | ../../Drivers/BSP/STM32H7xx_Nucleo | ../../Drivers/CMSIS/Device/ST/STM32H7xx/Include | ../../Drivers/CMSIS/Include || || CORE_CM7 | USE_HAL_DRIVER | STM32H755xx | USE_PWR_DIRECT_SMPS_SUPPLY || || Core/Src | Drivers | Core/Startup | Middlewares | Common || || || ${workspace_loc:/${ProjName}/STM32H755ZITX_FLASH.ld} || true || NonSecure || || secure_nsclib.o || || None || || || || ::" valueType="string"/>
2727
<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.1411568555" name="Cpu clock frequence" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" useByScannerDiscovery="false" value="200" valueType="string"/>
28+
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoprintffloat.755208181" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoprintffloat" value="true" valueType="boolean"/>
2829
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.265025416" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
2930
<builder buildPath="${workspace_loc:/sensor_playground_CM7}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1945780568" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
3031
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1200440785" name="MCU/MPU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">

code/CM7/Core/Inc/adc.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ void MX_ADC3_Init(void);
4848

4949
/* USER CODE BEGIN Prototypes */
5050
void start_ADC_DMA();
51-
void calc_ADC_temp();
51+
HAL_StatusTypeDef calc_ADC_temp_reduced_div( int64_t* const result );
52+
HAL_StatusTypeDef calc_ADC_temp_int( int64_t* const result );
53+
HAL_StatusTypeDef calc_ADC_temp_float( float* const result );
5254

5355
/* USER CODE END Prototypes */
5456

0 commit comments

Comments
 (0)