update: F030系列共用一个变体

Author: HalfSweet

boards.txt

@@ -174,9 +174,9 @@ GenF030.menu.BootConnection.direct.upload.boot=direct_connect
 
 GenF030.build.extra_flags={build.temp} -DF_CPU={build.f_cpu} {build.lsc_temp} {build.sv_tmp}
 
-GenF030.menu.pnum.PY32F030K26T=PY32F030K26T
-GenF030.menu.pnum.PY32F030K26T.upload.maximum_size=32768
-GenF030.menu.pnum.PY32F030K26T.upload.maximum_data_size=4096
-GenF030.menu.pnum.PY32F030K26T.build.board=PY32F030K26T
-GenF030.menu.pnum.PY32F030K26T.build.product_line=PY32F030x6
-GenF030.menu.pnum.PY32F030K26T.build.variant=PY32F030xx/PY32F030K26T
+GenF030.menu.pnum.PY32F030x6=PY32F030x6
+GenF030.menu.pnum.PY32F030x6.upload.maximum_size=32768
+GenF030.menu.pnum.PY32F030x6.upload.maximum_data_size=4096
+GenF030.menu.pnum.PY32F030x6.build.board=PY32F030x6
+GenF030.menu.pnum.PY32F030x6.build.product_line=PY32F030x6
+GenF030.menu.pnum.PY32F030x6.build.variant=PY32F030xx/PY32F030_Base

variants/PY32F030xx/PY32F030K26T/CMakeLists.txt renamed to variants/PY32F030xx/PY32F030_Base/CMakeLists.txt

@@ -10,7 +10,7 @@
  *
  *******************************************************************************
  */
-#if defined(PY32F030x6)
+#if defined (PY32F030x3) || defined (PY32F030x4) || defined(PY32F030x6) || defined (PY32F030x7) || defined (PY32F030x8)
 #include "pins_arduino.h"
 
 /**
@@ -40,8 +40,8 @@ WEAK void SystemClock_Config(void)
 #if defined(PY32F0xx_HSI_4M_HCLK_4M)
 #ifdef HSI_VALUE
 #undef HSI_VALUE
-#define HSI_VALUE 4000000U
 #endif
+#define HSI_VALUE 4000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                         /* 开启HSI */
@@ -69,8 +69,8 @@ WEAK void SystemClock_Config(void)
 #elif defined(PY32F0xx_HSI_8M_HCLK_8M)
 #ifdef HSI_VALUE
 #undef HSI_VALUE
-#define HSI_VALUE 8000000U
 #endif
+#define HSI_VALUE 8000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                         /* 开启HSI */
@@ -99,8 +99,8 @@ WEAK void SystemClock_Config(void)
 #elif defined(PY32F0xx_HSI_16M_HCLK_16M)
 #ifdef HSI_VALUE
 #undef HSI_VALUE
-#define HSI_VALUE 16000000U
 #endif
+#define HSI_VALUE 16000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                          /* 开启HSI */
@@ -129,8 +129,8 @@ WEAK void SystemClock_Config(void)
 #elif defined(PY32F0xx_HSI_22_12M_HCLK_22_12M)
 #ifdef HSI_VALUE
 #undef HSI_VALUE
-#define HSI_VALUE 22120000U
 #endif
+#define HSI_VALUE 22120000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                             /* 开启HSI */
@@ -159,8 +159,8 @@ WEAK void SystemClock_Config(void)
 #elif defined(PY32F0xx_HSI_24M_HCLK_24M)
 #ifdef HSI_VALUE
 #undef HSI_VALUE
-#define HSI_VALUE 24000000U
 #endif
+#define HSI_VALUE 24000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                          /* 开启HSI */
@@ -189,8 +189,8 @@ WEAK void SystemClock_Config(void)
 #elif defined(PY32F0xx_HSI_24M_HCLK_48M)
 #ifdef HSI_VALUE
 #undef HSI_VALUE
-#define HSI_VALUE 24000000U
 #endif
+#define HSI_VALUE 24000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                          /* 开启HSI */
@@ -219,8 +219,8 @@ WEAK void SystemClock_Config(void)
 #elif defined(PY32F0xx_HSE_8M_HCLK_8M)
 #ifdef HSE_VALUE
 #undef HSE_VALUE
-#define HSE_VALUE 8000000U
 #endif
+#define HSE_VALUE 8000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
     RCC_OscInitStruct.HSIState = RCC_HSI_OFF;                   /* 开启HSI */
@@ -250,8 +250,8 @@ WEAK void SystemClock_Config(void)
 #elif defined(PY32F0xx_HSE_16M_HCLK_16M)
 #ifdef HSE_VALUE
 #undef HSE_VALUE
-#define HSE_VALUE 16000000U
 #endif
+#define HSE_VALUE 16000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
     RCC_OscInitStruct.HSIState = RCC_HSI_OFF;                   /* 开启HSI */
@@ -281,8 +281,8 @@ WEAK void SystemClock_Config(void)
 #elif defined(PY32F0xx_HSE_24M_HCLK_24M)
 #ifdef HSE_VALUE
 #undef HSE_VALUE
-#define HSE_VALUE 24000000U
 #endif
+#define HSE_VALUE 24000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
     RCC_OscInitStruct.HSIState = RCC_HSI_OFF;
@@ -312,8 +312,8 @@ WEAK void SystemClock_Config(void)
 #elif defined(PY32F0xx_HSE_32M_HCLK_32M)
 #ifdef HSE_VALUE
 #undef HSE_VALUE
-#define HSE_VALUE 32000000U
 #endif
+#define HSE_VALUE 32000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
     RCC_OscInitStruct.HSIState = RCC_HSI_OFF;
@@ -343,8 +343,8 @@ WEAK void SystemClock_Config(void)
 #elif defined(PY32F0xx_HSE_24M_HCLK_48M)
 #ifdef HSE_VALUE
 #undef HSE_VALUE
-#define HSE_VALUE 24000000U
 #endif
+#define HSE_VALUE 24000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
     RCC_OscInitStruct.HSIState = RCC_HSI_OFF;