From 4d06d2835c87f3eed694493fb749527032a78ec2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Fri, 3 Jan 2020 09:58:34 +1100 Subject: [PATCH] Move CORTEX_ENABLE_WFI_IDLE=TRUE to rules.mk files. --- keyboards/at_at/660m/chconf.h | 4 ---- keyboards/at_at/660m/rules.mk | 3 +++ keyboards/candybar/chconf.h | 4 ---- keyboards/candybar/rules.mk | 4 ++++ keyboards/cannonkeys/an_c/chconf.h | 4 ---- keyboards/cannonkeys/an_c/rules.mk | 4 ++++ keyboards/cannonkeys/chimera65/chconf.h | 4 ---- keyboards/cannonkeys/chimera65/rules.mk | 4 ++++ keyboards/cannonkeys/instant60/chconf.h | 4 ---- keyboards/cannonkeys/instant60/rules.mk | 4 ++++ keyboards/cannonkeys/iron165/chconf.h | 4 ---- keyboards/cannonkeys/iron165/rules.mk | 4 ++++ keyboards/cannonkeys/ortho48/chconf.h | 4 ---- keyboards/cannonkeys/ortho48/rules.mk | 4 ++++ keyboards/cannonkeys/ortho60/chconf.h | 4 ---- keyboards/cannonkeys/ortho60/rules.mk | 4 ++++ keyboards/cannonkeys/ortho75/chconf.h | 4 ---- keyboards/cannonkeys/ortho75/rules.mk | 4 ++++ keyboards/cannonkeys/practice60/chconf.h | 4 ---- keyboards/cannonkeys/practice60/rules.mk | 4 ++++ keyboards/cannonkeys/practice65/chconf.h | 4 ---- keyboards/cannonkeys/practice65/rules.mk | 4 ++++ keyboards/cannonkeys/satisfaction75/chconf.h | 4 ---- keyboards/cannonkeys/satisfaction75/rules.mk | 4 ++++ keyboards/cannonkeys/savage65/chconf.h | 4 ---- keyboards/cannonkeys/savage65/rules.mk | 3 +++ keyboards/cannonkeys/tmov2/chconf.h | 4 ---- keyboards/cannonkeys/tmov2/rules.mk | 3 +++ keyboards/converter/siemens_tastatur/chconf.h | 4 ---- keyboards/converter/siemens_tastatur/rules.mk | 3 +++ keyboards/ergodox_stm32/chconf.h | 4 ---- keyboards/ergodox_stm32/rules.mk | 4 ++++ keyboards/handwired/bluepill/bluepill70/chconf.h | 4 ---- keyboards/handwired/bluepill/bluepill70/rules.mk | 6 +++++- keyboards/handwired/ck4x4/chconf.h | 4 ---- keyboards/handwired/ck4x4/rules.mk | 4 ++++ keyboards/handwired/onekey/bluepill/chconf.h | 4 ---- keyboards/handwired/onekey/bluepill/rules.mk | 4 ++++ keyboards/handwired/onekey/stm32f0_disco/chconf.h | 4 ---- keyboards/handwired/onekey/stm32f0_disco/rules.mk | 4 ++++ keyboards/handwired/onekey/teensy_32/chconf.h | 4 ---- keyboards/handwired/onekey/teensy_32/rules.mk | 4 ++++ keyboards/handwired/onekey/teensy_lc/chconf.h | 4 ---- keyboards/handwired/onekey/teensy_lc/rules.mk | 4 ++++ keyboards/infinity60/chconf.h | 4 ---- keyboards/infinity60/rules.mk | 4 ++++ keyboards/jm60/chconf.h | 4 ---- keyboards/jm60/rules.mk | 8 ++++++-- keyboards/k_type/chconf.h | 4 ---- keyboards/k_type/rules.mk | 4 ++++ keyboards/peiorisboards/ixora/chconf.h | 6 +----- keyboards/peiorisboards/ixora/rules.mk | 4 ++++ keyboards/projectkb/alice/chconf.h | 4 ---- keyboards/projectkb/alice/rules.mk | 4 ++++ keyboards/vinta/chconf.h | 6 +----- keyboards/vinta/rules.mk | 6 +++++- keyboards/whitefox/chconf.h | 4 ---- keyboards/whitefox/rules.mk | 4 ++++ 58 files changed, 118 insertions(+), 122 deletions(-) diff --git a/keyboards/at_at/660m/chconf.h b/keyboards/at_at/660m/chconf.h index 99fa8ce39822e2dd9f8d10aab4a7af81cd3fa3ee..89388dd5a3d1a3ab456c78d95cd3a9f38dd08500 100644 --- a/keyboards/at_at/660m/chconf.h +++ b/keyboards/at_at/660m/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/at_at/660m/rules.mk b/keyboards/at_at/660m/rules.mk index b893d8031bf7d4bdf1280b55c31a39e485af81c1..0b3685f09e4e91d356f88e0bbf82e75f5daf481e 100644 --- a/keyboards/at_at/660m/rules.mk +++ b/keyboards/at_at/660m/rules.mk @@ -17,3 +17,6 @@ CUSTOM_MATRIX = no # Custom matrix file # RGBLIGHT_ENABLE = yes NO_USB_STARTUP_CHECK = yes # Workaround for issue 6369 + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/candybar/chconf.h b/keyboards/candybar/chconf.h index 99fa8ce39822e2dd9f8d10aab4a7af81cd3fa3ee..89388dd5a3d1a3ab456c78d95cd3a9f38dd08500 100644 --- a/keyboards/candybar/chconf.h +++ b/keyboards/candybar/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/candybar/rules.mk b/keyboards/candybar/rules.mk index 0e1a8517fa646dd3f5da8a3c8bfbbf14e4a8fda5..cb1b832886a05ede16027073fc607b4452038b0e 100644 --- a/keyboards/candybar/rules.mk +++ b/keyboards/candybar/rules.mk @@ -18,3 +18,7 @@ NKRO_ENABLE = yes # USB Nkey Rollover AUDIO_ENABLE = no RGBLIGHT_ENABLE = no SERIAL_LINK_ENABLE = no + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/cannonkeys/an_c/chconf.h b/keyboards/cannonkeys/an_c/chconf.h index 99fa8ce39822e2dd9f8d10aab4a7af81cd3fa3ee..89388dd5a3d1a3ab456c78d95cd3a9f38dd08500 100644 --- a/keyboards/cannonkeys/an_c/chconf.h +++ b/keyboards/cannonkeys/an_c/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/cannonkeys/an_c/rules.mk b/keyboards/cannonkeys/an_c/rules.mk index 151f72fd0fc2ca5881c545b448c8cae27da33236..2050ba34c49965b31e1304a2ccae44c6815e73b2 100644 --- a/keyboards/cannonkeys/an_c/rules.mk +++ b/keyboards/cannonkeys/an_c/rules.mk @@ -22,3 +22,7 @@ CUSTOM_MATRIX = no # Custom matrix file RGBLIGHT_ENABLE = yes LAYOUTS = 60_ansi 60_tsangan_hhkb + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/cannonkeys/chimera65/chconf.h b/keyboards/cannonkeys/chimera65/chconf.h index 99fa8ce39822e2dd9f8d10aab4a7af81cd3fa3ee..89388dd5a3d1a3ab456c78d95cd3a9f38dd08500 100644 --- a/keyboards/cannonkeys/chimera65/chconf.h +++ b/keyboards/cannonkeys/chimera65/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/cannonkeys/chimera65/rules.mk b/keyboards/cannonkeys/chimera65/rules.mk index 1e300a99c70157789b5011cfc981380613597d2e..9b1ab589917fafcd9cac11b6287e13aaf24adc76 100644 --- a/keyboards/cannonkeys/chimera65/rules.mk +++ b/keyboards/cannonkeys/chimera65/rules.mk @@ -20,3 +20,7 @@ NKRO_ENABLE = yes # USB Nkey Rollover CUSTOM_MATRIX = no # Custom matrix file # BACKLIGHT_ENABLE = yes # This is broken on 072 for some reason RGBLIGHT_ENABLE = no + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/cannonkeys/instant60/chconf.h b/keyboards/cannonkeys/instant60/chconf.h index 99fa8ce39822e2dd9f8d10aab4a7af81cd3fa3ee..89388dd5a3d1a3ab456c78d95cd3a9f38dd08500 100644 --- a/keyboards/cannonkeys/instant60/chconf.h +++ b/keyboards/cannonkeys/instant60/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/cannonkeys/instant60/rules.mk b/keyboards/cannonkeys/instant60/rules.mk index db753884daba9bb37c6aa74c99277a0402a8e970..0b4afd8da81e818ca779e2f96b7035cea0fd8445 100644 --- a/keyboards/cannonkeys/instant60/rules.mk +++ b/keyboards/cannonkeys/instant60/rules.mk @@ -22,3 +22,7 @@ CUSTOM_MATRIX = no # Custom matrix file RGBLIGHT_ENABLE = yes LAYOUTS = 60_ansi 60_tsangan_hhkb + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/cannonkeys/iron165/chconf.h b/keyboards/cannonkeys/iron165/chconf.h index 99fa8ce39822e2dd9f8d10aab4a7af81cd3fa3ee..89388dd5a3d1a3ab456c78d95cd3a9f38dd08500 100644 --- a/keyboards/cannonkeys/iron165/chconf.h +++ b/keyboards/cannonkeys/iron165/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/cannonkeys/iron165/rules.mk b/keyboards/cannonkeys/iron165/rules.mk index edc84edd51f6f98d083768e1d0009936973dac1e..33529718eb400329bc546bca7eb6ea549e75bf61 100644 --- a/keyboards/cannonkeys/iron165/rules.mk +++ b/keyboards/cannonkeys/iron165/rules.mk @@ -20,3 +20,7 @@ NKRO_ENABLE = yes # USB Nkey Rollover CUSTOM_MATRIX = no # Custom matrix file # BACKLIGHT_ENABLE = yes # This is broken on 072 for some reason RGBLIGHT_ENABLE = no + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/cannonkeys/ortho48/chconf.h b/keyboards/cannonkeys/ortho48/chconf.h index bbd9b2da62d26046bcb02f35d79f0773ffe91477..9299be587ec67c7fe70c186c5bfb92ff6d04b7f7 100644 --- a/keyboards/cannonkeys/ortho48/chconf.h +++ b/keyboards/cannonkeys/ortho48/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/cannonkeys/ortho48/rules.mk b/keyboards/cannonkeys/ortho48/rules.mk index b060afd156e166ca2e67765182cf8599fc15381d..59c12681cff915304200d7be8e23514a1d51c6d2 100644 --- a/keyboards/cannonkeys/ortho48/rules.mk +++ b/keyboards/cannonkeys/ortho48/rules.mk @@ -26,3 +26,7 @@ BACKLIGHT_DRIVER = custom RGBLIGHT_ENABLE = yes LAYOUTS = ortho_4x12 + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/cannonkeys/ortho60/chconf.h b/keyboards/cannonkeys/ortho60/chconf.h index bbd9b2da62d26046bcb02f35d79f0773ffe91477..9299be587ec67c7fe70c186c5bfb92ff6d04b7f7 100644 --- a/keyboards/cannonkeys/ortho60/chconf.h +++ b/keyboards/cannonkeys/ortho60/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/cannonkeys/ortho60/rules.mk b/keyboards/cannonkeys/ortho60/rules.mk index 1d3f1afa9c114685e53af24327b365c565d1cdc0..2077eea66ff962e8caf8549a8558dfe4092e5fd8 100644 --- a/keyboards/cannonkeys/ortho60/rules.mk +++ b/keyboards/cannonkeys/ortho60/rules.mk @@ -26,3 +26,7 @@ BACKLIGHT_DRIVER = custom RGBLIGHT_ENABLE = yes LAYOUTS = ortho_5x12 + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/cannonkeys/ortho75/chconf.h b/keyboards/cannonkeys/ortho75/chconf.h index bbd9b2da62d26046bcb02f35d79f0773ffe91477..9299be587ec67c7fe70c186c5bfb92ff6d04b7f7 100644 --- a/keyboards/cannonkeys/ortho75/chconf.h +++ b/keyboards/cannonkeys/ortho75/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/cannonkeys/ortho75/rules.mk b/keyboards/cannonkeys/ortho75/rules.mk index 538ab6aec5457837ce1e9c3e3ebcfd03f61e2bb1..3be309924cfb81f4d0622528e10eae87d4af203b 100644 --- a/keyboards/cannonkeys/ortho75/rules.mk +++ b/keyboards/cannonkeys/ortho75/rules.mk @@ -27,3 +27,7 @@ RGBLIGHT_ENABLE = yes ENCODER_ENABLE = yes LAYOUTS = ortho_5x15 + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/cannonkeys/practice60/chconf.h b/keyboards/cannonkeys/practice60/chconf.h index bbd9b2da62d26046bcb02f35d79f0773ffe91477..9299be587ec67c7fe70c186c5bfb92ff6d04b7f7 100644 --- a/keyboards/cannonkeys/practice60/chconf.h +++ b/keyboards/cannonkeys/practice60/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/cannonkeys/practice60/rules.mk b/keyboards/cannonkeys/practice60/rules.mk index a1c34a3adef7fbaa89de71850ae8d1fa16f81825..be1584d7295b26be72ee4c863aa95895ae068e4b 100644 --- a/keyboards/cannonkeys/practice60/rules.mk +++ b/keyboards/cannonkeys/practice60/rules.mk @@ -28,3 +28,7 @@ RGBLIGHT_ENABLE = yes LAYOUTS = 60_ansi DEFAULT_FOLDER = cannonkeys/practice60 + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/cannonkeys/practice65/chconf.h b/keyboards/cannonkeys/practice65/chconf.h index bbd9b2da62d26046bcb02f35d79f0773ffe91477..9299be587ec67c7fe70c186c5bfb92ff6d04b7f7 100644 --- a/keyboards/cannonkeys/practice65/chconf.h +++ b/keyboards/cannonkeys/practice65/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/cannonkeys/practice65/rules.mk b/keyboards/cannonkeys/practice65/rules.mk index 1e8d56bca533ef2f1483bb793ed6dce9da31ccbf..d4a396120aef95ecaad66002b385c05d36b273c2 100644 --- a/keyboards/cannonkeys/practice65/rules.mk +++ b/keyboards/cannonkeys/practice65/rules.mk @@ -24,3 +24,7 @@ NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = yes BACKLIGHT_DRIVER = custom RGBLIGHT_ENABLE = yes + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/cannonkeys/satisfaction75/chconf.h b/keyboards/cannonkeys/satisfaction75/chconf.h index 99fa8ce39822e2dd9f8d10aab4a7af81cd3fa3ee..89388dd5a3d1a3ab456c78d95cd3a9f38dd08500 100644 --- a/keyboards/cannonkeys/satisfaction75/chconf.h +++ b/keyboards/cannonkeys/satisfaction75/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/cannonkeys/satisfaction75/rules.mk b/keyboards/cannonkeys/satisfaction75/rules.mk index 7e0b15b92b58c76758adeea2f2b92758c23b17cf..5fd8018194032970d0c79c53a241e6bcaa94f33d 100644 --- a/keyboards/cannonkeys/satisfaction75/rules.mk +++ b/keyboards/cannonkeys/satisfaction75/rules.mk @@ -22,3 +22,7 @@ QWIIC_ENABLE += MICRO_OLED #BACKLIGHT_ENABLE = yes DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1 + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/cannonkeys/savage65/chconf.h b/keyboards/cannonkeys/savage65/chconf.h index 99fa8ce39822e2dd9f8d10aab4a7af81cd3fa3ee..89388dd5a3d1a3ab456c78d95cd3a9f38dd08500 100644 --- a/keyboards/cannonkeys/savage65/chconf.h +++ b/keyboards/cannonkeys/savage65/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/cannonkeys/savage65/rules.mk b/keyboards/cannonkeys/savage65/rules.mk index 199dd10780c824d3c3cedbb67b8a662f673cc4e2..1c1c4c2ec4176b0daa1474887e65351f3ccb9150 100644 --- a/keyboards/cannonkeys/savage65/rules.mk +++ b/keyboards/cannonkeys/savage65/rules.mk @@ -21,3 +21,6 @@ CUSTOM_MATRIX = no # Custom matrix file # BACKLIGHT_ENABLE = yes # This is broken on 072 for some reason RGBLIGHT_ENABLE = yes + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/cannonkeys/tmov2/chconf.h b/keyboards/cannonkeys/tmov2/chconf.h index 99fa8ce39822e2dd9f8d10aab4a7af81cd3fa3ee..89388dd5a3d1a3ab456c78d95cd3a9f38dd08500 100644 --- a/keyboards/cannonkeys/tmov2/chconf.h +++ b/keyboards/cannonkeys/tmov2/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/cannonkeys/tmov2/rules.mk b/keyboards/cannonkeys/tmov2/rules.mk index e6f0ce30a13b3c6607627453a085156d54df547e..646288504cee3e157ab9e5914b1cf5a05aa79ab1 100644 --- a/keyboards/cannonkeys/tmov2/rules.mk +++ b/keyboards/cannonkeys/tmov2/rules.mk @@ -21,3 +21,6 @@ CUSTOM_MATRIX = no # Custom matrix file # BACKLIGHT_ENABLE = yes # This is broken on 072 right now RGBLIGHT_ENABLE = yes + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/converter/siemens_tastatur/chconf.h b/keyboards/converter/siemens_tastatur/chconf.h index bbd9b2da62d26046bcb02f35d79f0773ffe91477..9299be587ec67c7fe70c186c5bfb92ff6d04b7f7 100644 --- a/keyboards/converter/siemens_tastatur/chconf.h +++ b/keyboards/converter/siemens_tastatur/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/converter/siemens_tastatur/rules.mk b/keyboards/converter/siemens_tastatur/rules.mk index bc0ed5316592207bab0090bbf4336fddcd5f4e31..bc5875962bb53964e3eb2cbd691924b0a2bd9931 100644 --- a/keyboards/converter/siemens_tastatur/rules.mk +++ b/keyboards/converter/siemens_tastatur/rules.mk @@ -22,3 +22,6 @@ BACKLIGHT_ENABLE = no RGBLIGHT_ENABLE = no CUSTOM_MATRIX = yes + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/ergodox_stm32/chconf.h b/keyboards/ergodox_stm32/chconf.h index d9114ec858bc64011903be91318060531d7ba431..513ae821db07ff29fcf039e924cd0cc33addf5b2 100644 --- a/keyboards/ergodox_stm32/chconf.h +++ b/keyboards/ergodox_stm32/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk index 1bf1a742ab859e3d476159adca8f48a7f44e0304..ab7b853f5d459296c40aef51b54b5b1117c49344 100644 --- a/keyboards/ergodox_stm32/rules.mk +++ b/keyboards/ergodox_stm32/rules.mk @@ -30,3 +30,7 @@ NKRO_ENABLE = yes # USB Nkey Rollover CUSTOM_MATRIX = yes # Custom matrix file NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work UNICODE_ENABLE = yes # Unicode + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/handwired/bluepill/bluepill70/chconf.h b/keyboards/handwired/bluepill/bluepill70/chconf.h index dfb1f9dfb9e65e2e5d79ec13a9c5c1db3aca79a7..fdbc4aed0454593fee23e1efe5b31ed3f1307b9b 100644 --- a/keyboards/handwired/bluepill/bluepill70/chconf.h +++ b/keyboards/handwired/bluepill/bluepill70/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/handwired/bluepill/bluepill70/rules.mk b/keyboards/handwired/bluepill/bluepill70/rules.mk index e89abca8ca80a69e8d2bcb29e47637e27edb9928..5cf5f3f6ca6d52d6afc4adbf860c5c639fe63c98 100644 --- a/keyboards/handwired/bluepill/bluepill70/rules.mk +++ b/keyboards/handwired/bluepill/bluepill70/rules.mk @@ -44,4 +44,8 @@ ARMV = 7 # http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf # This also requires a patch to chibios: # /tmk_core/tool/chibios/ch-bootloader-jump.patch -#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800 \ No newline at end of file +#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800 + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/handwired/ck4x4/chconf.h b/keyboards/handwired/ck4x4/chconf.h index 99fa8ce39822e2dd9f8d10aab4a7af81cd3fa3ee..89388dd5a3d1a3ab456c78d95cd3a9f38dd08500 100644 --- a/keyboards/handwired/ck4x4/chconf.h +++ b/keyboards/handwired/ck4x4/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/handwired/ck4x4/rules.mk b/keyboards/handwired/ck4x4/rules.mk index cd4bc260f3fe632ca8f1acfaa91fc3a24f16c9fb..0709f341bf700fca008c808296837b78adae5786 100644 --- a/keyboards/handwired/ck4x4/rules.mk +++ b/keyboards/handwired/ck4x4/rules.mk @@ -15,3 +15,7 @@ NKRO_ENABLE = yes # USB Nkey Rollover CUSTOM_MATRIX = no # Custom matrix file DEFAULT_FOLDER = handwired/ck4x4 + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/handwired/onekey/bluepill/chconf.h b/keyboards/handwired/onekey/bluepill/chconf.h index bbd9b2da62d26046bcb02f35d79f0773ffe91477..9299be587ec67c7fe70c186c5bfb92ff6d04b7f7 100644 --- a/keyboards/handwired/onekey/bluepill/chconf.h +++ b/keyboards/handwired/onekey/bluepill/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/handwired/onekey/bluepill/rules.mk b/keyboards/handwired/onekey/bluepill/rules.mk index 063f21f7fd68e678cc1e22eea7ff402dce59c95b..83a81a56b1856cb6a8a26b9debe214abe8a8c8e7 100644 --- a/keyboards/handwired/onekey/bluepill/rules.mk +++ b/keyboards/handwired/onekey/bluepill/rules.mk @@ -8,3 +8,7 @@ BOARD = STM32_F103_STM32DUINO DFU_ARGS = -d 1eaf:0003 -a2 -R DFU_SUFFIX_ARGS = -v 1eaf -p 0003 + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/handwired/onekey/stm32f0_disco/chconf.h b/keyboards/handwired/onekey/stm32f0_disco/chconf.h index 99fa8ce39822e2dd9f8d10aab4a7af81cd3fa3ee..89388dd5a3d1a3ab456c78d95cd3a9f38dd08500 100644 --- a/keyboards/handwired/onekey/stm32f0_disco/chconf.h +++ b/keyboards/handwired/onekey/stm32f0_disco/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/handwired/onekey/stm32f0_disco/rules.mk b/keyboards/handwired/onekey/stm32f0_disco/rules.mk index fe5e3f824f315f9cb87f2533ed5f46c1cf519edf..d8928e9ec869e9499dfbc93fee974c7ec202ac84 100644 --- a/keyboards/handwired/onekey/stm32f0_disco/rules.mk +++ b/keyboards/handwired/onekey/stm32f0_disco/rules.mk @@ -1,2 +1,6 @@ # MCU name MCU = STM32F072 + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/handwired/onekey/teensy_32/chconf.h b/keyboards/handwired/onekey/teensy_32/chconf.h index 3294ac7eeef438ce9137aed5c71f212b6610350f..1919fcb97cf683406c31bc55c0861feb284a8907 100644 --- a/keyboards/handwired/onekey/teensy_32/chconf.h +++ b/keyboards/handwired/onekey/teensy_32/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/handwired/onekey/teensy_32/rules.mk b/keyboards/handwired/onekey/teensy_32/rules.mk index 97171611efaa7d89598f5eba19b19ec5b10a7e32..2c411c0eb6e4f77d4dcc65d45970985e144dafe1 100644 --- a/keyboards/handwired/onekey/teensy_32/rules.mk +++ b/keyboards/handwired/onekey/teensy_32/rules.mk @@ -39,3 +39,7 @@ MCU = cortex-m4 # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 # I.e. 6 for Teensy LC; 7 for Teensy 3.x ARMV = 7 + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/handwired/onekey/teensy_lc/chconf.h b/keyboards/handwired/onekey/teensy_lc/chconf.h index 3294ac7eeef438ce9137aed5c71f212b6610350f..1919fcb97cf683406c31bc55c0861feb284a8907 100644 --- a/keyboards/handwired/onekey/teensy_lc/chconf.h +++ b/keyboards/handwired/onekey/teensy_lc/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/handwired/onekey/teensy_lc/rules.mk b/keyboards/handwired/onekey/teensy_lc/rules.mk index 7859f6d741ade60a119599be06ee1053d840beb6..32ab07d9c1f24df9d39688c8efa3af2c5f951eb7 100644 --- a/keyboards/handwired/onekey/teensy_lc/rules.mk +++ b/keyboards/handwired/onekey/teensy_lc/rules.mk @@ -39,3 +39,7 @@ MCU = cortex-m0plus # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 # I.e. 6 for Teensy LC; 7 for Teensy 3.x ARMV = 6 + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/infinity60/chconf.h b/keyboards/infinity60/chconf.h index d9114ec858bc64011903be91318060531d7ba431..513ae821db07ff29fcf039e924cd0cc33addf5b2 100644 --- a/keyboards/infinity60/chconf.h +++ b/keyboards/infinity60/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/infinity60/rules.mk b/keyboards/infinity60/rules.mk index 6fb43dc7526b8bf1ea1a08706d49b5adbc523985..f93766af97c791548f6fff4810f82ec9873809dc 100644 --- a/keyboards/infinity60/rules.mk +++ b/keyboards/infinity60/rules.mk @@ -73,3 +73,7 @@ NKRO_ENABLE = yes # USB Nkey Rollover CUSTOM_MATRIX = yes # Custom matrix file LAYOUTS = 60_ansi_split_bs_rshift + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/jm60/chconf.h b/keyboards/jm60/chconf.h index d9114ec858bc64011903be91318060531d7ba431..513ae821db07ff29fcf039e924cd0cc33addf5b2 100644 --- a/keyboards/jm60/chconf.h +++ b/keyboards/jm60/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/jm60/rules.mk b/keyboards/jm60/rules.mk index d11c38ecfdce2cde8f07cb9055e169957d67adc8..ed6431b6538ff7a3f421af5809f19bdcee24a97a 100644 --- a/keyboards/jm60/rules.mk +++ b/keyboards/jm60/rules.mk @@ -34,7 +34,7 @@ ARMV = 7 # 0x00000000-0x00001000 area is occupied by bootlaoder.*/ # The CORTEX_VTOR... is needed only for MCHCK/Infinity KB #OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000 -OPT_DEFS = +OPT_DEFS = # Build Options # comment out to disable the options. @@ -52,5 +52,9 @@ BACKLIGHT_ENABLE = no VISUALIZER_ENABLE = no #LED_DRIVER = is31fl3731c -#LED_WIDTH = 16 +#LED_WIDTH = 16 #LED_HEIGHT = 5 + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/k_type/chconf.h b/keyboards/k_type/chconf.h index d9114ec858bc64011903be91318060531d7ba431..513ae821db07ff29fcf039e924cd0cc33addf5b2 100644 --- a/keyboards/k_type/chconf.h +++ b/keyboards/k_type/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/k_type/rules.mk b/keyboards/k_type/rules.mk index 43579fcc71bb6276ea3da6dea6c577b29a764fce..e53f316b99a78efdd2870c51e6981b3b88eb7855 100644 --- a/keyboards/k_type/rules.mk +++ b/keyboards/k_type/rules.mk @@ -74,3 +74,7 @@ SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover CUSTOM_MATRIX = yes # Custom matrix file DEBUG_ENABLE = yes + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/peiorisboards/ixora/chconf.h b/keyboards/peiorisboards/ixora/chconf.h index b836a3b99cdd7af91713575852eb116ff58c96fb..e811705ba3d150194f2260e5eafee109bf6efb0f 100644 --- a/keyboards/peiorisboards/ixora/chconf.h +++ b/keyboards/peiorisboards/ixora/chconf.h @@ -102,10 +102,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ @@ -518,4 +514,4 @@ #endif /* CHCONF_H */ -/** @} */ \ No newline at end of file +/** @} */ diff --git a/keyboards/peiorisboards/ixora/rules.mk b/keyboards/peiorisboards/ixora/rules.mk index 0cea106d0581f26ea0613450717b265858b83b2a..1d93c6a3034674ceb4411ad8adbe265e9bec3c7d 100644 --- a/keyboards/peiorisboards/ixora/rules.mk +++ b/keyboards/peiorisboards/ixora/rules.mk @@ -12,3 +12,7 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # USB Nkey Rollover NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/projectkb/alice/chconf.h b/keyboards/projectkb/alice/chconf.h index 99fa8ce39822e2dd9f8d10aab4a7af81cd3fa3ee..89388dd5a3d1a3ab456c78d95cd3a9f38dd08500 100644 --- a/keyboards/projectkb/alice/chconf.h +++ b/keyboards/projectkb/alice/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/projectkb/alice/rules.mk b/keyboards/projectkb/alice/rules.mk index 96904aef3d9bd50f7134d6a146718e79d9e291d6..97fcc754da1be4c70154935b91527c95c5e48e8a 100644 --- a/keyboards/projectkb/alice/rules.mk +++ b/keyboards/projectkb/alice/rules.mk @@ -23,3 +23,7 @@ RGBLIGHT_ENABLE = yes # RAW_ENABLE = yes # DYNAMIC_KEYMAP_ENABLE = yes + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/vinta/chconf.h b/keyboards/vinta/chconf.h index b836a3b99cdd7af91713575852eb116ff58c96fb..e811705ba3d150194f2260e5eafee109bf6efb0f 100644 --- a/keyboards/vinta/chconf.h +++ b/keyboards/vinta/chconf.h @@ -102,10 +102,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ @@ -518,4 +514,4 @@ #endif /* CHCONF_H */ -/** @} */ \ No newline at end of file +/** @} */ diff --git a/keyboards/vinta/rules.mk b/keyboards/vinta/rules.mk index 6d9fc0da1d60308acc4d3b98c5028af0a70cf894..7365096890a996fd2c4055004060eb6002cd5bb2 100644 --- a/keyboards/vinta/rules.mk +++ b/keyboards/vinta/rules.mk @@ -13,4 +13,8 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # USB Nkey Rollover NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in -LAYOUTS = 65_ansi_blocker \ No newline at end of file +LAYOUTS = 65_ansi_blocker + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/whitefox/chconf.h b/keyboards/whitefox/chconf.h index d9114ec858bc64011903be91318060531d7ba431..513ae821db07ff29fcf039e924cd0cc33addf5b2 100644 --- a/keyboards/whitefox/chconf.h +++ b/keyboards/whitefox/chconf.h @@ -105,10 +105,6 @@ */ #define CH_CFG_NO_IDLE_THREAD FALSE -/* Use __WFI in the idle thread for waiting. Does lower the power - * consumption. */ -#define CORTEX_ENABLE_WFI_IDLE TRUE - /** @} */ /*===========================================================================*/ diff --git a/keyboards/whitefox/rules.mk b/keyboards/whitefox/rules.mk index 7b33285004d681a8eeb47cf20a81dc84b22849e1..27c3c31416bf34917246f59d0b63c55031eb7b67 100644 --- a/keyboards/whitefox/rules.mk +++ b/keyboards/whitefox/rules.mk @@ -78,3 +78,7 @@ VISUALIZER_ENABLE = yes LED_DRIVER = is31fl3731c LED_WIDTH = 16 LED_HEIGHT = 5 + + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE