summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2023-01-11 22:31:54 +0000
committerGitHub <noreply@github.com>2023-01-11 22:31:54 +0000
commitb61654fb956947939eb6922735130eb2f65b5f53 (patch)
tree3de5447d852a1e8cd3fbe2301d70150b79098b25
parent6576127b4c75c540d218527536d3a0d9b1eb5e9a (diff)
Tidy up use of CTPC (#19570)
-rwxr-xr-xkeyboards/ckeys/handwire_101/readme.md2
-rw-r--r--keyboards/keebio/bdn9/keymaps/codecoffeecode/rules.mk2
-rw-r--r--keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk2
-rw-r--r--keyboards/montsinger/rebound/rev1/keymaps/curry/rules.mk2
-rw-r--r--keyboards/shapeshifter4060/keymaps/debug/readme.md2
-rw-r--r--keyboards/shapeshifter4060/readme.md2
-rw-r--r--layouts/community/split_3x6_3/drashna/rules.mk3
-rw-r--r--users/brandonschlack/process_records.c6
-rwxr-xr-xusers/ericgebhart/rules.mk2
9 files changed, 10 insertions, 13 deletions
diff --git a/keyboards/ckeys/handwire_101/readme.md b/keyboards/ckeys/handwire_101/readme.md
index 281fbddc7c..2e152b39ea 100755
--- a/keyboards/ckeys/handwire_101/readme.md
+++ b/keyboards/ckeys/handwire_101/readme.md
@@ -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
diff --git a/keyboards/keebio/bdn9/keymaps/codecoffeecode/rules.mk b/keyboards/keebio/bdn9/keymaps/codecoffeecode/rules.mk
index 1724fe7eea..ab339e537f 100644
--- a/keyboards/keebio/bdn9/keymaps/codecoffeecode/rules.mk
+++ b/keyboards/keebio/bdn9/keymaps/codecoffeecode/rules.mk
@@ -1,4 +1,4 @@
MOUSEKEY_ENABLE = yes
ifneq (, $(findstring rev1, $(KEYBOARD)))
- CTPC = yes
+ CONVERT_TO=proton_c
endif
diff --git a/keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk b/keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk
index a61cff2750..9cd1546348 100644
--- a/keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk
+++ b/keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk
@@ -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
diff --git a/keyboards/montsinger/rebound/rev1/keymaps/curry/rules.mk b/keyboards/montsinger/rebound/rev1/keymaps/curry/rules.mk
index 36225f7ba6..7300873397 100644
--- a/keyboards/montsinger/rebound/rev1/keymaps/curry/rules.mk
+++ b/keyboards/montsinger/rebound/rev1/keymaps/curry/rules.mk
@@ -1 +1 @@
-CTPC = yes
+CONVERT_TO=proton_c
diff --git a/keyboards/shapeshifter4060/keymaps/debug/readme.md b/keyboards/shapeshifter4060/keymaps/debug/readme.md
index 3dcbc27ae7..b0b5ec7566 100644
--- a/keyboards/shapeshifter4060/keymaps/debug/readme.md
+++ b/keyboards/shapeshifter4060/keymaps/debug/readme.md
@@ -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:
diff --git a/keyboards/shapeshifter4060/readme.md b/keyboards/shapeshifter4060/readme.md
index d318502c20..6b40a2c54a 100644
--- a/keyboards/shapeshifter4060/readme.md
+++ b/keyboards/shapeshifter4060/readme.md
@@ -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:
diff --git a/layouts/community/split_3x6_3/drashna/rules.mk b/layouts/community/split_3x6_3/drashna/rules.mk
index 3fd4279bef..2d07ad5a77 100644
--- a/layouts/community/split_3x6_3/drashna/rules.mk
+++ b/layouts/community/split_3x6_3/drashna/rules.mk
@@ -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
diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c
index 892bc7e062..f40eeaf8b6 100644
--- a/users/brandonschlack/process_records.c
+++ b/users/brandonschlack/process_records.c
@@ -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) {
diff --git a/users/ericgebhart/rules.mk b/users/ericgebhart/rules.mk
index a6eddc2d87..8ec481c17a 100755
--- a/users/ericgebhart/rules.mk
+++ b/users/ericgebhart/rules.mk
@@ -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.