diff --git a/port/stm32-f4discovery-cc256x/cubemx-f4discovery-cc256x/cubemx-f4discovery-cc256x.ioc b/port/stm32-f4discovery-cc256x/cubemx-f4discovery-cc256x/cubemx-f4discovery-cc256x.ioc index 578303abf..9155a3222 100644 --- a/port/stm32-f4discovery-cc256x/cubemx-f4discovery-cc256x/cubemx-f4discovery-cc256x.ioc +++ b/port/stm32-f4discovery-cc256x/cubemx-f4discovery-cc256x/cubemx-f4discovery-cc256x.ioc @@ -79,20 +79,20 @@ Mcu.UserConstants= Mcu.UserName=STM32F407VGTx MxCube.Version=4.21.0 MxDb.Version=DB.4.0.210 -NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false -NVIC.DMA1_Stream1_IRQn=true\:2\:0\:true\:false\:true -NVIC.DMA1_Stream3_IRQn=true\:2\:0\:true\:false\:true -NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false -NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:false -NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:false -NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:false -NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true +NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:false\:true +NVIC.DMA1_Stream1_IRQn=true\:2\:0\:true\:false\:true\:true +NVIC.DMA1_Stream3_IRQn=true\:2\:0\:true\:false\:true\:true +NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:false\:true +NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:false\:true +NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:false\:true +NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:false\:true +NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:true NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 -NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true -NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true -NVIC.USART2_IRQn=true\:15\:0\:true\:false\:true -NVIC.USART3_IRQn=true\:1\:0\:true\:false\:true -NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false +NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:true +NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:true +NVIC.USART2_IRQn=true\:15\:0\:true\:false\:true\:true +NVIC.USART3_IRQn=true\:1\:0\:true\:false\:true\:true +NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:false\:true PA0-WKUP.GPIOParameters=GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultEXTI PA0-WKUP.GPIO_Label=B1 [Blue PushButton] PA0-WKUP.GPIO_ModeDefaultEXTI=GPIO_MODE_EVT_RISING @@ -312,7 +312,8 @@ PH1-OSC_OUT.GPIOParameters=GPIO_Label PH1-OSC_OUT.GPIO_Label=PH1-OSC_OUT PH1-OSC_OUT.Locked=true PH1-OSC_OUT.Signal=RCC_OSC_OUT -ProjectManager.AskForMigrate=true +PinOutPanel.RotationAngle=0 +ProjectManager.AskForMigrate=false ProjectManager.BackupPrevious=false ProjectManager.CompilerOptimize=2 ProjectManager.ComputerToolchain=false @@ -338,33 +339,34 @@ ProjectManager.ToolChainLocation= ProjectManager.UnderRoot=true ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL,2-MX_DMA_Init-DMA-false-HAL,3-MX_USART2_UART_Init-USART2-false-HAL,4-MX_USART3_UART_Init-USART3-false-HAL,5-SystemClock_Config-RCC-false-HAL RCC.48MHZClocksFreq_Value=18285714.285714287 +RCC.AHBCLKDivider=RCC_SYSCLK_DIV2 RCC.AHBFreq_Value=32000000 -RCC.APB1Freq_Value=32000000 +RCC.APB1CLKDivider=RCC_HCLK_DIV2 +RCC.APB1Freq_Value=16000000 RCC.APB1TimFreq_Value=32000000 RCC.APB2CLKDivider=RCC_HCLK_DIV4 RCC.APB2Freq_Value=8000000 RCC.APB2TimFreq_Value=16000000 RCC.CortexFreq_Value=32000000 -RCC.EthernetFreq_Value=32000000 +RCC.EthernetFreq_Value=64000000 RCC.FCLKCortexFreq_Value=32000000 RCC.FamilyName=M RCC.HCLKFreq_Value=32000000 RCC.HSE_VALUE=8000000 RCC.HSI_VALUE=16000000 RCC.I2SClocksFreq_Value=192000000 -RCC.IPParameters=48MHZClocksFreq_Value,AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,APB2CLKDivider,APB2Freq_Value,APB2TimFreq_Value,CortexFreq_Value,EthernetFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2SClocksFreq_Value,LSE_VALUE,LSI_VALUE,MCO2PinFreq_Value,PLLCLKFreq_Value,PLLM,PLLN,PLLP,PLLQ,PLLQCLKFreq_Value,RTCFreq_Value,RTCHSEDivFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,VCOI2SOutputFreq_Value,VCOInputFreq_Value,VCOOutputFreq_Value,VcooutputI2S +RCC.IPParameters=48MHZClocksFreq_Value,AHBCLKDivider,AHBFreq_Value,APB1CLKDivider,APB1Freq_Value,APB1TimFreq_Value,APB2CLKDivider,APB2Freq_Value,APB2TimFreq_Value,CortexFreq_Value,EthernetFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2SClocksFreq_Value,LSE_VALUE,LSI_VALUE,MCO2PinFreq_Value,PLLCLKFreq_Value,PLLM,PLLN,PLLQ,PLLQCLKFreq_Value,RTCFreq_Value,RTCHSEDivFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,VCOI2SOutputFreq_Value,VCOInputFreq_Value,VCOOutputFreq_Value,VcooutputI2S RCC.LSE_VALUE=32768 RCC.LSI_VALUE=32000 -RCC.MCO2PinFreq_Value=32000000 -RCC.PLLCLKFreq_Value=32000000 +RCC.MCO2PinFreq_Value=64000000 +RCC.PLLCLKFreq_Value=64000000 RCC.PLLM=8 RCC.PLLN=64 -RCC.PLLP=RCC_PLLP_DIV4 RCC.PLLQ=7 RCC.PLLQCLKFreq_Value=18285714.285714287 RCC.RTCFreq_Value=32000 RCC.RTCHSEDivFreq_Value=4000000 -RCC.SYSCLKFreq_VALUE=32000000 +RCC.SYSCLKFreq_VALUE=64000000 RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK RCC.VCOI2SOutputFreq_Value=384000000 RCC.VCOInputFreq_Value=2000000 diff --git a/port/stm32-f4discovery-cc256x/eclipse-template/src/main.c b/port/stm32-f4discovery-cc256x/eclipse-template/src/main.c index 445e2b12f..af7ec5196 100644 --- a/port/stm32-f4discovery-cc256x/eclipse-template/src/main.c +++ b/port/stm32-f4discovery-cc256x/eclipse-template/src/main.c @@ -113,7 +113,7 @@ void SystemClock_Config(void) RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI; RCC_OscInitStruct.PLL.PLLM = 8; RCC_OscInitStruct.PLL.PLLN = 64; - RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV4; + RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2; RCC_OscInitStruct.PLL.PLLQ = 7; if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { @@ -126,7 +126,7 @@ void SystemClock_Config(void) |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2; RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; - RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1; + RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2; RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV4; if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK)