diff --git a/Makefile b/Makefile index 64ff4cf..a2f03af 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ########################################################################################################################## -# File automatically-generated by tool: [projectgenerator] version: [4.2.0-B44] date: [Fri Apr 25 22:56:53 CEST 2025] +# File automatically-generated by tool: [projectgenerator] version: [4.2.0-B44] date: [Thu May 01 21:37:30 CEST 2025] ########################################################################################################################## # ------------------------------------------------ diff --git a/Parafraktor.ioc b/Parafraktor.ioc index 2a9cfea..a424b6f 100644 --- a/Parafraktor.ioc +++ b/Parafraktor.ioc @@ -65,49 +65,50 @@ 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_USART1_UART_Init-USART1-false-HAL-true -RCC.ADCFreq_Value=32000000 -RCC.AHBFreq_Value=32000000 -RCC.APBFreq_Value=32000000 -RCC.APBTimFreq_Value=32000000 +RCC.ADCFreq_Value=64000000 +RCC.AHBFreq_Value=64000000 +RCC.APBFreq_Value=64000000 +RCC.APBTimFreq_Value=64000000 RCC.CECFreq_Value=32786.88524590164 -RCC.CortexFreq_Value=32000000 +RCC.CortexFreq_Value=64000000 RCC.EXTERNAL_CLOCK_VALUE=48000 -RCC.FCLKCortexFreq_Value=32000000 -RCC.FDCANFreq_Value=32000000 +RCC.FCLKCortexFreq_Value=64000000 +RCC.FDCANFreq_Value=64000000 RCC.FamilyName=M -RCC.HCLKFreq_Value=32000000 +RCC.HCLKFreq_Value=64000000 RCC.HSE_VALUE=8000000 RCC.HSI48_VALUE=48000000 RCC.HSI_VALUE=16000000 -RCC.I2C1Freq_Value=32000000 -RCC.I2C2Freq_Value=32000000 -RCC.I2S1Freq_Value=32000000 -RCC.I2S2Freq_Value=32000000 -RCC.IPParameters=ADCFreq_Value,AHBFreq_Value,APBFreq_Value,APBTimFreq_Value,CECFreq_Value,CortexFreq_Value,EXTERNAL_CLOCK_VALUE,FCLKCortexFreq_Value,FDCANFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,HSI48_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2S1Freq_Value,I2S2Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPUART1Freq_Value,LPUART2Freq_Value,LSCOPinFreq_Value,LSE_VALUE,LSI_VALUE,MCO1PinFreq_Value,MCO2PinFreq_Value,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PLLSourceVirtual,PWRFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,TIM15Freq_Value,TIM1Freq_Value,USART1Freq_Value,USART2Freq_Value,USART3Freq_Value,USBFreq_Value,VCOInputFreq_Value,VCOOutputFreq_Value -RCC.LPTIM1Freq_Value=32000000 -RCC.LPTIM2Freq_Value=32000000 -RCC.LPUART1Freq_Value=32000000 -RCC.LPUART2Freq_Value=32000000 +RCC.I2C1Freq_Value=64000000 +RCC.I2C2Freq_Value=64000000 +RCC.I2S1Freq_Value=64000000 +RCC.I2S2Freq_Value=64000000 +RCC.IPParameters=ADCFreq_Value,AHBFreq_Value,APBFreq_Value,APBTimFreq_Value,CECFreq_Value,CortexFreq_Value,EXTERNAL_CLOCK_VALUE,FCLKCortexFreq_Value,FDCANFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,HSI48_VALUE,HSI_VALUE,I2C1Freq_Value,I2C2Freq_Value,I2S1Freq_Value,I2S2Freq_Value,LPTIM1Freq_Value,LPTIM2Freq_Value,LPUART1Freq_Value,LPUART2Freq_Value,LSCOPinFreq_Value,LSE_VALUE,LSI_VALUE,MCO1PinFreq_Value,MCO2PinFreq_Value,PLLN,PLLPoutputFreq_Value,PLLQoutputFreq_Value,PLLRCLKFreq_Value,PLLSourceVirtual,PWRFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,TIM15Freq_Value,TIM1Freq_Value,USART1Freq_Value,USART2Freq_Value,USART3Freq_Value,USBFreq_Value,VCOInputFreq_Value,VCOOutputFreq_Value +RCC.LPTIM1Freq_Value=64000000 +RCC.LPTIM2Freq_Value=64000000 +RCC.LPUART1Freq_Value=64000000 +RCC.LPUART2Freq_Value=64000000 RCC.LSCOPinFreq_Value=32000 RCC.LSE_VALUE=32768 RCC.LSI_VALUE=32000 -RCC.MCO1PinFreq_Value=32000000 -RCC.MCO2PinFreq_Value=32000000 -RCC.PLLPoutputFreq_Value=32000000 -RCC.PLLQoutputFreq_Value=32000000 -RCC.PLLRCLKFreq_Value=32000000 +RCC.MCO1PinFreq_Value=64000000 +RCC.MCO2PinFreq_Value=64000000 +RCC.PLLN=16 +RCC.PLLPoutputFreq_Value=64000000 +RCC.PLLQoutputFreq_Value=64000000 +RCC.PLLRCLKFreq_Value=64000000 RCC.PLLSourceVirtual=RCC_PLLSOURCE_HSE -RCC.PWRFreq_Value=32000000 -RCC.SYSCLKFreq_VALUE=32000000 +RCC.PWRFreq_Value=64000000 +RCC.SYSCLKFreq_VALUE=64000000 RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK -RCC.TIM15Freq_Value=32000000 -RCC.TIM1Freq_Value=32000000 -RCC.USART1Freq_Value=32000000 -RCC.USART2Freq_Value=32000000 -RCC.USART3Freq_Value=32000000 +RCC.TIM15Freq_Value=64000000 +RCC.TIM1Freq_Value=64000000 +RCC.USART1Freq_Value=64000000 +RCC.USART2Freq_Value=64000000 +RCC.USART3Freq_Value=64000000 RCC.USBFreq_Value=48000000 RCC.VCOInputFreq_Value=8000000 -RCC.VCOOutputFreq_Value=64000000 +RCC.VCOOutputFreq_Value=128000000 VP_SYS_VS_DBSignals.Mode=DisableDeadBatterySignals VP_SYS_VS_DBSignals.Signal=SYS_VS_DBSignals VP_SYS_VS_Systick.Mode=SysTick diff --git a/Src/main.c b/Src/main.c index 7e1a71c..05407ca 100644 --- a/Src/main.c +++ b/Src/main.c @@ -94,7 +94,7 @@ void init_UART1_dma(){ GPIOC->AFR[0] &= GPIO_AFRL_AFSEL5; GPIOC->AFR[0] |= 1 << GPIO_AFRL_AFSEL5_Pos; // AF1 -> USART1 RX - USART1->BRR = 128; // 32000000÷250000 + USART1->BRR = 256; // 64000000÷250000 USART1->CR1 = USART_CR1_RE; USART1->CR3 |= USART_CR3_EIE; // Interrupt on BREAK (and other errors) @@ -258,7 +258,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV1; - RCC_OscInitStruct.PLL.PLLN = 8; + RCC_OscInitStruct.PLL.PLLN = 16; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2; RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV2; RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2; @@ -275,7 +275,7 @@ void SystemClock_Config(void) RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1; - if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) { Error_Handler(); }