diff --git a/CCSModuleSW30Web.ioc b/CCSModuleSW30Web.ioc index 0c94025..c682e74 100755 --- a/CCSModuleSW30Web.ioc +++ b/CCSModuleSW30Web.ioc @@ -311,10 +311,10 @@ PC12.GPIOParameters=GPIO_Label PC12.GPIO_Label=HEATER PC12.Mode=Asynchronous PC12.Signal=UART5_TX -PC14-OSC32_IN.Mode=LSE-External-Oscillator -PC14-OSC32_IN.Signal=RCC_OSC32_IN -PC15-OSC32_OUT.Mode=LSE-External-Oscillator -PC15-OSC32_OUT.Signal=RCC_OSC32_OUT +PC14-OSC32_IN.Locked=true +PC14-OSC32_IN.Signal=GPIO_Analog +PC15-OSC32_OUT.Locked=true +PC15-OSC32_OUT.Signal=GPIO_Analog PC2.GPIOParameters=GPIO_Speed,GPIO_Label PC2.GPIO_Label=DBG1 PC2.GPIO_Speed=GPIO_SPEED_FREQ_HIGH @@ -462,8 +462,8 @@ RCC.PLLSourceVirtual=RCC_PLLSOURCE_HSE RCC.Prediv1Source=RCC_PREDIV1_SOURCE_PLL2 RCC.Prediv2=RCC_HSE_PREDIV2_DIV5 RCC.Prediv2FreqValue=5000000 -RCC.RTCClockSelection=RCC_RTCCLKSOURCE_LSE -RCC.RTCFreq_Value=32768 +RCC.RTCClockSelection=RCC_RTCCLKSOURCE_LSI +RCC.RTCFreq_Value=40000 RCC.SYSCLKFreq_VALUE=72000000 RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK RCC.TimSysFreq_Value=72000000 diff --git a/Core/Inc/main.h b/Core/Inc/main.h index 38baaa4..eeec408 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -27,7 +27,7 @@ extern "C" { /* USER CODE BEGIN EC */ #define FW_VERSION_MAJOR 1 #define FW_VERSION_MINOR 0 -#define FW_VERSION_PATCH 36 +#define FW_VERSION_PATCH 34 /* USER CODE END EC */ /* Exported macro ------------------------------------------------------------*/ diff --git a/Core/Src/main.c b/Core/Src/main.c index 9dade41..1c3e8a8 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -261,11 +261,12 @@ void SystemClock_Config(void) /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ - RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE|RCC_OSCILLATORTYPE_LSE; + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE|RCC_OSCILLATORTYPE_LSI|RCC_OSCILLATORTYPE_LSE; RCC_OscInitStruct.HSEState = RCC_HSE_ON; RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV5; - RCC_OscInitStruct.LSEState = RCC_LSE_ON; + RCC_OscInitStruct.LSEState = RCC_LSE_OFF; RCC_OscInitStruct.HSIState = RCC_HSI_ON; + RCC_OscInitStruct.LSIState = RCC_LSI_ON; RCC_OscInitStruct.Prediv1Source = RCC_PREDIV1_SOURCE_PLL2; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; @@ -292,7 +293,7 @@ void SystemClock_Config(void) Error_Handler(); } PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RTC|RCC_PERIPHCLK_ADC; - PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSE; + PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6; if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {