Tidy up use of CTPC (#19570)
This commit is contained in:
		
							parent
							
								
									6576127b4c
								
							
						
					
					
						commit
						b61654fb95
					
				
					 9 changed files with 10 additions and 13 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
MOUSEKEY_ENABLE = yes
 | 
			
		||||
ifneq (, $(findstring rev1, $(KEYBOARD)))
 | 
			
		||||
  CTPC = yes
 | 
			
		||||
  CONVERT_TO=proton_c
 | 
			
		||||
endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1 +1 @@
 | 
			
		|||
CTPC = yes
 | 
			
		||||
CONVERT_TO=proton_c
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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:
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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:
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue