Skip to content

Commit cb901b4

Browse files
rogerclarkmelbournerogerclarkmelbourne
committed
Added CPU Speed menu to all boards except Nucleo RB, with additional entry for 128Mhz Turbo - NO USB. Note only tested on the Blue Pill
1 parent 7aae010 commit cb901b4

File tree

12 files changed

+182
-55
lines changed

12 files changed

+182
-55
lines changed

‎STM32F1/boards.txt‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@ mapleMini.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
4444
mapleMini.menu.cpu_speed.speed_48mhz=48Mhz (Slow - with USB)
4545
mapleMini.menu.cpu_speed.speed_48mhz.build.f_cpu=48000000L
4646

47+
#-- CPU Clock frequency
48+
mapleMini.menu.cpu_speed.speed_72mhz=72Mhz (Normal)
49+
mapleMini.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
50+
51+
mapleMini.menu.cpu_speed.speed_48mhz=48Mhz (Slow - with USB)
52+
mapleMini.menu.cpu_speed.speed_48mhz.build.f_cpu=48000000L
53+
54+
mapleMini.menu.cpu_speed.speed_128mhz=128Mhz (Turbo NO USB!)
55+
mapleMini.menu.cpu_speed.speed_128mhz.build.f_cpu=128000000L
56+
4757
#-- Optimizations
4858
mapleMini.menu.opt.osstd=Smallest (default)
4959
mapleMini.menu.opt.osstd.build.flags.optimize=-Os
@@ -99,6 +109,16 @@ maple.build.ldscript=ld/flash.ld
99109
maple.build.variant=maple
100110
maple.build.vect=VECT_TAB_ADDR=0x8005000
101111

112+
#-- CPU Clock frequency
113+
maple.menu.cpu_speed.speed_72mhz=72Mhz (Normal)
114+
maple.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
115+
116+
maple.menu.cpu_speed.speed_48mhz=48Mhz (Slow - with USB)
117+
maple.menu.cpu_speed.speed_48mhz.build.f_cpu=48000000L
118+
119+
maple.menu.cpu_speed.speed_128mhz=128Mhz (Turbo NO USB!)
120+
maple.menu.cpu_speed.speed_128mhz.build.f_cpu=128000000L
121+
102122
#-- Optimizations
103123
maple.menu.opt.osstd=Smallest (default)
104124
maple.menu.opt.osstd.build.flags.optimize=-Os
@@ -154,6 +174,17 @@ mapleRET6.upload.usbID=1EAF:0003
154174
mapleRET6.upload.altID=1
155175
mapleRET6.upload.auto_reset=true
156176

177+
#-- CPU Clock frequency
178+
mapleRET6.menu.cpu_speed.speed_72mhz=72Mhz (Normal)
179+
mapleRET6.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
180+
181+
mapleRET6.menu.cpu_speed.speed_48mhz=48Mhz (Slow - with USB)
182+
mapleRET6.menu.cpu_speed.speed_48mhz.build.f_cpu=48000000L
183+
184+
mapleRET6.menu.cpu_speed.speed_128mhz=128Mhz (Turbo NO USB!)
185+
mapleRET6.menu.cpu_speed.speed_128mhz.build.f_cpu=128000000L
186+
187+
157188
#-- Optimizations
158189
mapleRET6.menu.opt.osstd=Smallest (default)
159190
mapleRET6.menu.opt.osstd.build.flags.optimize=-Os
@@ -217,6 +248,16 @@ microduino32_flash.build.error_led_port=GPIOB
217248
microduino32_flash.build.error_led_pin=1
218249
microduino32_flash.build.gcc_ver=gcc-arm-none-eabi-4.8.3-2014q1
219250

251+
#-- CPU Clock frequency
252+
microduino32_flash.menu.cpu_speed.speed_72mhz=72Mhz (Normal)
253+
microduino32_flash.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
254+
255+
microduino32_flash.menu.cpu_speed.speed_48mhz=48Mhz (Slow - with USB)
256+
microduino32_flash.menu.cpu_speed.speed_48mhz.build.f_cpu=48000000L
257+
258+
microduino32_flash.menu.cpu_speed.speed_128mhz=128Mhz (Turbo NO USB!)
259+
microduino32_flash.menu.cpu_speed.speed_128mhz.build.f_cpu=128000000L
260+
220261
#-- Optimizations
221262
microduino32_flash.menu.opt.osstd=Smallest (default)
222263
microduino32_flash.menu.opt.osstd.build.flags.optimize=-Os
@@ -384,6 +425,9 @@ genericSTM32F103C.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
384425
genericSTM32F103C.menu.cpu_speed.speed_48mhz=48Mhz (Slow - with USB)
385426
genericSTM32F103C.menu.cpu_speed.speed_48mhz.build.f_cpu=48000000L
386427

428+
genericSTM32F103C.menu.cpu_speed.speed_128mhz=128Mhz (Turbo NO USB!)
429+
genericSTM32F103C.menu.cpu_speed.speed_128mhz.build.f_cpu=128000000L
430+
387431
#-- Optimizations
388432
genericSTM32F103C.menu.opt.osstd=Smallest (default)
389433
genericSTM32F103C.menu.opt.osstd.build.flags.optimize=-Os
@@ -485,6 +529,17 @@ genericSTM32F103R.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp
485529
genericSTM32F103R.menu.upload_method.BMPMethod.upload.tool=bmp_upload
486530
genericSTM32F103R.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG
487531

532+
#-- CPU Clock frequency
533+
genericSTM32F103R.menu.cpu_speed.speed_72mhz=72Mhz (Normal)
534+
genericSTM32F103R.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
535+
536+
genericSTM32F103R.menu.cpu_speed.speed_48mhz=48Mhz (Slow - with USB)
537+
genericSTM32F103R.menu.cpu_speed.speed_48mhz.build.f_cpu=48000000L
538+
539+
genericSTM32F103R.menu.cpu_speed.speed_128mhz=128Mhz (Turbo NO USB!)
540+
genericSTM32F103R.menu.cpu_speed.speed_128mhz.build.f_cpu=128000000L
541+
542+
488543
#-- Optimizations
489544
genericSTM32F103R.menu.opt.osstd=Smallest (default)
490545
genericSTM32F103R.menu.opt.osstd.build.flags.optimize=-Os
@@ -570,6 +625,16 @@ genericSTM32F103T.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp
570625
genericSTM32F103T.menu.upload_method.BMPMethod.upload.tool=bmp_upload
571626
genericSTM32F103T.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG
572627

628+
#-- CPU Clock frequency
629+
genericSTM32F103T.menu.cpu_speed.speed_72mhz=72Mhz (Normal)
630+
genericSTM32F103T.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
631+
632+
genericSTM32F103T.menu.cpu_speed.speed_48mhz=48Mhz (Slow - with USB)
633+
genericSTM32F103T.menu.cpu_speed.speed_48mhz.build.f_cpu=48000000L
634+
635+
genericSTM32F103T.menu.cpu_speed.speed_128mhz=128Mhz (Turbo NO USB!)
636+
genericSTM32F103T.menu.cpu_speed.speed_128mhz.build.f_cpu=128000000L
637+
573638
#-- Optimizations
574639
genericSTM32F103T.menu.opt.osstd=Smallest (default)
575640
genericSTM32F103T.menu.opt.osstd.build.flags.optimize=-Os
@@ -662,6 +727,16 @@ genericSTM32F103V.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp
662727
genericSTM32F103V.menu.upload_method.BMPMethod.upload.tool=bmp_upload
663728
genericSTM32F103V.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG
664729

730+
#-- CPU Clock frequency
731+
genericSTM32F103V.menu.cpu_speed.speed_72mhz=72Mhz (Normal)
732+
genericSTM32F103V.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
733+
734+
genericSTM32F103V.menu.cpu_speed.speed_48mhz=48Mhz (Slow - with USB)
735+
genericSTM32F103V.menu.cpu_speed.speed_48mhz.build.f_cpu=48000000L
736+
737+
genericSTM32F103V.menu.cpu_speed.speed_128mhz=128Mhz (Turbo NO USB!)
738+
genericSTM32F103V.menu.cpu_speed.speed_128mhz.build.f_cpu=128000000L
739+
665740
#-- Optimizations
666741
genericSTM32F103V.menu.opt.osstd=Smallest (default)
667742
genericSTM32F103V.menu.opt.osstd.build.flags.optimize=-Os
@@ -751,6 +826,16 @@ genericSTM32F103Z.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp
751826
genericSTM32F103Z.menu.upload_method.BMPMethod.upload.tool=bmp_upload
752827
genericSTM32F103Z.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG
753828

829+
#-- CPU Clock frequency
830+
genericSTM32F103Z.menu.cpu_speed.speed_72mhz=72Mhz (Normal)
831+
genericSTM32F103Z.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
832+
833+
genericSTM32F103Z.menu.cpu_speed.speed_48mhz=48Mhz (Slow - with USB)
834+
genericSTM32F103Z.menu.cpu_speed.speed_48mhz.build.f_cpu=48000000L
835+
836+
genericSTM32F103Z.menu.cpu_speed.speed_128mhz=128Mhz (Turbo NO USB!)
837+
genericSTM32F103Z.menu.cpu_speed.speed_128mhz.build.f_cpu=128000000L
838+
754839
#-- Optimizations
755840
genericSTM32F103Z.menu.opt.osstd=Smallest (default)
756841
genericSTM32F103Z.menu.opt.osstd.build.flags.optimize=-Os
@@ -834,6 +919,16 @@ hytiny-stm32f103t.menu.upload_method.jlinkMethod.upload.protocol=jlink
834919
hytiny-stm32f103t.menu.upload_method.jlinkMethod.upload.tool=jlink_upload
835920
hytiny-stm32f103t.menu.upload_method.jlinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DSERIAL_USB -DGENERIC_BOOTLOADER
836921

922+
#-- CPU Clock frequency
923+
hytiny-stm32f103t.menu.cpu_speed.speed_72mhz=72Mhz (Normal)
924+
hytiny-stm32f103t.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
925+
926+
hytiny-stm32f103t.menu.cpu_speed.speed_48mhz=48Mhz (Slow - with USB)
927+
hytiny-stm32f103t.menu.cpu_speed.speed_48mhz.build.f_cpu=48000000L
928+
929+
hytiny-stm32f103t.menu.cpu_speed.speed_128mhz=128Mhz (Turbo NO USB!)
930+
hytiny-stm32f103t.menu.cpu_speed.speed_128mhz.build.f_cpu=128000000L
931+
837932
#-- Optimizations
838933
hytiny-stm32f103t.menu.opt.osstd=Smallest (default)
839934
hytiny-stm32f103t.menu.opt.osstd.build.flags.optimize=-Os
@@ -988,6 +1083,16 @@ STM32VLD.menu.upload_method.STLinkMethod.upload.protocol=STLink
9881083
STM32VLD.menu.upload_method.STLinkMethod.upload.tool=stlink_upload
9891084
STM32VLD.menu.upload_method.STLinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG
9901085

1086+
#-- CPU Clock frequency
1087+
STM32VLD.menu.cpu_speed.speed_72mhz=72Mhz (Normal)
1088+
STM32VLD.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
1089+
1090+
STM32VLD.menu.cpu_speed.speed_48mhz=48Mhz (Slow - with USB)
1091+
STM32VLD.menu.cpu_speed.speed_48mhz.build.f_cpu=48000000L
1092+
1093+
STM32VLD.menu.cpu_speed.speed_128mhz=128Mhz (Turbo NO USB!)
1094+
STM32VLD.menu.cpu_speed.speed_128mhz.build.f_cpu=128000000L
1095+
9911096
#-- Optimizations
9921097
STM32VLD.menu.opt.osstd=Smallest (default)
9931098
STM32VLD.menu.opt.osstd.build.flags.optimize=-Os

‎STM32F1/variants/generic_stm32f103c/wirish/boards_setup.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@
4848
// works for F103 performance line MCUs, which is all that LeafLabs
4949
// currently officially supports).
5050
#ifndef BOARD_RCC_PLLMUL
51-
#if F_CPU==72000000
52-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
53-
#elif F_CPU==48000000
54-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
55-
#endif
51+
#if F_CPU==128000000
52+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_16
53+
#elif F_CPU==72000000
54+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
55+
#elif F_CPU==48000000
56+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
57+
#endif
5658
#endif
5759

5860
namespace wirish {

‎STM32F1/variants/generic_stm32f103r/wirish/boards_setup.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@
4848
// works for F103 performance line MCUs, which is all that LeafLabs
4949
// currently officially supports).
5050
#ifndef BOARD_RCC_PLLMUL
51-
#if F_CPU==72000000
52-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
53-
#elif F_CPU==48000000
54-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
55-
#endif
51+
#if F_CPU==128000000
52+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_16
53+
#elif F_CPU==72000000
54+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
55+
#elif F_CPU==48000000
56+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
57+
#endif
5658
#endif
5759

5860
namespace wirish {

‎STM32F1/variants/generic_stm32f103r8/wirish/boards_setup.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@
4848
// works for F103 performance line MCUs, which is all that LeafLabs
4949
// currently officially supports).
5050
#ifndef BOARD_RCC_PLLMUL
51-
#if F_CPU==72000000
52-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
53-
#elif F_CPU==48000000
54-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
55-
#endif
51+
#if F_CPU==128000000
52+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_16
53+
#elif F_CPU==72000000
54+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
55+
#elif F_CPU==48000000
56+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
57+
#endif
5658
#endif
5759

5860
namespace wirish {

‎STM32F1/variants/generic_stm32f103t/wirish/boards_setup.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@
4848
// works for F103 performance line MCUs, which is all that LeafLabs
4949
// currently officially supports).
5050
#ifndef BOARD_RCC_PLLMUL
51-
#if F_CPU==72000000
52-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
53-
#elif F_CPU==48000000
54-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
55-
#endif
51+
#if F_CPU==128000000
52+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_16
53+
#elif F_CPU==72000000
54+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
55+
#elif F_CPU==48000000
56+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
57+
#endif
5658
#endif
5759

5860
namespace wirish {

‎STM32F1/variants/generic_stm32f103v/wirish/boards_setup.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@
4848
// works for F103 performance line MCUs, which is all that LeafLabs
4949
// currently officially supports).
5050
#ifndef BOARD_RCC_PLLMUL
51-
#if F_CPU==72000000
52-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
53-
#elif F_CPU==48000000
54-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
55-
#endif
51+
#if F_CPU==128000000
52+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_16
53+
#elif F_CPU==72000000
54+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
55+
#elif F_CPU==48000000
56+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
57+
#endif
5658
#endif
5759

5860
namespace wirish {

‎STM32F1/variants/generic_stm32f103z/wirish/boards_setup.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@
4848
// works for F103 performance line MCUs, which is all that LeafLabs
4949
// currently officially supports).
5050
#ifndef BOARD_RCC_PLLMUL
51-
#if F_CPU==72000000
52-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
53-
#elif F_CPU==48000000
54-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
55-
#endif
51+
#if F_CPU==128000000
52+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_16
53+
#elif F_CPU==72000000
54+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
55+
#elif F_CPU==48000000
56+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
57+
#endif
5658
#endif
5759

5860
namespace wirish {

‎STM32F1/variants/hytiny_stm32f103t/wirish/boards_setup.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@
4848
// works for F103 performance line MCUs, which is all that LeafLabs
4949
// currently officially supports).
5050
#ifndef BOARD_RCC_PLLMUL
51-
#if F_CPU==72000000
52-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
53-
#elif F_CPU==48000000
54-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
55-
#endif
51+
#if F_CPU==128000000
52+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_16
53+
#elif F_CPU==72000000
54+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
55+
#elif F_CPU==48000000
56+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
57+
#endif
5658
#endif
5759

5860
namespace wirish {

‎STM32F1/variants/maple/wirish/boards_setup.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@
4848
// works for F103 performance line MCUs, which is all that LeafLabs
4949
// currently officially supports).
5050
#ifndef BOARD_RCC_PLLMUL
51-
#if F_CPU==72000000
52-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
53-
#elif F_CPU==48000000
54-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
55-
#endif
51+
#if F_CPU==128000000
52+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_16
53+
#elif F_CPU==72000000
54+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
55+
#elif F_CPU==48000000
56+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
57+
#endif
5658
#endif
5759

5860
namespace wirish {

‎STM32F1/variants/maple_mini/wirish/boards_setup.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@
4848
// works for F103 performance line MCUs, which is all that LeafLabs
4949
// currently officially supports).
5050
#ifndef BOARD_RCC_PLLMUL
51-
#if F_CPU==72000000
52-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
53-
#elif F_CPU==48000000
54-
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
55-
#endif
51+
#if F_CPU==128000000
52+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_16
53+
#elif F_CPU==72000000
54+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_9
55+
#elif F_CPU==48000000
56+
#define BOARD_RCC_PLLMUL RCC_PLLMUL_6
57+
#endif
5658
#endif
5759

5860
namespace wirish {

0 commit comments

Comments
 (0)