From 0fa75aaeb8144f13d42de60bec13ab2a2cdc7126 Mon Sep 17 00:00:00 2001 From: heck Date: Mon, 7 Aug 2023 19:54:43 +0200 Subject: [PATCH] MX ONLY: add TIMER7 for buffer timer --- .../Src/stm32f4xx_hal_dac.c | 2 -- raw407cxx.ioc | 19 +++++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c b/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c index 582ae43..ff49c2f 100644 --- a/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c +++ b/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c @@ -373,9 +373,7 @@ HAL_StatusTypeDef HAL_DAC_DeInit(DAC_HandleTypeDef *hdac) * @param hdac pointer to a DAC_HandleTypeDef structure that contains * the configuration information for the specified DAC. * @retval None - */ - __weak void HAL_DAC_MspInit(DAC_HandleTypeDef *hdac) { /* Prevent unused argument(s) compilation warning */ diff --git a/raw407cxx.ioc b/raw407cxx.ioc index 9496c25..4fb9387 100644 --- a/raw407cxx.ioc +++ b/raw407cxx.ioc @@ -32,9 +32,10 @@ Mcu.IP3=NVIC Mcu.IP4=RCC Mcu.IP5=TIM2 Mcu.IP6=TIM6 -Mcu.IP7=USB_DEVICE -Mcu.IP8=USB_OTG_FS -Mcu.IPNb=9 +Mcu.IP7=TIM7 +Mcu.IP8=USB_DEVICE +Mcu.IP9=USB_OTG_FS +Mcu.IPNb=10 Mcu.Name=STM32F407V(E-G)Tx Mcu.Package=LQFP100 Mcu.Pin0=PC14-OSC32_IN @@ -42,7 +43,8 @@ Mcu.Pin1=PC15-OSC32_OUT Mcu.Pin10=VP_FREERTOS_VS_CMSIS_V2 Mcu.Pin11=VP_TIM2_VS_ClockSourceINT Mcu.Pin12=VP_TIM6_VS_ClockSourceINT -Mcu.Pin13=VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS +Mcu.Pin13=VP_TIM7_VS_ClockSourceINT +Mcu.Pin14=VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS Mcu.Pin2=PH0-OSC_IN Mcu.Pin3=PH1-OSC_OUT Mcu.Pin4=PA0-WKUP @@ -51,7 +53,7 @@ Mcu.Pin6=PA5 Mcu.Pin7=PD12 Mcu.Pin8=PA11 Mcu.Pin9=PA12 -Mcu.PinsNb=14 +Mcu.PinsNb=15 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32F407VGTx @@ -74,6 +76,7 @@ NVIC.SavedSvcallIrqHandlerGenerated=true NVIC.SavedSystickIrqHandlerGenerated=true NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:true\:false\:true\:false NVIC.TIM2_IRQn=true\:5\:0\:false\:false\:true\:true\:true\:true\:true +NVIC.TIM7_IRQn=true\:5\:0\:false\:false\:true\:true\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false PA0-WKUP.GPIOParameters=GPIO_Label PA0-WKUP.GPIO_Label=BUT_BLUE @@ -126,7 +129,7 @@ ProjectManager.StackSize=0x400 ProjectManager.TargetToolchain=STM32CubeIDE ProjectManager.ToolChainLocation= ProjectManager.UnderRoot=true -ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_USB_DEVICE_Init-USB_DEVICE-false-HAL-false,5-MX_DAC_Init-DAC-false-HAL-true,6-MX_TIM2_Init-TIM2-false-HAL-true,7-MX_TIM6_Init-TIM6-false-HAL-true +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_USB_DEVICE_Init-USB_DEVICE-false-HAL-false,5-MX_DAC_Init-DAC-false-HAL-true,6-MX_TIM2_Init-TIM2-false-HAL-true,7-MX_TIM6_Init-TIM6-false-HAL-true,8-MX_TIM7_Init-TIM7-false-HAL-true RCC.48MHZClocksFreq_Value=48000000 RCC.AHBFreq_Value=168000000 RCC.APB1CLKDivider=RCC_HCLK_DIV4 @@ -168,6 +171,8 @@ SH.GPXTI0.ConfNb=1 TIM6.IPParameters=TIM_MasterOutputTrigger,Period TIM6.Period=600 TIM6.TIM_MasterOutputTrigger=TIM_TRGO_UPDATE +TIM7.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE +TIM7.IPParameters=AutoReloadPreload USB_DEVICE.CLASS_NAME_FS=CDC USB_DEVICE.IPParameters=VirtualMode-CDC_FS,VirtualModeFS,CLASS_NAME_FS,PRODUCT_STRING_CDC_FS,MANUFACTURER_STRING-CDC_FS USB_DEVICE.MANUFACTURER_STRING-CDC_FS=Heck @@ -182,6 +187,8 @@ VP_TIM2_VS_ClockSourceINT.Mode=Internal VP_TIM2_VS_ClockSourceINT.Signal=TIM2_VS_ClockSourceINT VP_TIM6_VS_ClockSourceINT.Mode=Enable_Timer VP_TIM6_VS_ClockSourceINT.Signal=TIM6_VS_ClockSourceINT +VP_TIM7_VS_ClockSourceINT.Mode=Enable_Timer +VP_TIM7_VS_ClockSourceINT.Signal=TIM7_VS_ClockSourceINT VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS.Mode=CDC_FS VP_USB_DEVICE_VS_USB_DEVICE_CDC_FS.Signal=USB_DEVICE_VS_USB_DEVICE_CDC_FS board=custom