forked from mirrors/qmk_firmware
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
dc1eebb566
10 changed files with 27 additions and 0 deletions
|
@ -20,6 +20,8 @@ WS2812_DRIVER = spi
|
||||||
|
|
||||||
LAYOUTS = 60_ansi 60_tsangan_hhkb
|
LAYOUTS = 60_ansi 60_tsangan_hhkb
|
||||||
|
|
||||||
|
# Wildcard to allow APM32 MCU
|
||||||
|
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
|
||||||
|
|
||||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
||||||
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
||||||
|
|
|
@ -17,5 +17,8 @@ WS2812_DRIVER = spi
|
||||||
|
|
||||||
LAYOUTS = 60_ansi 60_tsangan_hhkb 60_iso
|
LAYOUTS = 60_ansi 60_tsangan_hhkb 60_iso
|
||||||
|
|
||||||
|
# Wildcard to allow APM32 MCU
|
||||||
|
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
|
||||||
|
|
||||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
||||||
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
||||||
|
|
|
@ -16,5 +16,8 @@ BACKLIGHT_ENABLE = yes
|
||||||
RGBLIGHT_ENABLE = yes
|
RGBLIGHT_ENABLE = yes
|
||||||
WS2812_DRIVER = spi
|
WS2812_DRIVER = spi
|
||||||
|
|
||||||
|
# Wildcard to allow APM32 MCU
|
||||||
|
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
|
||||||
|
|
||||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
||||||
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
||||||
|
|
|
@ -19,6 +19,8 @@ WS2812_DRIVER = spi
|
||||||
|
|
||||||
LAYOUTS = 60_ansi 60_tsangan_hhkb
|
LAYOUTS = 60_ansi 60_tsangan_hhkb
|
||||||
|
|
||||||
|
# Wildcard to allow APM32 MCU
|
||||||
|
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
|
||||||
|
|
||||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
||||||
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
||||||
|
|
|
@ -21,3 +21,6 @@ WS2812_DRIVER = spi
|
||||||
|
|
||||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
||||||
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
||||||
|
|
||||||
|
# Wildcard to allow APM32 MCU
|
||||||
|
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
|
||||||
|
|
|
@ -19,5 +19,8 @@ AUDIO_ENABLE = no # Audio output on port C6
|
||||||
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
|
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
|
||||||
WS2812_DRIVER = spi
|
WS2812_DRIVER = spi
|
||||||
|
|
||||||
|
# Wildcard to allow APM32 MCU
|
||||||
|
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
|
||||||
|
|
||||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
||||||
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
||||||
|
|
|
@ -15,5 +15,8 @@ CUSTOM_MATRIX = no # Custom matrix file
|
||||||
BACKLIGHT_ENABLE = yes
|
BACKLIGHT_ENABLE = yes
|
||||||
RGBLIGHT_ENABLE = no
|
RGBLIGHT_ENABLE = no
|
||||||
|
|
||||||
|
# Wildcard to allow APM32 MCU
|
||||||
|
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
|
||||||
|
|
||||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
||||||
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
||||||
|
|
|
@ -24,6 +24,8 @@ QWIIC_ENABLE += MICRO_OLED
|
||||||
|
|
||||||
DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
|
DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
|
||||||
|
|
||||||
|
# Wildcard to allow APM32 MCU
|
||||||
|
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
|
||||||
|
|
||||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
||||||
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
||||||
|
|
|
@ -21,4 +21,7 @@ WS2812_DRIVER = spi
|
||||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
||||||
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
||||||
|
|
||||||
|
# Wildcard to allow APM32 MCU
|
||||||
|
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
|
||||||
|
|
||||||
LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_ansi_blocker_tsangan 65_iso_blocker
|
LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_ansi_blocker_tsangan 65_iso_blocker
|
||||||
|
|
|
@ -20,3 +20,6 @@ WS2812_DRIVER = spi
|
||||||
|
|
||||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
||||||
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
||||||
|
|
||||||
|
# Wildcard to allow APM32 MCU
|
||||||
|
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
|
||||||
|
|
Loading…
Reference in a new issue