aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorAndrew Kannan <andrew.kannan@klaviyo.com>2020-12-03 21:22:05 -0500
committerGitHub <noreply@github.com>2020-12-03 18:22:05 -0800
commit0f086df89fba8dcc073a15d7b9c000aed21a5f5d (patch)
tree8121c7b3633140dc8f4ac3fe63f022fa44bb6447 /keyboards
parent6ab0a6e7967344a13bda480ccc477939695e9cf2 (diff)
downloadqmk_firmware-0f086df89fba8dcc073a15d7b9c000aed21a5f5d.tar.gz
qmk_firmware-0f086df89fba8dcc073a15d7b9c000aed21a5f5d.zip
Allow APM32 MCUs on certain CannonKeys PCBs (#10899)
* Allow APM32 MCUs on certain CannonKeys PCBs * another one * Update DFU suffix args * missed one * Apply suggestions from code review Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/cannonkeys/an_c/rules.mk2
-rw-r--r--keyboards/cannonkeys/db60/rules.mk3
-rw-r--r--keyboards/cannonkeys/devastatingtkl/rules.mk3
-rw-r--r--keyboards/cannonkeys/instant60/rules.mk2
-rw-r--r--keyboards/cannonkeys/instant65/rules.mk3
-rw-r--r--keyboards/cannonkeys/obliterated75/rules.mk3
-rw-r--r--keyboards/cannonkeys/rekt1800/rules.mk3
-rw-r--r--keyboards/cannonkeys/satisfaction75/rules.mk2
-rw-r--r--keyboards/cannonkeys/savage65/rules.mk3
-rw-r--r--keyboards/cannonkeys/tmov2/rules.mk3
10 files changed, 27 insertions, 0 deletions
diff --git a/keyboards/cannonkeys/an_c/rules.mk b/keyboards/cannonkeys/an_c/rules.mk
index d97022249..8ed2d0ead 100644
--- a/keyboards/cannonkeys/an_c/rules.mk
+++ b/keyboards/cannonkeys/an_c/rules.mk
@@ -20,6 +20,8 @@ WS2812_DRIVER = spi
20 20
21LAYOUTS = 60_ansi 60_tsangan_hhkb 21LAYOUTS = 60_ansi 60_tsangan_hhkb
22 22
23# Wildcard to allow APM32 MCU
24DFU_SUFFIX_ARGS = -p FFFF -v FFFF
23 25
24# Enter lower-power sleep mode when on the ChibiOS idle thread 26# Enter lower-power sleep mode when on the ChibiOS idle thread
25OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 27OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/db60/rules.mk b/keyboards/cannonkeys/db60/rules.mk
index 126728650..233850816 100644
--- a/keyboards/cannonkeys/db60/rules.mk
+++ b/keyboards/cannonkeys/db60/rules.mk
@@ -17,5 +17,8 @@ WS2812_DRIVER = spi
17 17
18LAYOUTS = 60_ansi 60_tsangan_hhkb 60_iso 18LAYOUTS = 60_ansi 60_tsangan_hhkb 60_iso
19 19
20# Wildcard to allow APM32 MCU
21DFU_SUFFIX_ARGS = -p FFFF -v FFFF
22
20# Enter lower-power sleep mode when on the ChibiOS idle thread 23# Enter lower-power sleep mode when on the ChibiOS idle thread
21OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 24OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/devastatingtkl/rules.mk b/keyboards/cannonkeys/devastatingtkl/rules.mk
index 9c3d0179f..4ce69bf4a 100644
--- a/keyboards/cannonkeys/devastatingtkl/rules.mk
+++ b/keyboards/cannonkeys/devastatingtkl/rules.mk
@@ -16,5 +16,8 @@ BACKLIGHT_ENABLE = yes
16RGBLIGHT_ENABLE = yes 16RGBLIGHT_ENABLE = yes
17WS2812_DRIVER = spi 17WS2812_DRIVER = spi
18 18
19# Wildcard to allow APM32 MCU
20DFU_SUFFIX_ARGS = -p FFFF -v FFFF
21
19# Enter lower-power sleep mode when on the ChibiOS idle thread 22# Enter lower-power sleep mode when on the ChibiOS idle thread
20OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 23OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/instant60/rules.mk b/keyboards/cannonkeys/instant60/rules.mk
index b863bfadd..0973ad954 100644
--- a/keyboards/cannonkeys/instant60/rules.mk
+++ b/keyboards/cannonkeys/instant60/rules.mk
@@ -19,6 +19,8 @@ WS2812_DRIVER = spi
19 19
20LAYOUTS = 60_ansi 60_tsangan_hhkb 20LAYOUTS = 60_ansi 60_tsangan_hhkb
21 21
22# Wildcard to allow APM32 MCU
23DFU_SUFFIX_ARGS = -p FFFF -v FFFF
22 24
23# Enter lower-power sleep mode when on the ChibiOS idle thread 25# Enter lower-power sleep mode when on the ChibiOS idle thread
24OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 26OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/instant65/rules.mk b/keyboards/cannonkeys/instant65/rules.mk
index 33c186b21..eba941f89 100644
--- a/keyboards/cannonkeys/instant65/rules.mk
+++ b/keyboards/cannonkeys/instant65/rules.mk
@@ -21,3 +21,6 @@ WS2812_DRIVER = spi
21 21
22# Enter lower-power sleep mode when on the ChibiOS idle thread 22# Enter lower-power sleep mode when on the ChibiOS idle thread
23OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 23OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
24
25# Wildcard to allow APM32 MCU
26DFU_SUFFIX_ARGS = -p FFFF -v FFFF
diff --git a/keyboards/cannonkeys/obliterated75/rules.mk b/keyboards/cannonkeys/obliterated75/rules.mk
index a1aa5f142..fd12ef84b 100644
--- a/keyboards/cannonkeys/obliterated75/rules.mk
+++ b/keyboards/cannonkeys/obliterated75/rules.mk
@@ -19,5 +19,8 @@ AUDIO_ENABLE = no # Audio output on port C6
19FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches 19FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
20WS2812_DRIVER = spi 20WS2812_DRIVER = spi
21 21
22# Wildcard to allow APM32 MCU
23DFU_SUFFIX_ARGS = -p FFFF -v FFFF
24
22# Enter lower-power sleep mode when on the ChibiOS idle thread 25# Enter lower-power sleep mode when on the ChibiOS idle thread
23OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 26OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/rekt1800/rules.mk b/keyboards/cannonkeys/rekt1800/rules.mk
index c8f75b7dd..c4f07f544 100644
--- a/keyboards/cannonkeys/rekt1800/rules.mk
+++ b/keyboards/cannonkeys/rekt1800/rules.mk
@@ -15,5 +15,8 @@ CUSTOM_MATRIX = no # Custom matrix file
15BACKLIGHT_ENABLE = yes 15BACKLIGHT_ENABLE = yes
16RGBLIGHT_ENABLE = no 16RGBLIGHT_ENABLE = no
17 17
18# Wildcard to allow APM32 MCU
19DFU_SUFFIX_ARGS = -p FFFF -v FFFF
20
18# Enter lower-power sleep mode when on the ChibiOS idle thread 21# Enter lower-power sleep mode when on the ChibiOS idle thread
19OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 22OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/satisfaction75/rules.mk b/keyboards/cannonkeys/satisfaction75/rules.mk
index a2288a4aa..3a48d3ebf 100644
--- a/keyboards/cannonkeys/satisfaction75/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/rules.mk
@@ -24,6 +24,8 @@ QWIIC_ENABLE += MICRO_OLED
24 24
25DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1 25DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
26 26
27# Wildcard to allow APM32 MCU
28DFU_SUFFIX_ARGS = -p FFFF -v FFFF
27 29
28# Enter lower-power sleep mode when on the ChibiOS idle thread 30# Enter lower-power sleep mode when on the ChibiOS idle thread
29OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 31OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/savage65/rules.mk b/keyboards/cannonkeys/savage65/rules.mk
index 577c578dd..8e1b984fd 100644
--- a/keyboards/cannonkeys/savage65/rules.mk
+++ b/keyboards/cannonkeys/savage65/rules.mk
@@ -21,4 +21,7 @@ WS2812_DRIVER = spi
21# Enter lower-power sleep mode when on the ChibiOS idle thread 21# Enter lower-power sleep mode when on the ChibiOS idle thread
22OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 22OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
23 23
24# Wildcard to allow APM32 MCU
25DFU_SUFFIX_ARGS = -p FFFF -v FFFF
26
24LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_ansi_blocker_tsangan 65_iso_blocker 27LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_ansi_blocker_tsangan 65_iso_blocker
diff --git a/keyboards/cannonkeys/tmov2/rules.mk b/keyboards/cannonkeys/tmov2/rules.mk
index dc7f59ae4..9b29e8fd1 100644
--- a/keyboards/cannonkeys/tmov2/rules.mk
+++ b/keyboards/cannonkeys/tmov2/rules.mk
@@ -20,3 +20,6 @@ WS2812_DRIVER = spi
20 20
21# Enter lower-power sleep mode when on the ChibiOS idle thread 21# Enter lower-power sleep mode when on the ChibiOS idle thread
22OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 22OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
23
24# Wildcard to allow APM32 MCU
25DFU_SUFFIX_ARGS = -p FFFF -v FFFF
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-01 22:07:52 +0000