Skip to content

Commit a36a808

Browse files
committed
answer theory questions and configured ADC1 interrupt
1 parent 0aa91b1 commit a36a808

File tree

20 files changed

+1418
-1325
lines changed

20 files changed

+1418
-1325
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
522 Bytes
Binary file not shown.

labs/lab5/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi

Lines changed: 1297 additions & 1290 deletions
Large diffs are not rendered by default.

labs/lab5/3_tau.png

50.8 KB
Loading

labs/lab5/5_tau.png

17.5 KB
Loading

labs/lab5/adc/.cproject

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1518259673" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="NUCLEO-F411RE" valueType="string"/>
2626
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.8002118" 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-F411RE || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy | ../Drivers/CMSIS/Device/ST/STM32F4xx/Include | ../Drivers/CMSIS/Include || || || USE_HAL_DRIVER | STM32F411xE || || Drivers | Core/Startup | Core || || || ${workspace_loc:/${ProjName}/STM32F411RETX_FLASH.ld} || true || NonSecure || || secure_nsclib.o || || None || || || " valueType="string"/>
2727
<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.1472552714" name="Cpu clock frequence" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" useByScannerDiscovery="false" value="84" valueType="string"/>
28-
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoprintffloat.1410040128" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoprintffloat" value="true" valueType="boolean"/>
28+
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoprintffloat.1410040128" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoprintffloat" useByScannerDiscovery="false" value="true" valueType="boolean"/>
2929
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1249773241" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
3030
<builder buildPath="${workspace_loc:/adc}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1728084159" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
3131
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.631221539" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">

labs/lab5/adc/Core/Inc/stm32f4xx_it.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ void SVC_Handler(void);
5555
void DebugMon_Handler(void);
5656
void PendSV_Handler(void);
5757
void SysTick_Handler(void);
58+
void ADC_IRQHandler(void);
5859
void TIM2_IRQHandler(void);
5960
/* USER CODE BEGIN EFP */
6061

labs/lab5/adc/Core/Src/main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
/* USER CODE END Header */
1919
/* Includes ------------------------------------------------------------------*/
2020
#include "main.h"
21+
2122
/* Private includes ----------------------------------------------------------*/
2223
/* USER CODE BEGIN Includes */
2324
#include "lcd.h"
@@ -269,8 +270,8 @@ static void MX_ADC1_Init(void)
269270
hadc1.Instance = ADC1;
270271
hadc1.Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4;
271272
hadc1.Init.Resolution = ADC_RESOLUTION_12B;
272-
hadc1.Init.ScanConvMode = DISABLE;
273-
hadc1.Init.ContinuousConvMode = DISABLE;
273+
hadc1.Init.ScanConvMode = ENABLE;
274+
hadc1.Init.ContinuousConvMode = ENABLE;
274275
hadc1.Init.DiscontinuousConvMode = DISABLE;
275276
hadc1.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
276277
hadc1.Init.ExternalTrigConv = ADC_SOFTWARE_START;

0 commit comments

Comments
 (0)