diff --git a/Core/Src/main.c b/Core/Src/main.c index 0825753..beda21e 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -198,12 +198,12 @@ void SystemClock_Config(void) RCC_OscInitStruct.HSEState = RCC_HSE_ON; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; - RCC_OscInitStruct.PLL.PLLM = 3; + RCC_OscInitStruct.PLL.PLLM = 2; RCC_OscInitStruct.PLL.PLLN = 40; RCC_OscInitStruct.PLL.PLLP = 2; RCC_OscInitStruct.PLL.PLLQ = 4; RCC_OscInitStruct.PLL.PLLR = 2; - RCC_OscInitStruct.PLL.PLLRGE = RCC_PLL1VCIRANGE_2; + RCC_OscInitStruct.PLL.PLLRGE = RCC_PLL1VCIRANGE_3; RCC_OscInitStruct.PLL.PLLVCOSEL = RCC_PLL1VCOWIDE; RCC_OscInitStruct.PLL.PLLFRACN = 0; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) @@ -224,7 +224,7 @@ void SystemClock_Config(void) RCC_ClkInitStruct.APB2CLKDivider = RCC_APB2_DIV2; RCC_ClkInitStruct.APB4CLKDivider = RCC_APB4_DIV2; - if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_3) != HAL_OK) + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_4) != HAL_OK) { Error_Handler(); } diff --git a/Core/Src/tx_initialize_low_level.S b/Core/Src/tx_initialize_low_level.S index 0fb8a58..45d8237 100644 --- a/Core/Src/tx_initialize_low_level.S +++ b/Core/Src/tx_initialize_low_level.S @@ -66,7 +66,7 @@ .global __Vectors @ @ -SYSTEM_CLOCK = 106666666 +SYSTEM_CLOCK = 160000000 SYSTICK_CYCLES = ((SYSTEM_CLOCK / 100) -1) .text 32 @@ -287,7 +287,7 @@ __tx_DBGHandler: EXTERN _tx_execution_isr_exit ; ; -SYSTEM_CLOCK EQU 106666666 +SYSTEM_CLOCK EQU 160000000 SYSTICK_CYCLES EQU ((SYSTEM_CLOCK / 100) -1) #ifdef USE_DYNAMIC_MEMORY_ALLOCATION RSEG FREE_MEM:DATA @@ -470,7 +470,7 @@ SysTick_Handler: @ @ -SYSTEM_CLOCK = 106666666 +SYSTEM_CLOCK = 160000000 SYSTICK_CYCLES = ((SYSTEM_CLOCK / 100) -1) .text 32 diff --git a/steering-wheel.ioc b/steering-wheel.ioc index 8dbd889..72189f5 100644 --- a/steering-wheel.ioc +++ b/steering-wheel.ioc @@ -25,9 +25,9 @@ Dma.SPI3_TX.0.SyncEnable=DISABLE Dma.SPI3_TX.0.SyncPolarity=HAL_DMAMUX_SYNC_NO_EVENT Dma.SPI3_TX.0.SyncRequestNumber=1 Dma.SPI3_TX.0.SyncSignalID=NONE -FDCAN1.CalculateBaudRateNominal=333333 -FDCAN1.CalculateTimeBitNominal=3000 -FDCAN1.CalculateTimeQuantumNominal=37.5 +FDCAN1.CalculateBaudRateNominal=500000 +FDCAN1.CalculateTimeBitNominal=2000 +FDCAN1.CalculateTimeQuantumNominal=25.0 FDCAN1.FrameFormat=FDCAN_FRAME_CLASSIC FDCAN1.IPParameters=CalculateTimeQuantumNominal,CalculateTimeBitNominal,CalculateBaudRateNominal,NominalPrescaler,NominalTimeSeg1,NominalSyncJumpWidth,NominalTimeSeg2,FrameFormat,StdFiltersNbr,RxFifo0ElmtsNbr,TxFifoQueueElmtsNbr FDCAN1.NominalPrescaler=2 @@ -504,91 +504,91 @@ ProjectManager.ToolChainLocation= ProjectManager.UAScriptAfterPath= ProjectManager.UAScriptBeforePath= ProjectManager.UnderRoot=false -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_FDCAN1_Init-FDCAN1-false-HAL-true,5-MX_LTDC_Init-LTDC-false-HAL-true,6-MX_JPEG_Init-JPEG-false-HAL-true,7-MX_OCTOSPI1_Init-OCTOSPI1-false-HAL-true,8-MX_SPI3_Init-SPI3-false-HAL-true,9-MX_TIM1_Init-TIM1-false-HAL-true,10-MX_TIM2_Init-TIM2-false-HAL-true,11-MX_TIM4_Init-TIM4-false-HAL-true,12-MX_CRC_Init-CRC-false-HAL-true,13-MX_TIM17_Init-TIM17-false-HAL-true,14-MX_DMA2D_Init-DMA2D-false-HAL-true,15-MX_TouchGFX_Init-STMicroelectronics.X-CUBE-TOUCHGFX.4.24.0-false-HAL-false,0-MX_CORTEX_M7_Init-CORTEX_M7-false-HAL-true,16-MX_TouchGFX_Process-STMicroelectronics.X-CUBE-TOUCHGFX.4.24.0-false-HAL-false +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_FDCAN1_Init-FDCAN1-false-HAL-true,5-MX_LTDC_Init-LTDC-false-HAL-true,6-MX_JPEG_Init-JPEG-false-HAL-true,7-MX_OCTOSPI1_Init-OCTOSPI1-false-HAL-true,8-MX_SPI3_Init-SPI3-false-HAL-true,9-MX_TIM1_Init-TIM1-false-HAL-true,10-MX_TIM2_Init-TIM2-false-HAL-true,11-MX_TIM4_Init-TIM4-false-HAL-true,12-MX_CRC_Init-CRC-false-HAL-true,13-MX_TIM17_Init-TIM17-false-HAL-true,14-MX_DMA2D_Init-DMA2D-false-HAL-true,16-MX_TouchGFX_Init-STMicroelectronics.X-CUBE-TOUCHGFX.4.24.0-false-HAL-false,0-MX_CORTEX_M7_Init-CORTEX_M7-false-HAL-true,17-MX_TouchGFX_Process-STMicroelectronics.X-CUBE-TOUCHGFX.4.24.0-false-HAL-false RCC.ADCFreq_Value=1939393.9393939395 -RCC.AHB12Freq_Value=106666666.66666666 -RCC.AHB4Freq_Value=106666666.66666666 -RCC.APB1Freq_Value=53333333.33333333 -RCC.APB2Freq_Value=53333333.33333333 -RCC.APB3Freq_Value=53333333.33333333 -RCC.APB4Freq_Value=53333333.33333333 -RCC.AXIClockFreq_Value=106666666.66666666 -RCC.CDCPREFreq_Value=106666666.66666666 +RCC.AHB12Freq_Value=160000000 +RCC.AHB4Freq_Value=160000000 +RCC.APB1Freq_Value=80000000 +RCC.APB2Freq_Value=80000000 +RCC.APB3Freq_Value=80000000 +RCC.APB4Freq_Value=80000000 +RCC.AXIClockFreq_Value=160000000 +RCC.CDCPREFreq_Value=160000000 RCC.CDPPRE=RCC_APB3_DIV2 RCC.CDPPRE1=RCC_APB1_DIV2 RCC.CDPPRE2=RCC_APB2_DIV2 RCC.CECFreq_Value=32000 RCC.CKPERFreq_Value=64000000 -RCC.CortexFreq_Value=106666666.66666666 -RCC.CpuClockFreq_Value=106666666.66666666 +RCC.CortexFreq_Value=160000000 +RCC.CpuClockFreq_Value=160000000 RCC.DAC1Freq_Value=32000 RCC.DAC2Freq_Value=32000 -RCC.DFSDM2ACLkFreq_Value=53333333.33333333 -RCC.DFSDM2Freq_Value=53333333.33333333 -RCC.DFSDMACLkFreq_Value=53333333.33333333 -RCC.DFSDMFreq_Value=53333333.33333333 -RCC.DIVM1=3 +RCC.DFSDM2ACLkFreq_Value=80000000 +RCC.DFSDM2Freq_Value=80000000 +RCC.DFSDMACLkFreq_Value=80000000 +RCC.DFSDMFreq_Value=80000000 +RCC.DIVM1=2 RCC.DIVM2=2 RCC.DIVM3=2 RCC.DIVN1=40 RCC.DIVN2=16 RCC.DIVN3=16 -RCC.DIVP1Freq_Value=106666666.66666666 +RCC.DIVP1Freq_Value=160000000 RCC.DIVP2=66 RCC.DIVP2Freq_Value=1939393.9393939395 RCC.DIVP3Freq_Value=64000000 RCC.DIVQ1=4 -RCC.DIVQ1Freq_Value=53333333.33333333 +RCC.DIVQ1Freq_Value=80000000 RCC.DIVQ2=3 RCC.DIVQ2Freq_Value=42666666.666666664 RCC.DIVQ3Freq_Value=64000000 -RCC.DIVR1Freq_Value=106666666.66666666 +RCC.DIVR1Freq_Value=160000000 RCC.DIVR2Freq_Value=64000000 RCC.DIVR3=18 RCC.DIVR3Freq_Value=7111111.111111111 -RCC.FDCANFreq_Value=53333333.33333333 -RCC.FMCFreq_Value=106666666.66666666 +RCC.FDCANFreq_Value=80000000 +RCC.FMCFreq_Value=160000000 RCC.FamilyName=M -RCC.HCLK3ClockFreq_Value=106666666.66666666 -RCC.HCLKFreq_Value=106666666.66666666 +RCC.HCLK3ClockFreq_Value=160000000 +RCC.HCLKFreq_Value=160000000 RCC.HSE_VALUE=16000000 -RCC.I2C123Freq_Value=53333333.33333333 -RCC.I2C4Freq_Value=53333333.33333333 +RCC.I2C123Freq_Value=80000000 +RCC.I2C4Freq_Value=80000000 RCC.IPParameters=ADCFreq_Value,AHB12Freq_Value,AHB4Freq_Value,APB1Freq_Value,APB2Freq_Value,APB3Freq_Value,APB4Freq_Value,AXIClockFreq_Value,CDCPREFreq_Value,CDPPRE,CDPPRE1,CDPPRE2,CECFreq_Value,CKPERFreq_Value,CortexFreq_Value,CpuClockFreq_Value,DAC1Freq_Value,DAC2Freq_Value,DFSDM2ACLkFreq_Value,DFSDM2Freq_Value,DFSDMACLkFreq_Value,DFSDMFreq_Value,DIVM1,DIVM2,DIVM3,DIVN1,DIVN2,DIVN3,DIVP1Freq_Value,DIVP2,DIVP2Freq_Value,DIVP3Freq_Value,DIVQ1,DIVQ1Freq_Value,DIVQ2,DIVQ2Freq_Value,DIVQ3Freq_Value,DIVR1Freq_Value,DIVR2Freq_Value,DIVR3,DIVR3Freq_Value,FDCANFreq_Value,FMCFreq_Value,FamilyName,HCLK3ClockFreq_Value,HCLKFreq_Value,HSE_VALUE,I2C123Freq_Value,I2C4Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPTIM345Freq_Value,LPUART1Freq_Value,LTDCFreq_Value,MCO1PinFreq_Value,MCO2PinFreq_Value,PLLSourceVirtual,QSPIFreq_Value,RNGFreq_Value,RTCFreq_Value,SAI1Freq_Value,SAI2AFreq_Value,SAI2BFreq_Value,SDMMCFreq_Value,SPDIFRXFreq_Value,SPI123CLockSelection,SPI123Freq_Value,SPI45Freq_Value,SPI6Freq_Value,SRDPPRE,SWPMI1Freq_Value,SYSCLKFreq_VALUE,SYSCLKSource,Tim1OutputFreq_Value,Tim2OutputFreq_Value,TraceFreq_Value,USART16Freq_Value,USART234578Freq_Value,USBFreq_Value,VCO1OutputFreq_Value,VCO2OutputFreq_Value,VCO3OutputFreq_Value,VCOInput1Freq_Value,VCOInput2Freq_Value,VCOInput3Freq_Value -RCC.LPTIM1Freq_Value=53333333.33333333 -RCC.LPTIM2Freq_Value=53333333.33333333 -RCC.LPTIM345Freq_Value=53333333.33333333 -RCC.LPUART1Freq_Value=53333333.33333333 +RCC.LPTIM1Freq_Value=80000000 +RCC.LPTIM2Freq_Value=80000000 +RCC.LPTIM345Freq_Value=80000000 +RCC.LPUART1Freq_Value=80000000 RCC.LTDCFreq_Value=7111111.111111111 RCC.MCO1PinFreq_Value=64000000 -RCC.MCO2PinFreq_Value=106666666.66666666 +RCC.MCO2PinFreq_Value=160000000 RCC.PLLSourceVirtual=RCC_PLLSOURCE_HSE -RCC.QSPIFreq_Value=106666666.66666666 +RCC.QSPIFreq_Value=160000000 RCC.RNGFreq_Value=48000000 RCC.RTCFreq_Value=32000 -RCC.SAI1Freq_Value=53333333.33333333 -RCC.SAI2AFreq_Value=53333333.33333333 -RCC.SAI2BFreq_Value=53333333.33333333 -RCC.SDMMCFreq_Value=53333333.33333333 -RCC.SPDIFRXFreq_Value=53333333.33333333 +RCC.SAI1Freq_Value=80000000 +RCC.SAI2AFreq_Value=80000000 +RCC.SAI2BFreq_Value=80000000 +RCC.SDMMCFreq_Value=80000000 +RCC.SPDIFRXFreq_Value=80000000 RCC.SPI123CLockSelection=RCC_SPI123CLKSOURCE_PLL2 RCC.SPI123Freq_Value=1939393.9393939395 -RCC.SPI45Freq_Value=53333333.33333333 -RCC.SPI6Freq_Value=53333333.33333333 +RCC.SPI45Freq_Value=80000000 +RCC.SPI6Freq_Value=80000000 RCC.SRDPPRE=RCC_APB4_DIV2 -RCC.SWPMI1Freq_Value=53333333.33333333 -RCC.SYSCLKFreq_VALUE=106666666.66666666 +RCC.SWPMI1Freq_Value=80000000 +RCC.SYSCLKFreq_VALUE=160000000 RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK -RCC.Tim1OutputFreq_Value=106666666.66666666 -RCC.Tim2OutputFreq_Value=106666666.66666666 -RCC.TraceFreq_Value=106666666.66666666 -RCC.USART16Freq_Value=53333333.33333333 -RCC.USART234578Freq_Value=53333333.33333333 -RCC.USBFreq_Value=53333333.33333333 -RCC.VCO1OutputFreq_Value=213333333.3333333 +RCC.Tim1OutputFreq_Value=160000000 +RCC.Tim2OutputFreq_Value=160000000 +RCC.TraceFreq_Value=160000000 +RCC.USART16Freq_Value=80000000 +RCC.USART234578Freq_Value=80000000 +RCC.USBFreq_Value=80000000 +RCC.VCO1OutputFreq_Value=320000000 RCC.VCO2OutputFreq_Value=128000000 RCC.VCO3OutputFreq_Value=128000000 -RCC.VCOInput1Freq_Value=5333333.333333333 +RCC.VCOInput1Freq_Value=8000000 RCC.VCOInput2Freq_Value=8000000 RCC.VCOInput3Freq_Value=8000000 SH.GPXTI3.0=GPIO_EXTI3