gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-22 11:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2023-01-11 22:32:28 +00:00
commit 3c239626f7
9 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/ckeys/handwire_101/readme.md
View File

@ -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

2
keyboards/keebio/bdn9/keymaps/codecoffeecode/rules.mk
View File

@ -1,4 +1,4 @@
MOUSEKEY_ENABLE = yes
ifneq (, $(findstring rev1, $(KEYBOARD)))
CTPC = yes
CONVERT_TO=proton_c
endif

2
keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk
View File

@ -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
keyboards/montsinger/rebound/rev1/keymaps/curry/rules.mk
View File

@ -1 +1 @@
CTPC = yes
CONVERT_TO=proton_c

2
keyboards/shapeshifter4060/keymaps/debug/readme.md
View File

@ -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:

2
keyboards/shapeshifter4060/readme.md
View File

@ -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:

3
layouts/community/split_3x6_3/drashna/rules.mk
View File

@ -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

6
users/brandonschlack/process_records.c
View File

@ -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) {

2
users/ericgebhart/rules.mk
View File

@ -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.