2.0 release

uCAN-LIN · Aug 5, 2019 · 8486287 · 8486287
1 parent c730b8a
commit 8486287
Show file tree

Hide file tree

Showing 10 changed files with 1,808 additions and 302 deletions.
diff --git a/embedded/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_rcc.c b/embedded/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_rcc.c
@@ -1088,20 +1088,20 @@ uint32_t HAL_RCC_GetSysClockFreq(void)
       if ((tmpreg & RCC_CFGR_PLLSRC) == RCC_PLLSOURCE_HSE)
       {
         /* HSE used as PLL clock source : PLLCLK = HSE/PREDIV * PLLMUL */
-        pllclk = (HSE_VALUE / prediv) * pllmul;
+//        pllclk = (HSE_VALUE / prediv) * pllmul;
       }
 #if defined(RCC_CFGR_PLLSRC_HSI48_PREDIV)
       else if ((tmpreg & RCC_CFGR_PLLSRC) == RCC_PLLSOURCE_HSI48)
       {
         /* HSI48 used as PLL clock source : PLLCLK = HSI48/PREDIV * PLLMUL */
-        pllclk = (HSI48_VALUE / prediv) * pllmul;
+//        pllclk = (HSI48_VALUE / prediv) * pllmul;
       }
 #endif /* RCC_CFGR_PLLSRC_HSI48_PREDIV */
       else
       {
 #if  (defined(STM32F042x6) || defined(STM32F048xx) || defined(STM32F070x6) || defined(STM32F071xB) || defined(STM32F072xB) || defined(STM32F078xx) || defined(STM32F070xB) || defined(STM32F091xC) || defined(STM32F098xx) || defined(STM32F030xC))
         /* HSI used as PLL clock source : PLLCLK = HSI/PREDIV * PLLMUL */
-        pllclk = (HSI_VALUE / prediv) * pllmul;
+//        pllclk = (HSI_VALUE / prediv) * pllmul;
 #else
         /* HSI used as PLL clock source : PLLCLK = HSI/2 * PLLMUL */
         pllclk = (uint32_t)((HSI_VALUE >> 1U) * pllmul);

diff --git a/embedded/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_rcc_ex.c b/embedded/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_rcc_ex.c
@@ -416,7 +416,7 @@ uint32_t HAL_RCCEx_GetPeriphCLKFreq(uint32_t PeriphClk)
       /* Check if HSE is ready  and if RTC clock selection is HSI_DIV32*/
       else if ((srcclk == RCC_RTCCLKSOURCE_HSE_DIV32) && (HAL_IS_BIT_SET(RCC->CR, RCC_CR_HSERDY)))
       {
-        frequency = HSE_VALUE / 32U;
+//        frequency = HSE_VALUE / 32U;
       }
       break;
     }
@@ -546,14 +546,14 @@ uint32_t HAL_RCCEx_GetPeriphCLKFreq(uint32_t PeriphClk)
         else if (pllsource == RCC_CFGR_PLLSRC_HSI48_PREDIV)
         {
           /* HSI48 used as PLL clock source : frequency = HSI48/PREDIV * PLLMUL */
-          frequency = (HSI48_VALUE / predivfactor) * pllmull;
+//          frequency = (HSI48_VALUE / predivfactor) * pllmull;
         }
 #endif /* RCC_CR2_HSI48ON */
         else
         {
 #if defined(STM32F042x6) || defined(STM32F048xx) || defined(STM32F078xx) || defined(STM32F072xB) || defined(STM32F070xB)
           /* HSI used as PLL clock source : frequency = HSI/PREDIV * PLLMUL */
-          frequency = (HSI_VALUE / predivfactor) * pllmull;
+//          frequency = (HSI_VALUE / predivfactor) * pllmull;
 #else
           /* HSI used as PLL clock source : frequency = HSI/2U * PLLMUL */
           frequency = (HSI_VALUE >> 1U) * pllmull;

diff --git a/embedded/Src/main.c b/embedded/Src/main.c
@@ -25,7 +25,7 @@
   *    derived from this software without specific written permission.
   * 4. This software, including modifications and/or derivative works of this 
   *    software, must execute solely and exclusively on microcontroller or
-  *    microprocessor devices manufactured by or for STMicroelectronics.
+-  *    microprocessor devices manufactured by or for STMicroelectronics.
   * 5. Redistribution and use of this software other than as permitted under 
   *    this license is void and will automatically terminate your rights under 
   *    this license. 

diff --git a/embedded/TrueSTUDIO/LUCEmbedded/.cproject b/embedded/TrueSTUDIO/LUCEmbedded/.cproject
diff --git a/embedded/TrueSTUDIO/LUCEmbedded/.cproject_org b/embedded/TrueSTUDIO/LUCEmbedded/.cproject_org
diff --git a/embedded/TrueSTUDIO/LUCEmbedded/.project b/embedded/TrueSTUDIO/LUCEmbedded/.project
@@ -66,9 +66,11 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
 		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUTSConvertedProjectNature</nature>
 	</natures>
 	<linkedResources>
 		<link>