Skip to content

Commit 2174a3f

Browse files
HalfSweetHalfSweet
committed
update: F030系列共用一个变体
1 parent cd4e3e7 commit 2174a3f

12 files changed

Lines changed: 20 additions & 20 deletions

‎boards.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ GenF030.menu.BootConnection.direct.upload.boot=direct_connect
174174

175175
GenF030.build.extra_flags={build.temp} -DF_CPU={build.f_cpu} {build.lsc_temp} {build.sv_tmp}
176176

177-
GenF030.menu.pnum.PY32F030K26T=PY32F030K26T
178-
GenF030.menu.pnum.PY32F030K26T.upload.maximum_size=32768
179-
GenF030.menu.pnum.PY32F030K26T.upload.maximum_data_size=4096
180-
GenF030.menu.pnum.PY32F030K26T.build.board=PY32F030K26T
181-
GenF030.menu.pnum.PY32F030K26T.build.product_line=PY32F030x6
182-
GenF030.menu.pnum.PY32F030K26T.build.variant=PY32F030xx/PY32F030K26T
177+
GenF030.menu.pnum.PY32F030x6=PY32F030x6
178+
GenF030.menu.pnum.PY32F030x6.upload.maximum_size=32768
179+
GenF030.menu.pnum.PY32F030x6.upload.maximum_data_size=4096
180+
GenF030.menu.pnum.PY32F030x6.build.board=PY32F030x6
181+
GenF030.menu.pnum.PY32F030x6.build.product_line=PY32F030x6
182+
GenF030.menu.pnum.PY32F030x6.build.variant=PY32F030xx/PY32F030_Base

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

File renamed without changes.

variants/PY32F030xx/PY32F030K26T/PeripheralPins.c renamed to variants/PY32F030xx/PY32F030_Base/PeripheralPins.c

File renamed without changes.

variants/PY32F030xx/PY32F030K26T/PinNamesVar.h renamed to variants/PY32F030xx/PY32F030_Base/PinNamesVar.h

File renamed without changes.

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

File renamed without changes.

variants/PY32F030xx/PY32F030K26T/generic_clock.c renamed to variants/PY32F030xx/PY32F030_Base/generic_clock.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*******************************************************************************
1212
*/
13-
#if defined(PY32F030x6)
13+
#if defined (PY32F030x3) || defined (PY32F030x4) || defined(PY32F030x6) || defined (PY32F030x7) || defined (PY32F030x8)
1414
#include "pins_arduino.h"
1515

1616
/**
@@ -40,8 +40,8 @@ WEAK void SystemClock_Config(void)
4040
#if defined(PY32F0xx_HSI_4M_HCLK_4M)
4141
#ifdef HSI_VALUE
4242
#undef HSI_VALUE
43-
#define HSI_VALUE 4000000U
4443
#endif
44+
#define HSI_VALUE 4000000U
4545
/* 振荡器配置 */
4646
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
4747
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -69,8 +69,8 @@ WEAK void SystemClock_Config(void)
6969
#elif defined(PY32F0xx_HSI_8M_HCLK_8M)
7070
#ifdef HSI_VALUE
7171
#undef HSI_VALUE
72-
#define HSI_VALUE 8000000U
7372
#endif
73+
#define HSI_VALUE 8000000U
7474
/* 振荡器配置 */
7575
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
7676
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -99,8 +99,8 @@ WEAK void SystemClock_Config(void)
9999
#elif defined(PY32F0xx_HSI_16M_HCLK_16M)
100100
#ifdef HSI_VALUE
101101
#undef HSI_VALUE
102-
#define HSI_VALUE 16000000U
103102
#endif
103+
#define HSI_VALUE 16000000U
104104
/* 振荡器配置 */
105105
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
106106
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -129,8 +129,8 @@ WEAK void SystemClock_Config(void)
129129
#elif defined(PY32F0xx_HSI_22_12M_HCLK_22_12M)
130130
#ifdef HSI_VALUE
131131
#undef HSI_VALUE
132-
#define HSI_VALUE 22120000U
133132
#endif
133+
#define HSI_VALUE 22120000U
134134
/* 振荡器配置 */
135135
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
136136
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -159,8 +159,8 @@ WEAK void SystemClock_Config(void)
159159
#elif defined(PY32F0xx_HSI_24M_HCLK_24M)
160160
#ifdef HSI_VALUE
161161
#undef HSI_VALUE
162-
#define HSI_VALUE 24000000U
163162
#endif
163+
#define HSI_VALUE 24000000U
164164
/* 振荡器配置 */
165165
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
166166
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -189,8 +189,8 @@ WEAK void SystemClock_Config(void)
189189
#elif defined(PY32F0xx_HSI_24M_HCLK_48M)
190190
#ifdef HSI_VALUE
191191
#undef HSI_VALUE
192-
#define HSI_VALUE 24000000U
193192
#endif
193+
#define HSI_VALUE 24000000U
194194
/* 振荡器配置 */
195195
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI;
196196
RCC_OscInitStruct.HSIState = RCC_HSI_ON; /* 开启HSI */
@@ -219,8 +219,8 @@ WEAK void SystemClock_Config(void)
219219
#elif defined(PY32F0xx_HSE_8M_HCLK_8M)
220220
#ifdef HSE_VALUE
221221
#undef HSE_VALUE
222-
#define HSE_VALUE 8000000U
223222
#endif
223+
#define HSE_VALUE 8000000U
224224
/* 振荡器配置 */
225225
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
226226
RCC_OscInitStruct.HSIState = RCC_HSI_OFF; /* 开启HSI */
@@ -250,8 +250,8 @@ WEAK void SystemClock_Config(void)
250250
#elif defined(PY32F0xx_HSE_16M_HCLK_16M)
251251
#ifdef HSE_VALUE
252252
#undef HSE_VALUE
253-
#define HSE_VALUE 16000000U
254253
#endif
254+
#define HSE_VALUE 16000000U
255255
/* 振荡器配置 */
256256
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
257257
RCC_OscInitStruct.HSIState = RCC_HSI_OFF; /* 开启HSI */
@@ -281,8 +281,8 @@ WEAK void SystemClock_Config(void)
281281
#elif defined(PY32F0xx_HSE_24M_HCLK_24M)
282282
#ifdef HSE_VALUE
283283
#undef HSE_VALUE
284-
#define HSE_VALUE 24000000U
285284
#endif
285+
#define HSE_VALUE 24000000U
286286
/* 振荡器配置 */
287287
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
288288
RCC_OscInitStruct.HSIState = RCC_HSI_OFF;
@@ -312,8 +312,8 @@ WEAK void SystemClock_Config(void)
312312
#elif defined(PY32F0xx_HSE_32M_HCLK_32M)
313313
#ifdef HSE_VALUE
314314
#undef HSE_VALUE
315-
#define HSE_VALUE 32000000U
316315
#endif
316+
#define HSE_VALUE 32000000U
317317
/* 振荡器配置 */
318318
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
319319
RCC_OscInitStruct.HSIState = RCC_HSI_OFF;
@@ -343,8 +343,8 @@ WEAK void SystemClock_Config(void)
343343
#elif defined(PY32F0xx_HSE_24M_HCLK_48M)
344344
#ifdef HSE_VALUE
345345
#undef HSE_VALUE
346-
#define HSE_VALUE 24000000U
347346
#endif
347+
#define HSE_VALUE 24000000U
348348
/* 振荡器配置 */
349349
RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSE; /* 选择RCC振荡器为HSE */
350350
RCC_OscInitStruct.HSIState = RCC_HSI_OFF;

variants/PY32F030xx/PY32F030K26T/ldscript.ld renamed to variants/PY32F030xx/PY32F030_Base/ldscript.ld

File renamed without changes.

variants/PY32F030xx/PY32F030K26T/qfp_fix.c renamed to variants/PY32F030xx/PY32F030_Base/qfp_fix.c

File renamed without changes.

variants/PY32F030xx/PY32F030K26T/qfplib-m0-full.S renamed to variants/PY32F030xx/PY32F030_Base/qfplib-m0-full.S

File renamed without changes.

variants/PY32F030xx/PY32F030K26T/qfplib-m0-full.h renamed to variants/PY32F030xx/PY32F030_Base/qfplib-m0-full.h

File renamed without changes.

0 commit comments

Comments
 (0)