This commit is contained in:
2023-11-08 20:06:03 +01:00
parent a7ccf2ce66
commit 53e8d774c8
7 changed files with 61 additions and 60 deletions

File diff suppressed because one or more lines are too long

6
.vscode/launch.json vendored
View File

@@ -6,8 +6,8 @@
"configurations": [ "configurations": [
{ {
"name": "Cortex Debug Nucloe", "name": "Cortex Debug Nucloe",
"cwd": "${workspaceFolder}/func_gen_stm32f303re_nucleo/", "cwd": "${workspaceFolder}",
"executable": "./build/func_gen_stm32f303re_nucleo.elf", "executable": "${workspaceFolder}/build/${workspaceFolderBasename}.elf",
"request": "launch", "request": "launch",
"type": "cortex-debug", "type": "cortex-debug",
"runToEntryPoint": "main", "runToEntryPoint": "main",
@@ -24,7 +24,7 @@
"label": "RTT stdout", "label": "RTT stdout",
"port": 0, "port": 0,
"type": "console", "type": "console",
"timestamp": true "timestamp": false
}, },
// { // {
// "label": "RTT graph", // "label": "RTT graph",

View File

@@ -54,7 +54,7 @@ void MX_GPIO_Init(void)
/*Configure GPIO pin : PC13 */ /*Configure GPIO pin : PC13 */
GPIO_InitStruct.Pin = GPIO_PIN_13; GPIO_InitStruct.Pin = GPIO_PIN_13;
GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING; GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Pull = GPIO_NOPULL;
HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);

View File

@@ -47,7 +47,7 @@
/* Private variables ---------------------------------------------------------*/ /* Private variables ---------------------------------------------------------*/
/* USER CODE BEGIN PV */ /* USER CODE BEGIN PV */
uint8_t data_ready; uint8_t data_ready = 1;
uint32_t soft_timer; uint32_t soft_timer;
uint16_t adc_data[ADC_DATA_LENGHT]; uint16_t adc_data[ADC_DATA_LENGHT];
/* USER CODE END PV */ /* USER CODE END PV */
@@ -101,7 +101,7 @@ int main(void)
MX_NVIC_Init(); MX_NVIC_Init();
/* USER CODE BEGIN 2 */ /* USER CODE BEGIN 2 */
soft_timer = HAL_GetTick(); soft_timer = HAL_GetTick();
// HAL_ADC_Start_DMA(&hadc1, adc_data, ADC_DATA_LENGHT); HAL_ADC_Start_DMA(&hadc1, adc_data, ADC_DATA_LENGHT);
HAL_TIM_OnePulse_Start(&htim15, TIM_CHANNEL_1); HAL_TIM_OnePulse_Start(&htim15, TIM_CHANNEL_1);
/* USER CODE END 2 */ /* USER CODE END 2 */
@@ -114,9 +114,9 @@ int main(void)
data_ready = 0; data_ready = 0;
for (uint8_t i = 0; i < ADC_DATA_LENGHT; i++) for (uint8_t i = 0; i < ADC_DATA_LENGHT; i++)
{ {
SEGGER_RTT_printf(0, "%02d: %d\n", i, adc_data[i]); SEGGER_RTT_printf(0, "%02d %d\n", i, adc_data[i]);
} }
} }
/* USER CODE END WHILE */ /* USER CODE END WHILE */
/* USER CODE BEGIN 3 */ /* USER CODE BEGIN 3 */
@@ -191,7 +191,7 @@ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *hadc)
void HAL_GPIO_EXTI_Falling_Callback(uint16_t GPIO_Pin) void HAL_GPIO_EXTI_Falling_Callback(uint16_t GPIO_Pin)
{ {
if (GPIO_Pin == 13 && soft_timer + 50 < HAL_GetTick()) if (GPIO_Pin == GPIO_PIN_13 && soft_timer + 50 < HAL_GetTick())
{ {
soft_timer = HAL_GetTick(); soft_timer = HAL_GetTick();
__HAL_TIM_ENABLE(&htim15); __HAL_TIM_ENABLE(&htim15);

View File

@@ -1,21 +1,21 @@
/* USER CODE BEGIN Header */ /* USER CODE BEGIN Header */
/** /**
****************************************************************************** ******************************************************************************
* @file tim.c * @file tim.c
* @brief This file provides code for the configuration * @brief This file provides code for the configuration
* of the TIM instances. * of the TIM instances.
****************************************************************************** ******************************************************************************
* @attention * @attention
* *
* Copyright (c) 2023 STMicroelectronics. * Copyright (c) 2023 STMicroelectronics.
* All rights reserved. * All rights reserved.
* *
* This software is licensed under terms that can be found in the LICENSE file * This software is licensed under terms that can be found in the LICENSE file
* in the root directory of this software component. * in the root directory of this software component.
* If no LICENSE file comes with this software, it is provided AS-IS. * If no LICENSE file comes with this software, it is provided AS-IS.
* *
****************************************************************************** ******************************************************************************
*/ */
/* USER CODE END Header */ /* USER CODE END Header */
/* Includes ------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/
#include "tim.h" #include "tim.h"
@@ -43,7 +43,7 @@ void MX_TIM15_Init(void)
/* USER CODE END TIM15_Init 1 */ /* USER CODE END TIM15_Init 1 */
htim15.Instance = TIM15; htim15.Instance = TIM15;
htim15.Init.Prescaler = 19999; htim15.Init.Prescaler = 124;
htim15.Init.CounterMode = TIM_COUNTERMODE_UP; htim15.Init.CounterMode = TIM_COUNTERMODE_UP;
htim15.Init.Period = 31; htim15.Init.Period = 31;
htim15.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; htim15.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
@@ -99,21 +99,20 @@ void MX_TIM15_Init(void)
/* USER CODE END TIM15_Init 2 */ /* USER CODE END TIM15_Init 2 */
HAL_TIM_MspPostInit(&htim15); HAL_TIM_MspPostInit(&htim15);
} }
void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle) void HAL_TIM_Base_MspInit(TIM_HandleTypeDef *tim_baseHandle)
{ {
RCC_PeriphCLKInitTypeDef PeriphClkInit = {0}; RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
if(tim_baseHandle->Instance==TIM15) if (tim_baseHandle->Instance == TIM15)
{ {
/* USER CODE BEGIN TIM15_MspInit 0 */ /* USER CODE BEGIN TIM15_MspInit 0 */
/* USER CODE END TIM15_MspInit 0 */ /* USER CODE END TIM15_MspInit 0 */
/** Initializes the peripherals clocks /** Initializes the peripherals clocks
*/ */
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_TIM15; PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_TIM15;
PeriphClkInit.Tim15ClockSelection = RCC_TIM15CLKSOURCE_PCLK1; PeriphClkInit.Tim15ClockSelection = RCC_TIM15CLKSOURCE_PCLK1;
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
@@ -123,20 +122,20 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle)
/* TIM15 clock enable */ /* TIM15 clock enable */
__HAL_RCC_TIM15_CLK_ENABLE(); __HAL_RCC_TIM15_CLK_ENABLE();
/* USER CODE BEGIN TIM15_MspInit 1 */ /* USER CODE BEGIN TIM15_MspInit 1 */
/* USER CODE END TIM15_MspInit 1 */ /* USER CODE END TIM15_MspInit 1 */
} }
} }
void HAL_TIM_MspPostInit(TIM_HandleTypeDef* timHandle) void HAL_TIM_MspPostInit(TIM_HandleTypeDef *timHandle)
{ {
GPIO_InitTypeDef GPIO_InitStruct = {0}; GPIO_InitTypeDef GPIO_InitStruct = {0};
if(timHandle->Instance==TIM15) if (timHandle->Instance == TIM15)
{ {
/* USER CODE BEGIN TIM15_MspPostInit 0 */ /* USER CODE BEGIN TIM15_MspPostInit 0 */
/* USER CODE END TIM15_MspPostInit 0 */ /* USER CODE END TIM15_MspPostInit 0 */
__HAL_RCC_GPIOC_CLK_ENABLE(); __HAL_RCC_GPIOC_CLK_ENABLE();
/**TIM15 GPIO Configuration /**TIM15 GPIO Configuration
@@ -149,26 +148,25 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* timHandle)
GPIO_InitStruct.Alternate = GPIO_AF2_TIM15; GPIO_InitStruct.Alternate = GPIO_AF2_TIM15;
HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
/* USER CODE BEGIN TIM15_MspPostInit 1 */ /* USER CODE BEGIN TIM15_MspPostInit 1 */
/* USER CODE END TIM15_MspPostInit 1 */ /* USER CODE END TIM15_MspPostInit 1 */
} }
} }
void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle) void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef *tim_baseHandle)
{ {
if(tim_baseHandle->Instance==TIM15) if (tim_baseHandle->Instance == TIM15)
{ {
/* USER CODE BEGIN TIM15_MspDeInit 0 */ /* USER CODE BEGIN TIM15_MspDeInit 0 */
/* USER CODE END TIM15_MspDeInit 0 */ /* USER CODE END TIM15_MspDeInit 0 */
/* Peripheral clock disable */ /* Peripheral clock disable */
__HAL_RCC_TIM15_CLK_DISABLE(); __HAL_RCC_TIM15_CLK_DISABLE();
/* USER CODE BEGIN TIM15_MspDeInit 1 */ /* USER CODE BEGIN TIM15_MspDeInit 1 */
/* USER CODE END TIM15_MspDeInit 1 */ /* USER CODE END TIM15_MspDeInit 1 */
} }
} }

View File

@@ -1,5 +1,5 @@
########################################################################################################################## ##########################################################################################################################
# File automatically-generated by tool: [projectgenerator] version: [3.17.1] date: [Mon Nov 06 20:23:19 CET 2023] # File automatically-generated by tool: [projectgenerator] version: [3.17.1] date: [Mon Nov 06 21:32:00 CET 2023]
########################################################################################################################## ##########################################################################################################################
# ------------------------------------------------ # ------------------------------------------------
@@ -65,7 +65,7 @@ Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim.c \
Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim_ex.c \ Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim_ex.c \
Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_uart.c \ Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_uart.c \
Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_uart_ex.c \ Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_uart_ex.c \
Core/Src/system_stm32g0xx.c Core/Src/system_stm32g0xx.c
C_SOURCES += utils/rtt/SEGGER_RTT.c C_SOURCES += utils/rtt/SEGGER_RTT.c
C_SOURCES += utils/rtt/SEGGER_RTT_printf.c C_SOURCES += utils/rtt/SEGGER_RTT_printf.c
@@ -129,7 +129,8 @@ C_INCLUDES = \
-IDrivers/STM32G0xx_HAL_Driver/Inc \ -IDrivers/STM32G0xx_HAL_Driver/Inc \
-IDrivers/STM32G0xx_HAL_Driver/Inc/Legacy \ -IDrivers/STM32G0xx_HAL_Driver/Inc/Legacy \
-IDrivers/CMSIS/Device/ST/STM32G0xx/Include \ -IDrivers/CMSIS/Device/ST/STM32G0xx/Include \
-IDrivers/CMSIS/Include -IDrivers/CMSIS/Include \
-IDrivers/CMSIS/Include
C_INCLUDES += -Iutils/rtt C_INCLUDES += -Iutils/rtt
@@ -202,4 +203,4 @@ clean:
####################################### #######################################
-include $(wildcard $(BUILD_DIR)/*.d) -include $(wildcard $(BUILD_DIR)/*.d)
# *** EOF *** # *** EOF ***

View File

@@ -101,6 +101,8 @@ PA5.GPIO_Speed=GPIO_SPEED_FREQ_LOW
PA5.Locked=true PA5.Locked=true
PA5.Signal=GPIO_Output PA5.Signal=GPIO_Output
PC1.Signal=S_TIM15_CH1 PC1.Signal=S_TIM15_CH1
PC13.GPIOParameters=GPIO_ModeDefaultEXTI
PC13.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING
PC13.Locked=true PC13.Locked=true
PC13.Signal=GPXTI13 PC13.Signal=GPXTI13
PC14-OSC32_IN\ (PC14).Locked=true PC14-OSC32_IN\ (PC14).Locked=true