Skip to content
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.

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

Tidy up use of CTPC #19570

Merged
merged 1 commit into from
Jan 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion keyboards/ckeys/handwire_101/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The laser cutting file is ideal for Ponoko's P1 board size.

If you want to reflash the pre-installed firmware, use the `.bin` file for Proton C and the `.hex` file for Pro Micro builds. Flash with the QMK Toolbox or via the command line.

Building for Proton C: `make ckeys/handwire_101:default CTPC=yes`
Building for Proton C: `make ckeys/handwire_101:default CONVERT_TO=proton_c`
Building for Pro Micro: `make ckeys/handwire_101:default`

Pre-built firmware files (and laser cutting case files) can be found here: https://github.com/c-keys/handwire
Expand Down
2 changes: 1 addition & 1 deletion keyboards/keebio/bdn9/keymaps/codecoffeecode/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MOUSEKEY_ENABLE = yes
ifneq (, $(findstring rev1, $(KEYBOARD)))
CTPC = yes
CONVERT_TO=proton_c
endif
2 changes: 1 addition & 1 deletion keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CTPC=yes
CONVERT_TO=proton_c
CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
AUDIO_ENABLE = yes
2 changes: 1 addition & 1 deletion keyboards/montsinger/rebound/rev1/keymaps/curry/rules.mk
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CTPC = yes
CONVERT_TO=proton_c
2 changes: 1 addition & 1 deletion keyboards/shapeshifter4060/keymaps/debug/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ To compile and flash to the board:

If you want to use this with a Proton C, do this instead:

make shapeshifter4060:debug CTPC=yes
make shapeshifter4060:debug CONVERT_TO=proton_c

To just compile:

Expand Down
2 changes: 1 addition & 1 deletion keyboards/shapeshifter4060/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Make example for this keyboard (after setting up your build environment):

For use with the Proton C

make shapeshifter4060:default CTPC=yes
make shapeshifter4060:default CONVERT_TO=proton_c

Flashing example for this keyboard:

Expand Down
3 changes: 0 additions & 3 deletions layouts/community/split_3x6_3/drashna/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ USE_ARM_CONFIG ?= no
ifeq ($(strip $(CONVERT_TO)), proton_c)
USE_ARM_CONFIG = yes
endif
ifeq ($(strip $(CTPC)), yes)
USE_ARM_CONFIG = yes
endif
ifeq ($(strip $(MCU)), STM32F303)
USE_ARM_CONFIG = yes
endif
Expand Down
6 changes: 3 additions & 3 deletions users/brandonschlack/process_records.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,14 @@ void matrix_scan_cmd_tab(void) {
*
* Sends 'qmk compile -kb keyboard -km keymap' command to compile firmware
* Uses 'qmk flash' and resets keyboard, if flash_bootloader set to true
* Sends CTPC and/or FORCE_LAYOUT parameters if built with those options
* Sends CONVERT_TO and/or FORCE_LAYOUT parameters if built with those options
*/
void send_make_command(bool flash_bootloader) {
#ifdef FORCE_LAYOUT // Add layout string if built with FORCE_LAYOUT
SEND_STRING("FORCE_LAYOUT=" FORCE_LAYOUT " ");
#endif
#ifdef CONVERT_TO_PROTON_C // Add CTPC if built with CONVERT_TO_PROTON_C
SEND_STRING("CTPC=yes ");
#ifdef CONVERT_TO_PROTON_C // Add CONVERT_TO if built with converter
SEND_STRING("CONVERT_TO=proton_c ");
#endif
SEND_STRING("qmk ");
if (flash_bootloader) {
Expand Down
2 changes: 1 addition & 1 deletion users/ericgebhart/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ VPATH += $(USER_PATH)/oled
# SERIAL_DRIVER = usart
# AUDIO_ENABLE = no
# LTO_ENABLE = no
# CONVERT_TO_PROTON_C = yes
# CONVERT_TO=proton_c

# so the keyboard's code doesn't add stuff we don't need.
# when we use our own oled renders.
Expand Down