Skip to content

Commit fd99de9

Browse files
HalfSweetHalfSweet
committed
fix: 时钟源宏定义修改
1 parent 0a0ea97 commit fd99de9

File tree

3 files changed

+16
-100
lines changed

3 files changed

+16
-100
lines changed

‎boards.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,48 +66,48 @@ Air001Dev.menu.UploadSpeed.1200.upload.speed=1200
6666

6767
# HSI/HSE选择和主频
6868
Air001Dev.menu.ClockSourceAndFrequency.HSI4M_HCLK4M=HSI 4Mhz, HCLK 4Mhz
69-
Air001Dev.menu.ClockSourceAndFrequency.HSI4M_HCLK4M.build.temp=-D{build.series}_HSI_4M_HCLK_4M
69+
Air001Dev.menu.ClockSourceAndFrequency.HSI4M_HCLK4M.build.temp=-D{build.series}_HSI_4M_HCLK_4M -DHSI_VALUE=4000000
7070
Air001Dev.menu.ClockSourceAndFrequency.HSI4M_HCLK4M.build.f_cpu=4000000L
7171

7272
Air001Dev.menu.ClockSourceAndFrequency.HSI8M_HCLK8M=HSI 8Mhz, HCLK 8Mhz
73-
Air001Dev.menu.ClockSourceAndFrequency.HSI8M_HCLK8M.build.temp=-D{build.series}_HSI_8M_HCLK_8M
73+
Air001Dev.menu.ClockSourceAndFrequency.HSI8M_HCLK8M.build.temp=-D{build.series}_HSI_8M_HCLK_8M -DHSI_VALUE=8000000
7474
Air001Dev.menu.ClockSourceAndFrequency.HSI8M_HCLK8M.build.f_cpu=8000000L
7575

7676
Air001Dev.menu.ClockSourceAndFrequency.HSI16M_HCLK16M=HSI 16Mhz, HCLK 16Mhz
77-
Air001Dev.menu.ClockSourceAndFrequency.HSI16M_HCLK16M.build.temp=-D{build.series}_HSI_16M_HCLK_16M
77+
Air001Dev.menu.ClockSourceAndFrequency.HSI16M_HCLK16M.build.temp=-D{build.series}_HSI_16M_HCLK_16M -DHSI_VALUE=16000000
7878
Air001Dev.menu.ClockSourceAndFrequency.HSI16M_HCLK16M.build.f_cpu=16000000L
7979

8080
Air001Dev.menu.ClockSourceAndFrequency.HSI22_12M_HCLK22_12M=HSI 22.12Mhz, HCLK 22.12Mhz
81-
Air001Dev.menu.ClockSourceAndFrequency.HSI22_12M_HCLK22_12M.build.temp=-D{build.series}_HSI_22_12M_HCLK_22_12M
81+
Air001Dev.menu.ClockSourceAndFrequency.HSI22_12M_HCLK22_12M.build.temp=-D{build.series}_HSI_22_12M_HCLK_22_12M -DHSI_VALUE=22120000
8282
Air001Dev.menu.ClockSourceAndFrequency.HSI22_12M_HCLK22_12M.build.f_cpu=22120000L
8383

8484

8585
Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M=HSI 24Mhz, HCLK 24Mhz
86-
Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M.build.temp=-D{build.series}_HSI_24M_HCLK_24M
86+
Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M.build.temp=-D{build.series}_HSI_24M_HCLK_24M -DHSI_VALUE=24000000
8787
Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M.build.f_cpu=24000000L
8888

8989
Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK48M=HSI 24Mhz, HCLK 48Mhz
90-
Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK48M.build.temp=-D{build.series}_HSI_24M_HCLK_48M
90+
Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK48M.build.temp=-D{build.series}_HSI_24M_HCLK_48M -DHSI_VALUE=24000000
9191
Air001Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK48M.build.f_cpu=48000000L
9292

9393
Air001Dev.menu.ClockSourceAndFrequency.HSE8M_HCLK8M=HSE 8Mhz, HCLK 8Mhz
94-
Air001Dev.menu.ClockSourceAndFrequency.HSE8M_HCLK8M.build.temp=-D{build.series}_HSE_8M_HCLK_8M
94+
Air001Dev.menu.ClockSourceAndFrequency.HSE8M_HCLK8M.build.temp=-D{build.series}_HSE_8M_HCLK_8M -DHSE_VALUE=8000000
9595
Air001Dev.menu.ClockSourceAndFrequency.HSE8M_HCLK8M.build.f_cpu=8000000L
9696

9797
Air001Dev.menu.ClockSourceAndFrequency.HSE16M_HCLK16M=HSE 16Mhz, HCLK 16Mhz
98-
Air001Dev.menu.ClockSourceAndFrequency.HSE16M_HCLK16M.build.temp=-D{build.series}_HSE_16M_HCLK_16M
98+
Air001Dev.menu.ClockSourceAndFrequency.HSE16M_HCLK16M.build.temp=-D{build.series}_HSE_16M_HCLK_16M -DHSE_VALUE=16000000
9999
Air001Dev.menu.ClockSourceAndFrequency.HSE16M_HCLK16M.build.f_cpu=16000000L
100100

101101
Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M=HSE 24Mhz, HCLK 24Mhz
102-
Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M.build.temp=-D{build.series}_HSE_24M_HCLK_24M
102+
Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M.build.temp=-D{build.series}_HSE_24M_HCLK_24M -DHSE_VALUE=24000000
103103
Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M.build.f_cpu=24000000L
104104

105105
Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK48M=HSE 24Mhz, HCLK 48Mhz
106-
Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK48M.build.temp=-D{build.series}_HSE_24M_HCLK_48M
106+
Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK48M.build.temp=-D{build.series}_HSE_24M_HCLK_48M -DHSE_VALUE=24000000
107107
Air001Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK48M.build.f_cpu=48000000L
108108

109109
Air001Dev.menu.ClockSourceAndFrequency.HSE32M_HCLK32M=HSE 32Mhz, HCLK 32Mhz
110-
Air001Dev.menu.ClockSourceAndFrequency.HSE32M_HCLK32M.build.temp=-D{build.series}_HSE_32M_HCLK_32M
110+
Air001Dev.menu.ClockSourceAndFrequency.HSE32M_HCLK32M.build.temp=-D{build.series}_HSE_32M_HCLK_32M -DHSE_VALUE=32000000
111111
Air001Dev.menu.ClockSourceAndFrequency.HSE32M_HCLK32M.build.f_cpu=32000000L
112112

113113
Air001Dev.menu.LowSpeedClockSource.None=None
@@ -218,11 +218,11 @@ Air401Dev.menu.UploadSpeed.1200.upload.speed=1200
218218
# HSI/HSE选择和主频
219219

220220
Air401Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M=HSI 24Mhz, HCLK 24Mhz
221-
Air401Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M.build.temp=-D{build.series}_HSI_24M_HCLK_24M
221+
Air401Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M.build.temp=-D{build.series}_HSI_24M_HCLK_24M -DHSI_VALUE=24000000
222222
Air401Dev.menu.ClockSourceAndFrequency.HSI24M_HCLK24M.build.f_cpu=24000000L
223223

224224
Air401Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M=HSE 24Mhz, HCLK 24Mhz
225-
Air401Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M.build.temp=-D{build.series}_HSE_24M_HCLK_24M
225+
Air401Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M.build.temp=-D{build.series}_HSE_24M_HCLK_24M -DHSE_VALUE=24000000
226226
Air401Dev.menu.ClockSourceAndFrequency.HSE24M_HCLK24M.build.f_cpu=24000000L
227227

228228
Air401Dev.menu.LowSpeedClockSource.None=None
@@ -330,10 +330,10 @@ Air32F103xx.menu.UploadSpeed.1200=1200
330330
Air32F103xx.menu.UploadSpeed.1200.upload.speed=1200
331331

332332
Air32F103xx.menu.ClockSoure.HSE8M=HSE (8Mhz)
333-
Air32F103xx.menu.ClockSoure.HSE8M.build.ClockSoureTemp=-DUSE_HSE
333+
Air32F103xx.menu.ClockSoure.HSE8M.build.ClockSoureTemp=-DUSE_HSE -DHSE_VALUE=8000000
334334
Air32F103xx.menu.ClockSoure.HSE8M.build.ClockSoure=8000000L
335335
Air32F103xx.menu.ClockSoure.HSE16M=HSE (16Mhz)
336-
Air32F103xx.menu.ClockSoure.HSE16M.build.ClockSoureTemp=-DUSE_HSE
336+
Air32F103xx.menu.ClockSoure.HSE16M.build.ClockSoureTemp=-DUSE_HSE -DHSE_VALUE=16000000
337337
Air32F103xx.menu.ClockSoure.HSE16M.build.ClockSoure=16000000L
338338
Air32F103xx.menu.ClockSoure.HSI8M=HSI (8Mhz)
339339
Air32F103xx.menu.ClockSoure.HSI8M.build.ClockSoureTemp=-DUSE_HSI

‎variants/AIR001/AIR001_DEV/generic_clock.c

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ WEAK void SystemClock_Config(void)
3838
#endif
3939

4040
#if defined(AIR001xx_HSI_4M_HCLK_4M)
41-
#ifdef HSI_VALUE
42-
#undef HSI_VALUE
43-
#endif
44-
#define HSI_VALUE 4000000U
4541
/* 振荡器配置 */
4642
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
4743
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -67,10 +63,6 @@ WEAK void SystemClock_Config(void)
6763
Error_Handler();
6864
}
6965
#elif defined(AIR001xx_HSI_8M_HCLK_8M)
70-
#ifdef HSI_VALUE
71-
#undef HSI_VALUE
72-
#endif
73-
#define HSI_VALUE 8000000U
7466
/* 振荡器配置 */
7567
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
7668
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -97,10 +89,6 @@ WEAK void SystemClock_Config(void)
9789
}
9890

9991
#elif defined(AIR001xx_HSI_16M_HCLK_16M)
100-
#ifdef HSI_VALUE
101-
#undef HSI_VALUE
102-
#endif
103-
#define HSI_VALUE 16000000U
10492
/* 振荡器配置 */
10593
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
10694
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -127,10 +115,6 @@ WEAK void SystemClock_Config(void)
127115
}
128116

129117
#elif defined(AIR001xx_HSI_22_12M_HCLK_22_12M)
130-
#ifdef HSI_VALUE
131-
#undef HSI_VALUE
132-
#endif
133-
#define HSI_VALUE 22120000U
134118
/* 振荡器配置 */
135119
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
136120
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -157,10 +141,6 @@ WEAK void SystemClock_Config(void)
157141
}
158142

159143
#elif defined(AIR001xx_HSI_24M_HCLK_24M)
160-
#ifdef HSI_VALUE
161-
#undef HSI_VALUE
162-
#endif
163-
#define HSI_VALUE 24000000U
164144
/* 振荡器配置 */
165145
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
166146
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -187,10 +167,6 @@ WEAK void SystemClock_Config(void)
187167
}
188168

189169
#elif defined(AIR001xx_HSI_24M_HCLK_48M)
190-
#ifdef HSI_VALUE
191-
#undef HSI_VALUE
192-
#endif
193-
#define HSI_VALUE 24000000U
194170
/* 振荡器配置 */
195171
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
196172
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -217,10 +193,6 @@ WEAK void SystemClock_Config(void)
217193
}
218194

219195
#elif defined(AIR001xx_HSE_8M_HCLK_8M)
220-
#ifdef HSE_VALUE
221-
#undef HSE_VALUE
222-
#endif
223-
#define HSE_VALUE 8000000U
224196
/* 振荡器配置 */
225197
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
226198
RCC_OscInitStruct.HSIState = RCC_HSI_OFF; /* 开启HSI */
@@ -248,10 +220,6 @@ WEAK void SystemClock_Config(void)
248220
}
249221

250222
#elif defined(AIR001xx_HSE_16M_HCLK_16M)
251-
#ifdef HSE_VALUE
252-
#undef HSE_VALUE
253-
#endif
254-
#define HSE_VALUE 16000000U
255223
/* 振荡器配置 */
256224
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
257225
RCC_OscInitStruct.HSIState = RCC_HSI_OFF; /* 开启HSI */
@@ -279,10 +247,6 @@ WEAK void SystemClock_Config(void)
279247
}
280248

281249
#elif defined(AIR001xx_HSE_24M_HCLK_24M)
282-
#ifdef HSE_VALUE
283-
#undef HSE_VALUE
284-
#endif
285-
#define HSE_VALUE 24000000U
286250
/* 振荡器配置 */
287251
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
288252
RCC_OscInitStruct.HSIState = RCC_HSI_OFF;
@@ -310,10 +274,6 @@ WEAK void SystemClock_Config(void)
310274
}
311275

312276
#elif defined(AIR001xx_HSE_32M_HCLK_32M)
313-
#ifdef HSE_VALUE
314-
#undef HSE_VALUE
315-
#endif
316-
#define HSE_VALUE 32000000U
317277
/* 振荡器配置 */
318278
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
319279
RCC_OscInitStruct.HSIState = RCC_HSI_OFF;
@@ -341,11 +301,6 @@ WEAK void SystemClock_Config(void)
341301
}
342302

343303
#elif defined(AIR001xx_HSE_24M_HCLK_48M)
344-
#ifdef HSE_VALUE
345-
#undef HSE_VALUE
346-
#endif
347-
#define HSE_VALUE 24000000U
348-
349304
/* 振荡器配置 */
350305
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
351306
RCC_OscInitStruct.HSIState = RCC_HSI_OFF;

‎variants/AIR401/AIR401_DEV/generic_clock.c

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ WEAK void SystemClock_Config(void)
3838
#endif
3939

4040
#if defined(AIR001xx_HSI_4M_HCLK_4M)
41-
#ifdef HSI_VALUE
42-
#undef HSI_VALUE
43-
#endif
44-
#define HSI_VALUE 4000000U
4541
/* 振荡器配置 */
4642
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
4743
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -67,10 +63,6 @@ WEAK void SystemClock_Config(void)
6763
Error_Handler();
6864
}
6965
#elif defined(AIR001xx_HSI_8M_HCLK_8M)
70-
#ifdef HSI_VALUE
71-
#undef HSI_VALUE
72-
#endif
73-
#define HSI_VALUE 8000000U
7466
/* 振荡器配置 */
7567
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
7668
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -97,10 +89,6 @@ WEAK void SystemClock_Config(void)
9789
}
9890

9991
#elif defined(AIR001xx_HSI_16M_HCLK_16M)
100-
#ifdef HSI_VALUE
101-
#undef HSI_VALUE
102-
#endif
103-
#define HSI_VALUE 16000000U
10492
/* 振荡器配置 */
10593
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
10694
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -127,10 +115,6 @@ WEAK void SystemClock_Config(void)
127115
}
128116

129117
#elif defined(AIR001xx_HSI_22_12M_HCLK_22_12M)
130-
#ifdef HSI_VALUE
131-
#undef HSI_VALUE
132-
#endif
133-
#define HSI_VALUE 22120000U
134118
/* 振荡器配置 */
135119
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
136120
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -157,10 +141,7 @@ WEAK void SystemClock_Config(void)
157141
}
158142

159143
#elif defined(AIR001xx_HSI_24M_HCLK_24M)
160-
#ifdef HSI_VALUE
161-
#undef HSI_VALUE
162-
#endif
163-
#define HSI_VALUE 24000000U
144+
164145
/* 振荡器配置 */
165146
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
166147
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -187,10 +168,6 @@ WEAK void SystemClock_Config(void)
187168
}
188169

189170
#elif defined(AIR001xx_HSI_24M_HCLK_48M)
190-
#ifdef HSI_VALUE
191-
#undef HSI_VALUE
192-
#endif
193-
#define HSI_VALUE 24000000U
194171
/* 振荡器配置 */
195172
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
196173
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -248,10 +225,6 @@ WEAK void SystemClock_Config(void)
248225
}
249226

250227
#elif defined(AIR001xx_HSE_16M_HCLK_16M)
251-
#ifdef HSE_VALUE
252-
#undef HSE_VALUE
253-
#endif
254-
#define HSE_VALUE 16000000U
255228
/* 振荡器配置 */
256229
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
257230
RCC_OscInitStruct.HSIState = RCC_HSI_OFF; /* 开启HSI */
@@ -279,10 +252,6 @@ WEAK void SystemClock_Config(void)
279252
}
280253

281254
#elif defined(AIR001xx_HSE_24M_HCLK_24M)
282-
#ifdef HSE_VALUE
283-
#undef HSE_VALUE
284-
#endif
285-
#define HSE_VALUE 24000000U
286255
/* 振荡器配置 */
287256
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
288257
RCC_OscInitStruct.HSIState = RCC_HSI_OFF;
@@ -310,10 +279,6 @@ WEAK void SystemClock_Config(void)
310279
}
311280

312281
#elif defined(AIR001xx_HSE_32M_HCLK_32M)
313-
#ifdef HSE_VALUE
314-
#undef HSE_VALUE
315-
#endif
316-
#define HSE_VALUE 32000000U
317282
/* 振荡器配置 */
318283
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
319284
RCC_OscInitStruct.HSIState = RCC_HSI_OFF;
@@ -341,10 +306,6 @@ WEAK void SystemClock_Config(void)
341306
}
342307

343308
#elif defined(AIR001xx_HSE_24M_HCLK_48M)
344-
#ifdef HSE_VALUE
345-
#undef HSE_VALUE
346-
#endif
347-
#define HSE_VALUE 24000000U
348309

349310
/* 振荡器配置 */
350311
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */

0 commit comments

Comments
 (0)