diff --git a/CM4/Core/Src/main.c b/CM4/Core/Src/main.c index ba664b6..f98b747 100644 --- a/CM4/Core/Src/main.c +++ b/CM4/Core/Src/main.c @@ -406,8 +406,8 @@ static void MX_GPIO_Init(void) /* GPIO Ports Clock Enable */ __HAL_RCC_GPIOF_CLK_ENABLE(); - __HAL_RCC_GPIOA_CLK_ENABLE(); __HAL_RCC_GPIOE_CLK_ENABLE(); + __HAL_RCC_GPIOA_CLK_ENABLE(); __HAL_RCC_GPIOC_CLK_ENABLE(); __HAL_RCC_GPIOD_CLK_ENABLE(); __HAL_RCC_GPIOG_CLK_ENABLE(); diff --git a/CM4/Core/Src/stm32h7xx_hal_msp.c b/CM4/Core/Src/stm32h7xx_hal_msp.c index 29d902a..3ec3d77 100644 --- a/CM4/Core/Src/stm32h7xx_hal_msp.c +++ b/CM4/Core/Src/stm32h7xx_hal_msp.c @@ -340,20 +340,12 @@ void HAL_UART_MspInit(UART_HandleTypeDef* huart) /* Peripheral clock enable */ __HAL_RCC_UART4_CLK_ENABLE(); - __HAL_RCC_GPIOA_CLK_ENABLE(); __HAL_RCC_GPIOB_CLK_ENABLE(); /**UART4 GPIO Configuration - PA0 ------> UART4_TX PB8 ------> UART4_RX + PB9 ------> UART4_TX */ - GPIO_InitStruct.Pin = GPIO_PIN_0; - GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; - GPIO_InitStruct.Pull = GPIO_NOPULL; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; - GPIO_InitStruct.Alternate = GPIO_AF8_UART4; - HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); - - GPIO_InitStruct.Pin = GPIO_PIN_8; + GPIO_InitStruct.Pin = GPIO_PIN_8|GPIO_PIN_9; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; @@ -384,12 +376,10 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* huart) __HAL_RCC_UART4_CLK_DISABLE(); /**UART4 GPIO Configuration - PA0 ------> UART4_TX PB8 ------> UART4_RX + PB9 ------> UART4_TX */ - HAL_GPIO_DeInit(GPIOA, GPIO_PIN_0); - - HAL_GPIO_DeInit(GPIOB, GPIO_PIN_8); + HAL_GPIO_DeInit(GPIOB, GPIO_PIN_8|GPIO_PIN_9); /* USER CODE BEGIN UART4_MspDeInit 1 */ diff --git a/CM7/Core/Src/stm32h7xx_hal_msp.c b/CM7/Core/Src/stm32h7xx_hal_msp.c index 3a8075e..0d74a13 100644 --- a/CM7/Core/Src/stm32h7xx_hal_msp.c +++ b/CM7/Core/Src/stm32h7xx_hal_msp.c @@ -443,10 +443,10 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi) __HAL_RCC_SPI2_CLK_ENABLE(); __HAL_RCC_GPIOC_CLK_ENABLE(); - __HAL_RCC_GPIOD_CLK_ENABLE(); + __HAL_RCC_GPIOB_CLK_ENABLE(); /**SPI2 GPIO Configuration PC2_C ------> SPI2_MISO - PD3 ------> SPI2_SCK + PB10 ------> SPI2_SCK */ GPIO_InitStruct.Pin = GPIO_PIN_2; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; @@ -455,12 +455,12 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi) GPIO_InitStruct.Alternate = GPIO_AF5_SPI2; HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); - GPIO_InitStruct.Pin = GPIO_PIN_3; + GPIO_InitStruct.Pin = GPIO_PIN_10; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Alternate = GPIO_AF5_SPI2; - HAL_GPIO_Init(GPIOD, &GPIO_InitStruct); + HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); /* USER CODE BEGIN SPI2_MspInit 1 */ @@ -592,11 +592,11 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) /**SPI2 GPIO Configuration PC2_C ------> SPI2_MISO - PD3 ------> SPI2_SCK + PB10 ------> SPI2_SCK */ HAL_GPIO_DeInit(GPIOC, GPIO_PIN_2); - HAL_GPIO_DeInit(GPIOD, GPIO_PIN_3); + HAL_GPIO_DeInit(GPIOB, GPIO_PIN_10); /* USER CODE BEGIN SPI2_MspDeInit 1 */ @@ -696,10 +696,11 @@ void HAL_TIM_Encoder_MspInit(TIM_HandleTypeDef* htim_encoder) __HAL_RCC_GPIOA_CLK_ENABLE(); /**TIM2 GPIO Configuration + PA0 ------> TIM2_CH1 PA1 ------> TIM2_CH2 - PA15 (JTDI) ------> TIM2_CH1 + PA2 ------> TIM2_CH3 */ - GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_15; + GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; @@ -722,8 +723,9 @@ void HAL_TIM_Encoder_MspInit(TIM_HandleTypeDef* htim_encoder) /**TIM4 GPIO Configuration PD12 ------> TIM4_CH1 PD13 ------> TIM4_CH2 + PD14 ------> TIM4_CH3 */ - GPIO_InitStruct.Pin = GPIO_PIN_12|GPIO_PIN_13; + GPIO_InitStruct.Pin = GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; @@ -900,10 +902,11 @@ void HAL_TIM_Encoder_MspDeInit(TIM_HandleTypeDef* htim_encoder) __HAL_RCC_TIM2_CLK_DISABLE(); /**TIM2 GPIO Configuration + PA0 ------> TIM2_CH1 PA1 ------> TIM2_CH2 - PA15 (JTDI) ------> TIM2_CH1 + PA2 ------> TIM2_CH3 */ - HAL_GPIO_DeInit(GPIOA, GPIO_PIN_1|GPIO_PIN_15); + HAL_GPIO_DeInit(GPIOA, GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2); /* USER CODE BEGIN TIM2_MspDeInit 1 */ @@ -920,8 +923,9 @@ void HAL_TIM_Encoder_MspDeInit(TIM_HandleTypeDef* htim_encoder) /**TIM4 GPIO Configuration PD12 ------> TIM4_CH1 PD13 ------> TIM4_CH2 + PD14 ------> TIM4_CH3 */ - HAL_GPIO_DeInit(GPIOD, GPIO_PIN_12|GPIO_PIN_13); + HAL_GPIO_DeInit(GPIOD, GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14); /* USER CODE BEGIN TIM4_MspDeInit 1 */ diff --git a/Makefile/CM4/Makefile b/Makefile/CM4/Makefile index 185a52f..ba92512 100644 --- a/Makefile/CM4/Makefile +++ b/Makefile/CM4/Makefile @@ -1,5 +1,5 @@ ########################################################################################################################## -# File automatically-generated by tool: [projectgenerator] version: [4.2.0-B44] date: [Mon Mar 25 15:30:34 EDT 2024] +# File automatically-generated by tool: [projectgenerator] version: [4.2.0-B44] date: [Mon Mar 25 15:47:23 EDT 2024] ########################################################################################################################## # ------------------------------------------------ diff --git a/Makefile/CM7/Makefile b/Makefile/CM7/Makefile index 5dc3f2a..1efaffa 100644 --- a/Makefile/CM7/Makefile +++ b/Makefile/CM7/Makefile @@ -1,5 +1,5 @@ ########################################################################################################################## -# File automatically-generated by tool: [projectgenerator] version: [4.2.0-B44] date: [Mon Mar 25 15:30:34 EDT 2024] +# File automatically-generated by tool: [projectgenerator] version: [4.2.0-B44] date: [Mon Mar 25 15:47:23 EDT 2024] ########################################################################################################################## # ------------------------------------------------ diff --git a/proteus.ioc b/proteus.ioc index 5229ddc..af45b6d 100644 --- a/proteus.ioc +++ b/proteus.ioc @@ -174,76 +174,78 @@ Mcu.Pin17=PC3_C Mcu.Pin18=PA0 Mcu.Pin19=PA1 Mcu.Pin2=PE4 -Mcu.Pin20=PA3 -Mcu.Pin21=PA4 -Mcu.Pin22=PA5 -Mcu.Pin23=PA6 -Mcu.Pin24=PA7 -Mcu.Pin25=PC4 -Mcu.Pin26=PC5 -Mcu.Pin27=PB0 -Mcu.Pin28=PB1 -Mcu.Pin29=PE7 +Mcu.Pin20=PA2 +Mcu.Pin21=PA3 +Mcu.Pin22=PA4 +Mcu.Pin23=PA5 +Mcu.Pin24=PA6 +Mcu.Pin25=PA7 +Mcu.Pin26=PC4 +Mcu.Pin27=PC5 +Mcu.Pin28=PB0 +Mcu.Pin29=PB1 Mcu.Pin3=PE5 -Mcu.Pin30=PE8 -Mcu.Pin31=PE9 -Mcu.Pin32=PE10 -Mcu.Pin33=PE11 -Mcu.Pin34=PE12 -Mcu.Pin35=PE13 -Mcu.Pin36=PB13 -Mcu.Pin37=PB14 -Mcu.Pin38=PB15 -Mcu.Pin39=PD8 +Mcu.Pin30=PE7 +Mcu.Pin31=PE8 +Mcu.Pin32=PE9 +Mcu.Pin33=PE10 +Mcu.Pin34=PE11 +Mcu.Pin35=PE12 +Mcu.Pin36=PE13 +Mcu.Pin37=PB10 +Mcu.Pin38=PB13 +Mcu.Pin39=PB14 Mcu.Pin4=PE6 -Mcu.Pin40=PD9 -Mcu.Pin41=PD10 -Mcu.Pin42=PD12 -Mcu.Pin43=PD13 -Mcu.Pin44=PG6 -Mcu.Pin45=PG7 -Mcu.Pin46=PG8 -Mcu.Pin47=PC6 -Mcu.Pin48=PC7 -Mcu.Pin49=PC8 +Mcu.Pin40=PB15 +Mcu.Pin41=PD8 +Mcu.Pin42=PD9 +Mcu.Pin43=PD10 +Mcu.Pin44=PD12 +Mcu.Pin45=PD13 +Mcu.Pin46=PD14 +Mcu.Pin47=PG6 +Mcu.Pin48=PG7 +Mcu.Pin49=PG8 Mcu.Pin5=PC13 -Mcu.Pin50=PA8 -Mcu.Pin51=PA9 -Mcu.Pin52=PA11 -Mcu.Pin53=PA12 -Mcu.Pin54=PA13 (JTMS/SWDIO) -Mcu.Pin55=PA14 (JTCK/SWCLK) -Mcu.Pin56=PA15 (JTDI) -Mcu.Pin57=PC10 -Mcu.Pin58=PC11 -Mcu.Pin59=PD0 +Mcu.Pin50=PC6 +Mcu.Pin51=PC7 +Mcu.Pin52=PC8 +Mcu.Pin53=PA8 +Mcu.Pin54=PA9 +Mcu.Pin55=PA11 +Mcu.Pin56=PA12 +Mcu.Pin57=PA13 (JTMS/SWDIO) +Mcu.Pin58=PA14 (JTCK/SWCLK) +Mcu.Pin59=PC10 Mcu.Pin6=PC14-OSC32_IN (OSC32_IN) -Mcu.Pin60=PD1 -Mcu.Pin61=PD3 -Mcu.Pin62=PD6 -Mcu.Pin63=PD7 -Mcu.Pin64=PG9 -Mcu.Pin65=PG10 -Mcu.Pin66=PG11 -Mcu.Pin67=PG12 -Mcu.Pin68=PG14 -Mcu.Pin69=PB3 (JTDO/TRACESWO) +Mcu.Pin60=PC11 +Mcu.Pin61=PD0 +Mcu.Pin62=PD1 +Mcu.Pin63=PD6 +Mcu.Pin64=PD7 +Mcu.Pin65=PG9 +Mcu.Pin66=PG10 +Mcu.Pin67=PG11 +Mcu.Pin68=PG12 +Mcu.Pin69=PG14 Mcu.Pin7=PC15-OSC32_OUT (OSC32_OUT) -Mcu.Pin70=PB4 (NJTRST) -Mcu.Pin71=PB5 -Mcu.Pin72=PB6 -Mcu.Pin73=PB7 -Mcu.Pin74=PB8 -Mcu.Pin75=PE0 -Mcu.Pin76=VP_CRC_VS_CRC -Mcu.Pin77=VP_FREERTOS_M4_VS_CMSIS_V2 -Mcu.Pin78=VP_FREERTOS_M7_VS_CMSIS_V2 -Mcu.Pin79=VP_SYS_VS_Systick +Mcu.Pin70=PB3 (JTDO/TRACESWO) +Mcu.Pin71=PB4 (NJTRST) +Mcu.Pin72=PB5 +Mcu.Pin73=PB6 +Mcu.Pin74=PB7 +Mcu.Pin75=PB8 +Mcu.Pin76=PB9 +Mcu.Pin77=PE0 +Mcu.Pin78=VP_CRC_VS_CRC +Mcu.Pin79=VP_FREERTOS_M4_VS_CMSIS_V2 Mcu.Pin8=PF6 -Mcu.Pin80=VP_SYS_M4_VS_Systick -Mcu.Pin81=VP_TIM5_VS_ClockSourceINT +Mcu.Pin80=VP_FREERTOS_M7_VS_CMSIS_V2 +Mcu.Pin81=VP_SYS_VS_Systick +Mcu.Pin82=VP_SYS_M4_VS_Systick +Mcu.Pin83=VP_TIM5_VS_ClockSourceINT Mcu.Pin9=PF7 -Mcu.PinsNb=82 +Mcu.PinsNb=84 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32H745ZITx @@ -281,9 +283,8 @@ NVIC2.SavedSystickIrqHandlerGenerated=true NVIC2.SysTick_IRQn=true\:15\:0\:false\:false\:true\:true\:false\:true\:false NVIC2.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false PA0.GPIOParameters=PinAttribute -PA0.Mode=Asynchronous -PA0.PinAttribute=CortexM4 -PA0.Signal=UART4_TX +PA0.PinAttribute=CortexM7 +PA0.Signal=S_TIM2_CH1_ETR PA1.GPIOParameters=PinAttribute PA1.PinAttribute=CortexM7 PA1.Signal=S_TIM2_CH2 @@ -303,9 +304,10 @@ PA14\ (JTCK/SWCLK).GPIOParameters=PinAttribute PA14\ (JTCK/SWCLK).Mode=Trace_Asynchronous_SW PA14\ (JTCK/SWCLK).PinAttribute=CortexM7 PA14\ (JTCK/SWCLK).Signal=DEBUG_JTCK-SWCLK -PA15\ (JTDI).GPIOParameters=PinAttribute -PA15\ (JTDI).PinAttribute=CortexM7 -PA15\ (JTDI).Signal=S_TIM2_CH1_ETR +PA2.GPIOParameters=PinAttribute +PA2.Locked=true +PA2.PinAttribute=CortexM7 +PA2.Signal=S_TIM2_CH3 PA3.Locked=true PA3.Signal=ADCx_INP15 PA4.Locked=true @@ -334,6 +336,10 @@ PB0.Signal=ADCx_INP9 PB1.GPIOParameters=PinAttribute PB1.PinAttribute=CortexM7 PB1.Signal=ADCx_INP5 +PB10.GPIOParameters=PinAttribute +PB10.Mode=RX_Only_Simplex_Unidirect_Master +PB10.PinAttribute=CortexM7 +PB10.Signal=SPI2_SCK PB13.GPIOParameters=PinAttribute PB13.Mode=PWM Generation1 CH1 CH1N PB13.PinAttribute=CortexM7 @@ -373,6 +379,10 @@ PB8.GPIOParameters=PinAttribute PB8.Mode=Asynchronous PB8.PinAttribute=CortexM4 PB8.Signal=UART4_RX +PB9.GPIOParameters=PinAttribute +PB9.Mode=Asynchronous +PB9.PinAttribute=CortexM4 +PB9.Signal=UART4_TX PC0.GPIOParameters=PinAttribute PC0.Locked=true PC0.PinAttribute=CortexM7 @@ -394,7 +404,8 @@ PC13.GPIO_Label=LED_1 PC13.Locked=true PC13.PinAttribute=Free PC13.Signal=GPIO_Output -PC14-OSC32_IN\ (OSC32_IN).GPIOParameters=PinAttribute +PC14-OSC32_IN\ (OSC32_IN).GPIOParameters=GPIO_Label,PinAttribute +PC14-OSC32_IN\ (OSC32_IN).GPIO_Label=LED_2 PC14-OSC32_IN\ (OSC32_IN).Locked=true PC14-OSC32_IN\ (OSC32_IN).PinAttribute=Free PC14-OSC32_IN\ (OSC32_IN).Signal=GPIO_Output @@ -446,10 +457,10 @@ PD12.Signal=S_TIM4_CH1 PD13.GPIOParameters=PinAttribute PD13.PinAttribute=CortexM7 PD13.Signal=S_TIM4_CH2 -PD3.GPIOParameters=PinAttribute -PD3.Mode=RX_Only_Simplex_Unidirect_Master -PD3.PinAttribute=CortexM7 -PD3.Signal=SPI2_SCK +PD14.GPIOParameters=PinAttribute +PD14.Locked=true +PD14.PinAttribute=CortexM7 +PD14.Signal=S_TIM4_CH3 PD6.GPIOParameters=GPIO_Label,PinAttribute PD6.GPIO_Label=ADC_RST_A PD6.Locked=true @@ -492,7 +503,8 @@ PE2.GPIOParameters=PinAttribute PE2.Mode=RX_Only_Simplex_Unidirect_Master PE2.PinAttribute=CortexM7 PE2.Signal=SPI4_SCK -PE3.GPIOParameters=PinAttribute +PE3.GPIOParameters=GPIO_Label,PinAttribute +PE3.GPIO_Label=LV_INTRLCK PE3.Locked=true PE3.PinAttribute=Free PE3.Signal=GPIO_Input @@ -621,7 +633,7 @@ ProjectManager.ToolChainLocation= ProjectManager.UAScriptAfterPath= ProjectManager.UAScriptBeforePath= ProjectManager.UnderRoot=false -ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false-CortexM7,2-MX_GPIO_Init-GPIO-false-HAL-true-CortexM7,3-MX_DMA_Init-DMA-false-HAL-true-CortexM7,4-MX_ADC1_Init-ADC1-false-HAL-true-CortexM7,5-MX_ADC3_Init-ADC3-false-HAL-true-CortexM7,6-MX_FDCAN1_Init-FDCAN1-true-HAL-false-CortexM7,7-MX_SPI1_Init-SPI1-false-HAL-true-CortexM7,8-MX_SPI2_Init-SPI2-false-HAL-true-CortexM7,9-MX_SPI3_Init-SPI3-false-HAL-true-CortexM7,10-MX_SPI4_Init-SPI4-false-HAL-true-CortexM7,11-MX_TIM1_Init-TIM1-false-HAL-true-CortexM7,12-MX_TIM2_Init-TIM2-false-HAL-true-CortexM7,13-MX_TIM4_Init-TIM4-false-HAL-true-CortexM7,14-MX_TIM8_Init-TIM8-false-HAL-true-CortexM7,15-MX_CRC_Init-CRC-false-HAL-true-CortexM7,16-MX_FREERTOS_Init-FREERTOS_M7-false-HAL-false-CortexM7,17-MX_TIM5_Init-TIM5-false-HAL-true-CortexM7,1-MX_GPIO_Init-GPIO-false-HAL-true-CortexM4,2-MX_DMA_Init-DMA-false-HAL-true-CortexM4,3-MX_FDCAN1_Init-FDCAN1-false-HAL-true-CortexM4,4-MX_QUADSPI_Init-QUADSPI-false-HAL-true-CortexM4,5-MX_USB_OTG_FS_PCD_Init-USB_OTG_FS-false-HAL-true-CortexM4,6-MX_UART4_Init-UART4-false-HAL-true-CortexM4,7-MX_CRC_Init-CRC-true-HAL-false-CortexM4,8-MX_FREERTOS_Init-FREERTOS_M4-false-HAL-false-CortexM4,0-MX_CORTEX_M7_Init-CORTEX_M7-false-HAL-true-CortexM7,0-MX_CORTEX_M4_Init-CORTEX_M4-false-HAL-true-CortexM4 +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false-CortexM7,2-MX_GPIO_Init-GPIO-false-HAL-true-CortexM7,3-MX_DMA_Init-DMA-false-HAL-true-CortexM7,4-MX_ADC1_Init-ADC1-false-HAL-true-CortexM7,5-MX_ADC3_Init-ADC3-false-HAL-true-CortexM7,6-MX_FDCAN1_Init-FDCAN1-true-HAL-false-CortexM7,7-MX_SPI1_Init-SPI1-false-HAL-true-CortexM7,8-MX_SPI2_Init-SPI2-false-HAL-true-CortexM7,9-MX_SPI3_Init-SPI3-false-HAL-true-CortexM7,10-MX_SPI4_Init-SPI4-false-HAL-true-CortexM7,11-MX_TIM1_Init-TIM1-false-HAL-true-CortexM7,12-MX_TIM2_Init-TIM2-false-HAL-true-CortexM7,13-MX_TIM4_Init-TIM4-false-HAL-true-CortexM7,14-MX_TIM8_Init-TIM8-false-HAL-true-CortexM7,15-MX_CRC_Init-CRC-false-HAL-true-CortexM7,16-MX_FREERTOS_Init-FREERTOS_M7-false-HAL-false-CortexM7,1-MX_GPIO_Init-GPIO-false-HAL-true-CortexM4,2-MX_DMA_Init-DMA-false-HAL-true-CortexM4,3-MX_FDCAN1_Init-FDCAN1-false-HAL-true-CortexM4,4-MX_QUADSPI_Init-QUADSPI-false-HAL-true-CortexM4,5-MX_USB_OTG_FS_PCD_Init-USB_OTG_FS-false-HAL-true-CortexM4,6-MX_UART4_Init-UART4-false-HAL-true-CortexM4,7-MX_CRC_Init-CRC-true-HAL-false-CortexM4,8-MX_FREERTOS_Init-FREERTOS_M4-false-HAL-false-CortexM4,0-MX_CORTEX_M7_Init-CORTEX_M7-false-HAL-true-CortexM7,0-MX_CORTEX_M4_Init-CORTEX_M4-false-HAL-true-CortexM4 RCC.ADCFreq_Value=37500000 RCC.AHB12Freq_Value=64000000 RCC.AHB4Freq_Value=64000000 @@ -732,10 +744,14 @@ SH.S_TIM2_CH1_ETR.0=TIM2_CH1,Encoder_Interface SH.S_TIM2_CH1_ETR.ConfNb=1 SH.S_TIM2_CH2.0=TIM2_CH2,Encoder_Interface SH.S_TIM2_CH2.ConfNb=1 +SH.S_TIM2_CH3.0=TIM2_CH3 +SH.S_TIM2_CH3.ConfNb=1 SH.S_TIM4_CH1.0=TIM4_CH1,Encoder_Interface SH.S_TIM4_CH1.ConfNb=1 SH.S_TIM4_CH2.0=TIM4_CH2,Encoder_Interface SH.S_TIM4_CH2.ConfNb=1 +SH.S_TIM4_CH3.0=TIM4_CH3 +SH.S_TIM4_CH3.ConfNb=1 SH.S_TIM8_CH1.0=TIM8_CH1,PWM Generation1 CH1 CH1N SH.S_TIM8_CH1.ConfNb=1 SH.S_TIM8_CH2.0=TIM8_CH2,PWM Generation2 CH2 CH2N @@ -774,11 +790,9 @@ TIM1.Channel-PWM\ Generation2\ CH2\ CH2N=TIM_CHANNEL_2 TIM1.Channel-PWM\ Generation3\ CH3\ CH3N=TIM_CHANNEL_3 TIM1.IPParameters=Channel-PWM Generation1 CH1 CH1N,Channel-PWM Generation2 CH2 CH2N,Channel-PWM Generation3 CH3 CH3N TIM5.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE -TIM5.CounterMode=TIM_COUNTERMODE_UP -TIM5.IPParameters=Period,TIM_MasterOutputTrigger,CounterMode,AutoReloadPreload,Prescaler +TIM5.IPParameters=Prescaler,Period,AutoReloadPreload TIM5.Period=500-1 TIM5.Prescaler=64-1 -TIM5.TIM_MasterOutputTrigger=TIM_TRGO_RESET TIM8.Channel-PWM\ Generation1\ CH1\ CH1N=TIM_CHANNEL_1 TIM8.Channel-PWM\ Generation2\ CH2\ CH2N=TIM_CHANNEL_2 TIM8.Channel-PWM\ Generation3\ CH3\ CH3N=TIM_CHANNEL_3