fix: 时钟源宏定义修改

Air-duino · Jan 28, 2024 · fd99de9 · fd99de9
1 parent 0a0ea97
commit fd99de9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 100 deletions.
diff --git a/boards.txt b/boards.txt
@@ -66,48 +66,48 @@ Air001Dev.menu.UploadSpeed.1200.upload.speed=1200
 
 # HSI/HSE选择和主频
 Air001Dev.menu.ClockSourceAndFrequency.HSI4M_HCLK4M=HSI 4Mhz, HCLK 4Mhz
-Air001Dev.menu.ClockSourceAndFrequency.HSI4M_HCLK4M.build.temp=-D{build.series}_HSI_4M_HCLK_4M
+Air001Dev.menu.ClockSourceAndFrequency.HSI4M_HCLK4M.build.temp=-D{build.series}_HSI_4M_HCLK_4M -DHSI_VALUE=4000000
 Air001Dev.menu.ClockSourceAndFrequency.HSI4M_HCLK4M.build.f_cpu=4000000L
 
 Air001Dev.menu.ClockSourceAndFrequency.HSI8M_HCLK8M=HSI 8Mhz, HCLK 8Mhz
-Air001Dev.menu.ClockSourceAndFrequency.HSI8M_HCLK8M.build.temp=-D{build.series}_HSI_8M_HCLK_8M
+Air001Dev.menu.ClockSourceAndFrequency.HSI8M_HCLK8M.build.temp=-D{build.series}_HSI_8M_HCLK_8M -DHSI_VALUE=8000000
 Air001Dev.menu.ClockSourceAndFrequency.HSI8M_HCLK8M.build.f_cpu=8000000L
 
 Air001Dev.menu.ClockSourceAndFrequency.HSI16M_HCLK16M=HSI 16Mhz, HCLK 16Mhz
-Air001Dev.menu.ClockSourceAndFrequency.HSI16M_HCLK16M.build.temp=-D{build.series}_HSI_16M_HCLK_16M
+Air001Dev.menu.ClockSourceAndFrequency.HSI16M_HCLK16M.build.temp=-D{build.series}_HSI_16M_HCLK_16M -DHSI_VALUE=16000000
 Air001Dev.menu.ClockSourceAndFrequency.HSI16M_HCLK16M.build.f_cpu=16000000L
 
 Air001Dev.menu.ClockSourceAndFrequency.HSI22_12M_HCLK22_12M=HSI 22.12Mhz, HCLK 22.12Mhz
-Air001Dev.menu.ClockSourceAndFrequency.HSI22_12M_HCLK22_12M.build.temp=-D{build.series}_HSI_22_12M_HCLK_22_12M
+Air001Dev.menu.ClockSourceAndFrequency.HSI22_12M_HCLK22_12M.build.temp=-D{build.series}_HSI_22_12M_HCLK_22_12M -DHSI_VALUE=22120000
 Air001Dev.menu.ClockSourceAndFrequency.HSI22_12M_HCLK22_12M.build.f_cpu=22120000L
 
 
 Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M=HSI 24Mhz, HCLK 24Mhz
-Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M.build.temp=-D{build.series}_HSI_24M_HCLK_24M
+Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M.build.temp=-D{build.series}_HSI_24M_HCLK_24M -DHSI_VALUE=24000000
 Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M.build.f_cpu=24000000L
 
 Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK48M=HSI 24Mhz, HCLK 48Mhz
-Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK48M.build.temp=-D{build.series}_HSI_24M_HCLK_48M
+Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK48M.build.temp=-D{build.series}_HSI_24M_HCLK_48M -DHSI_VALUE=24000000
 Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK48M.build.f_cpu=48000000L
 
 Air001Dev.menu.ClockSourceAndFrequency.HSE8M_HCLK8M=HSE 8Mhz, HCLK 8Mhz
-Air001Dev.menu.ClockSourceAndFrequency.HSE8M_HCLK8M.build.temp=-D{build.series}_HSE_8M_HCLK_8M
+Air001Dev.menu.ClockSourceAndFrequency.HSE8M_HCLK8M.build.temp=-D{build.series}_HSE_8M_HCLK_8M -DHSE_VALUE=8000000
 Air001Dev.menu.ClockSourceAndFrequency.HSE8M_HCLK8M.build.f_cpu=8000000L
 
 Air001Dev.menu.ClockSourceAndFrequency.HSE16M_HCLK16M=HSE 16Mhz, HCLK 16Mhz
-Air001Dev.menu.ClockSourceAndFrequency.HSE16M_HCLK16M.build.temp=-D{build.series}_HSE_16M_HCLK_16M
+Air001Dev.menu.ClockSourceAndFrequency.HSE16M_HCLK16M.build.temp=-D{build.series}_HSE_16M_HCLK_16M -DHSE_VALUE=16000000
 Air001Dev.menu.ClockSourceAndFrequency.HSE16M_HCLK16M.build.f_cpu=16000000L
 
 Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M=HSE 24Mhz, HCLK 24Mhz
-Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M.build.temp=-D{build.series}_HSE_24M_HCLK_24M
+Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M.build.temp=-D{build.series}_HSE_24M_HCLK_24M -DHSE_VALUE=24000000
 Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M.build.f_cpu=24000000L
 
 Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK48M=HSE 24Mhz, HCLK 48Mhz
-Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK48M.build.temp=-D{build.series}_HSE_24M_HCLK_48M
+Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK48M.build.temp=-D{build.series}_HSE_24M_HCLK_48M -DHSE_VALUE=24000000
 Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK48M.build.f_cpu=48000000L
 
 Air001Dev.menu.ClockSourceAndFrequency.HSE32M_HCLK32M=HSE 32Mhz, HCLK 32Mhz
-Air001Dev.menu.ClockSourceAndFrequency.HSE32M_HCLK32M.build.temp=-D{build.series}_HSE_32M_HCLK_32M
+Air001Dev.menu.ClockSourceAndFrequency.HSE32M_HCLK32M.build.temp=-D{build.series}_HSE_32M_HCLK_32M -DHSE_VALUE=32000000
 Air001Dev.menu.ClockSourceAndFrequency.HSE32M_HCLK32M.build.f_cpu=32000000L
 
 Air001Dev.menu.LowSpeedClockSource.None=None
@@ -218,11 +218,11 @@ Air401Dev.menu.UploadSpeed.1200.upload.speed=1200
 # HSI/HSE选择和主频
 
 Air401Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M=HSI 24Mhz, HCLK 24Mhz
-Air401Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M.build.temp=-D{build.series}_HSI_24M_HCLK_24M
+Air401Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M.build.temp=-D{build.series}_HSI_24M_HCLK_24M -DHSI_VALUE=24000000
 Air401Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M.build.f_cpu=24000000L
 
 Air401Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M=HSE 24Mhz, HCLK 24Mhz
-Air401Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M.build.temp=-D{build.series}_HSE_24M_HCLK_24M
+Air401Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M.build.temp=-D{build.series}_HSE_24M_HCLK_24M -DHSE_VALUE=24000000
 Air401Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M.build.f_cpu=24000000L
 
 Air401Dev.menu.LowSpeedClockSource.None=None
@@ -330,10 +330,10 @@ Air32F103xx.menu.UploadSpeed.1200=1200
 Air32F103xx.menu.UploadSpeed.1200.upload.speed=1200
 
 Air32F103xx.menu.ClockSoure.HSE8M=HSE (8Mhz)
-Air32F103xx.menu.ClockSoure.HSE8M.build.ClockSoureTemp=-DUSE_HSE
+Air32F103xx.menu.ClockSoure.HSE8M.build.ClockSoureTemp=-DUSE_HSE -DHSE_VALUE=8000000
 Air32F103xx.menu.ClockSoure.HSE8M.build.ClockSoure=8000000L
 Air32F103xx.menu.ClockSoure.HSE16M=HSE (16Mhz)
-Air32F103xx.menu.ClockSoure.HSE16M.build.ClockSoureTemp=-DUSE_HSE
+Air32F103xx.menu.ClockSoure.HSE16M.build.ClockSoureTemp=-DUSE_HSE -DHSE_VALUE=16000000
 Air32F103xx.menu.ClockSoure.HSE16M.build.ClockSoure=16000000L
 Air32F103xx.menu.ClockSoure.HSI8M=HSI (8Mhz)
 Air32F103xx.menu.ClockSoure.HSI8M.build.ClockSoureTemp=-DUSE_HSI

diff --git a/variants/AIR001/AIR001_DEV/generic_clock.c b/variants/AIR001/AIR001_DEV/generic_clock.c
@@ -38,10 +38,6 @@ WEAK void SystemClock_Config(void)
 #endif
 
 #if defined(AIR001xx_HSI_4M_HCLK_4M)
-#ifdef HSI_VALUE
-#undef HSI_VALUE
-#endif
-#define HSI_VALUE 4000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                         /* 开启HSI */
@@ -67,10 +63,6 @@ WEAK void SystemClock_Config(void)
         Error_Handler();
     }
 #elif defined(AIR001xx_HSI_8M_HCLK_8M)
-#ifdef HSI_VALUE
-#undef HSI_VALUE
-#endif
-#define HSI_VALUE 8000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                         /* 开启HSI */
@@ -97,10 +89,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSI_16M_HCLK_16M)
-#ifdef HSI_VALUE
-#undef HSI_VALUE
-#endif
-#define HSI_VALUE 16000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                          /* 开启HSI */
@@ -127,10 +115,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSI_22_12M_HCLK_22_12M)
-#ifdef HSI_VALUE
-#undef HSI_VALUE
-#endif
-#define HSI_VALUE 22120000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                             /* 开启HSI */
@@ -157,10 +141,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSI_24M_HCLK_24M)
-#ifdef HSI_VALUE
-#undef HSI_VALUE
-#endif
-#define HSI_VALUE 24000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                          /* 开启HSI */
@@ -187,10 +167,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSI_24M_HCLK_48M)
-#ifdef HSI_VALUE
-#undef HSI_VALUE
-#endif
-#define HSI_VALUE 24000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                          /* 开启HSI */
@@ -217,10 +193,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSE_8M_HCLK_8M)
-#ifdef HSE_VALUE
-#undef HSE_VALUE
-#endif
-#define HSE_VALUE 8000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
     RCC_OscInitStruct.HSIState = RCC_HSI_OFF;                   /* 开启HSI */
@@ -248,10 +220,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSE_16M_HCLK_16M)
-#ifdef HSE_VALUE
-#undef HSE_VALUE
-#endif
-#define HSE_VALUE 16000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
     RCC_OscInitStruct.HSIState = RCC_HSI_OFF;                   /* 开启HSI */
@@ -279,10 +247,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSE_24M_HCLK_24M)
-#ifdef HSE_VALUE
-#undef HSE_VALUE
-#endif
-#define HSE_VALUE 24000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
     RCC_OscInitStruct.HSIState = RCC_HSI_OFF;
@@ -310,10 +274,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSE_32M_HCLK_32M)
-#ifdef HSE_VALUE
-#undef HSE_VALUE
-#endif
-#define HSE_VALUE 32000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
     RCC_OscInitStruct.HSIState = RCC_HSI_OFF;
@@ -341,11 +301,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSE_24M_HCLK_48M)
-#ifdef HSE_VALUE
-#undef HSE_VALUE
-#endif
-#define HSE_VALUE 24000000U
-
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
     RCC_OscInitStruct.HSIState = RCC_HSI_OFF;

diff --git a/variants/AIR401/AIR401_DEV/generic_clock.c b/variants/AIR401/AIR401_DEV/generic_clock.c
@@ -38,10 +38,6 @@ WEAK void SystemClock_Config(void)
 #endif
 
 #if defined(AIR001xx_HSI_4M_HCLK_4M)
-#ifdef HSI_VALUE
-#undef HSI_VALUE
-#endif
-#define HSI_VALUE 4000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                         /* 开启HSI */
@@ -67,10 +63,6 @@ WEAK void SystemClock_Config(void)
         Error_Handler();
     }
 #elif defined(AIR001xx_HSI_8M_HCLK_8M)
-#ifdef HSI_VALUE
-#undef HSI_VALUE
-#endif
-#define HSI_VALUE 8000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                         /* 开启HSI */
@@ -97,10 +89,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSI_16M_HCLK_16M)
-#ifdef HSI_VALUE
-#undef HSI_VALUE
-#endif
-#define HSI_VALUE 16000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                          /* 开启HSI */
@@ -127,10 +115,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSI_22_12M_HCLK_22_12M)
-#ifdef HSI_VALUE
-#undef HSI_VALUE
-#endif
-#define HSI_VALUE 22120000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                             /* 开启HSI */
@@ -157,10 +141,7 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSI_24M_HCLK_24M)
-#ifdef HSI_VALUE
-#undef HSI_VALUE
-#endif
-#define HSI_VALUE 24000000U
+
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                          /* 开启HSI */
@@ -187,10 +168,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSI_24M_HCLK_48M)
-#ifdef HSI_VALUE
-#undef HSI_VALUE
-#endif
-#define HSI_VALUE 24000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;                          /* 开启HSI */
@@ -248,10 +225,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSE_16M_HCLK_16M)
-#ifdef HSE_VALUE
-#undef HSE_VALUE
-#endif
-#define HSE_VALUE 16000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
     RCC_OscInitStruct.HSIState = RCC_HSI_OFF;                   /* 开启HSI */
@@ -279,10 +252,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSE_24M_HCLK_24M)
-#ifdef HSE_VALUE
-#undef HSE_VALUE
-#endif
-#define HSE_VALUE 24000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
     RCC_OscInitStruct.HSIState = RCC_HSI_OFF;
@@ -310,10 +279,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSE_32M_HCLK_32M)
-#ifdef HSE_VALUE
-#undef HSE_VALUE
-#endif
-#define HSE_VALUE 32000000U
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
     RCC_OscInitStruct.HSIState = RCC_HSI_OFF;
@@ -341,10 +306,6 @@ WEAK void SystemClock_Config(void)
     }
 
 #elif defined(AIR001xx_HSE_24M_HCLK_48M)
-#ifdef HSE_VALUE
-#undef HSE_VALUE
-#endif
-#define HSE_VALUE 24000000U
 
     /* 振荡器配置 */
     RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */