Skip to content

Rename PILL_C8 boards definition to PILL_CB #1017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 30, 2020
Merged

Rename PILL_C8 boards definition to PILL_CB #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CI/build/conf/cores_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@
"ARMED_V1",
"BLUE_F407VE_Mini",
"BLACKPILL_F103C8",
"BLACKPILL_F103C8B",
"BLACKPILL_F103CB",
"BLUEPILL_F103C6",
"BLUEPILL_F103C8",
"BLUEPILL_F103C8B",
"BLUEPILL_F103CB",
"BLACKPILL_F303CC",
"BLACKPILL_F401CC",
"CoreBoard_F401RC",
Expand Down Expand Up @@ -155,10 +155,10 @@
"AFROFLIGHT_F103CB_12M",
"ARMED_V1",
"BLACKPILL_F103C8",
"BLACKPILL_F103C8B",
"BLACKPILL_F103CB",
"BLUEPILL_F103C6",
"BLUEPILL_F103C8",
"BLUEPILL_F103C8B",
"BLUEPILL_F103CB",
"BLACKPILL_F303CC",
"BLACKPILL_F401CC",
"BLUE_F407VE_Mini",
Expand Down
4 changes: 2 additions & 2 deletions CI/build/conf/cores_config_ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
"applicable": false,
"boards": [
"AFROFLIGHT_F103CB_12M",
"BLACKPILL_F103C8B",
"BLACKPILL_F103CB",
"BLACK_F407VG",
"BLACK_F407ZE",
"BLACK_F407ZG",
"BLUEPILL_F103C6",
"BLUEPILL_F103C8B",
"BLUEPILL_F103CB",
"DEMO_F030F4_16M",
"Generic_F103R8T6",
"Generic_F103RBT6",
Expand Down
4 changes: 2 additions & 2 deletions CI/build/conf/cores_config_travis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
"applicable": false,
"boards": [
"AFROFLIGHT_F103CB_12M",
"BLACKPILL_F103C8B",
"BLACKPILL_F103CB",
"BLACK_F407VG",
"BLACK_F407ZE",
"BLACK_F407ZG",
"BLUEPILL_F103C6",
"BLUEPILL_F103C8B",
"BLUEPILL_F103CB",
"DEMO_F030F4_16M",
"Generic_F103R8T6",
"Generic_F103RBT6",
Expand Down
24 changes: 12 additions & 12 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,12 +851,12 @@ GenF1.menu.pnum.BLUEPILL_F103C8.build.board=BLUEPILL_F103C8
GenF1.menu.pnum.BLUEPILL_F103C8.build.product_line=STM32F103xB
GenF1.menu.pnum.BLUEPILL_F103C8.build.variant=PILL_F103XX

GenF1.menu.pnum.BLUEPILL_F103C8B=BluePill F103C8 (128k)
GenF1.menu.pnum.BLUEPILL_F103C8B.upload.maximum_size=131072
GenF1.menu.pnum.BLUEPILL_F103C8B.upload.maximum_data_size=20480
GenF1.menu.pnum.BLUEPILL_F103C8B.build.board=BLUEPILL_F103C8
GenF1.menu.pnum.BLUEPILL_F103C8B.build.product_line=STM32F103xB
GenF1.menu.pnum.BLUEPILL_F103C8B.build.variant=PILL_F103XX
GenF1.menu.pnum.BLUEPILL_F103CB=BluePill F103CB (or C8 with 128k)
GenF1.menu.pnum.BLUEPILL_F103CB.upload.maximum_size=131072
GenF1.menu.pnum.BLUEPILL_F103CB.upload.maximum_data_size=20480
GenF1.menu.pnum.BLUEPILL_F103CB.build.board=BLUEPILL_F103CB
GenF1.menu.pnum.BLUEPILL_F103CB.build.product_line=STM32F103xB
GenF1.menu.pnum.BLUEPILL_F103CB.build.variant=PILL_F103XX

# BLACKPILL_F103C8 board
GenF1.menu.pnum.BLACKPILL_F103C8=BlackPill F103C8
Expand All @@ -866,12 +866,12 @@ GenF1.menu.pnum.BLACKPILL_F103C8.build.board=BLACKPILL_F103C8
GenF1.menu.pnum.BLACKPILL_F103C8.build.product_line=STM32F103xB
GenF1.menu.pnum.BLACKPILL_F103C8.build.variant=PILL_F103XX

GenF1.menu.pnum.BLACKPILL_F103C8B=BlackPill F103C8 (128k)
GenF1.menu.pnum.BLACKPILL_F103C8B.upload.maximum_size=131072
GenF1.menu.pnum.BLACKPILL_F103C8B.upload.maximum_data_size=20480
GenF1.menu.pnum.BLACKPILL_F103C8B.build.board=BLACKPILL_F103C8
GenF1.menu.pnum.BLACKPILL_F103C8B.build.product_line=STM32F103xB
GenF1.menu.pnum.BLACKPILL_F103C8B.build.variant=PILL_F103XX
GenF1.menu.pnum.BLACKPILL_F103CB=BlackPill F103CB (or C8 with 128k)
GenF1.menu.pnum.BLACKPILL_F103CB.upload.maximum_size=131072
GenF1.menu.pnum.BLACKPILL_F103CB.upload.maximum_data_size=20480
GenF1.menu.pnum.BLACKPILL_F103CB.build.board=BLACKPILL_F103CB
GenF1.menu.pnum.BLACKPILL_F103CB.build.product_line=STM32F103xB
GenF1.menu.pnum.BLACKPILL_F103CB.build.variant=PILL_F103XX

# Generic STM32F103Rx boards (Blue button)
GenF1.menu.pnum.Generic_F103R8T6=Generic F103R8T6 (Blue Button)
Expand Down
6 changes: 5 additions & 1 deletion variants/PILL_F103XX/variant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,15 @@ extern "C" {
#define NUM_ANALOG_FIRST 20

// On-board LED pin number
#ifdef ARDUINO_BLUEPILL_F103C8
#if defined(ARDUINO_BLUEPILL_F103C6) || defined(ARDUINO_BLUEPILL_F103C8) ||\
defined(ARDUINO_BLUEPILL_F103CB)
#define LED_BUILTIN PC13
#else
#ifndef LED_BUILTIN
// Default for Blackpill
#define LED_BUILTIN PB12
#endif
#endif
#define LED_GREEN LED_BUILTIN

// SPI Definitions
Expand Down