diff options
Diffstat (limited to 'keyboards/planck')
32 files changed, 119 insertions, 161 deletions
diff --git a/keyboards/planck/ez/base/info.json b/keyboards/planck/ez/base/keyboard.json index 07167a8c2a..07167a8c2a 100644 --- a/keyboards/planck/ez/base/info.json +++ b/keyboards/planck/ez/base/keyboard.json diff --git a/keyboards/planck/ez/base/rules.mk b/keyboards/planck/ez/base/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/planck/ez/base/rules.mk +++ /dev/null diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h index 74d8d21155..e4fa0924d3 100644 --- a/keyboards/planck/ez/config.h +++ b/keyboards/planck/ez/config.h @@ -46,8 +46,8 @@ // #define WS2812_TIM_CH 2 // #define PORT_WS2812 GPIOA // #define PIN_WS2812 1 -// #define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection) -//#define WS2812_DMA_CHANNEL 7 // DMA channel for TIMx_UP +// #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection) +//#define WS2812_PWM_DMA_CHANNEL 7 // DMA channel for TIMx_UP //#define WS2812_EXTERNAL_PULLUP #define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND diff --git a/keyboards/planck/ez/glow/info.json b/keyboards/planck/ez/glow/keyboard.json index 4852258570..6c957b165b 100644 --- a/keyboards/planck/ez/glow/info.json +++ b/keyboards/planck/ez/glow/keyboard.json @@ -2,5 +2,8 @@ "keyboard_name": "Planck EZ Glow", "usb": { "pid": "0xC6CF" + }, + "features": { + "rgb_matrix": true } } diff --git a/keyboards/planck/ez/glow/rules.mk b/keyboards/planck/ez/glow/rules.mk deleted file mode 100644 index aad92997d0..0000000000 --- a/keyboards/planck/ez/glow/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json index 044e187c4b..f7b2a8f8a1 100644 --- a/keyboards/planck/ez/info.json +++ b/keyboards/planck/ez/info.json @@ -4,7 +4,20 @@ "maintainer": "jackhumbert", "usb": { "vid": "0x3297", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "mouse": false + } + }, + "features": { + "audio": true, + "bootmagic": true, + "command": true, + "console": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true }, "rgb_matrix": { "animations": { @@ -62,6 +75,9 @@ "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"] }, "diode_direction": "COL2ROW", + "audio": { + "driver": "dac_additive" + }, "encoder": { "rotary": [ {"pin_a": "B12", "pin_b": "B13"} diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk index 9d3db5cdb7..ef20f95b65 100644 --- a/keyboards/planck/ez/rules.mk +++ b/keyboards/planck/ez/rules.mk @@ -1,23 +1,4 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = yes # Audio output -AUDIO_DRIVER = dac_additive -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -ENCODER_ENABLE = yes - -RGB_MATRIX_SUPPORTED = yes RGBLIGHT_SUPPORTED = no BAKCLIGHT_SUPPORTED = no -MOUSE_SHARED_EP = no - DEFAULT_FOLDER = planck/ez/base diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/keyboard.json index 8fc112664b..33801562e5 100644 --- a/keyboards/planck/light/info.json +++ b/keyboards/planck/light/keyboard.json @@ -56,6 +56,17 @@ }, "driver": "is31fl3731" }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "midi": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, "matrix_pins": { "cols": ["E6", "E3", "E4", "D3", "D4", "D5", "C0", "A7", "A6", "E1", "E0", "D7"], "rows": ["B0", "E7", "F0", "F1"] diff --git a/keyboards/planck/light/rules.mk b/keyboards/planck/light/rules.mk deleted file mode 100644 index a8efaf98f4..0000000000 --- a/keyboards/planck/light/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = yes # MIDI support -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -RGB_MATRIX_ENABLE = yes diff --git a/keyboards/planck/rev1/info.json b/keyboards/planck/rev1/keyboard.json index 72646ac6bf..f737781a1c 100644 --- a/keyboards/planck/rev1/info.json +++ b/keyboards/planck/rev1/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xAE01", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D0", "D5", "B5", "B6"] diff --git a/keyboards/planck/rev1/rules.mk b/keyboards/planck/rev1/rules.mk deleted file mode 100644 index 99b8691962..0000000000 --- a/keyboards/planck/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/planck/rev2/info.json b/keyboards/planck/rev2/keyboard.json index 2bbc5760c2..d10982f357 100644 --- a/keyboards/planck/rev2/info.json +++ b/keyboards/planck/rev2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xAE01", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D0", "D5", "B5", "B6"] diff --git a/keyboards/planck/rev2/rules.mk b/keyboards/planck/rev2/rules.mk deleted file mode 100644 index 99b8691962..0000000000 --- a/keyboards/planck/rev2/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/planck/rev3/info.json b/keyboards/planck/rev3/keyboard.json index 17f07d58f3..16d2b59a2e 100644 --- a/keyboards/planck/rev3/info.json +++ b/keyboards/planck/rev3/keyboard.json @@ -8,6 +8,14 @@ "pid": "0xAE01", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D0", "D5", "B5", "B6"] diff --git a/keyboards/planck/rev3/rules.mk b/keyboards/planck/rev3/rules.mk deleted file mode 100644 index 99b8691962..0000000000 --- a/keyboards/planck/rev3/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/planck/rev4/info.json b/keyboards/planck/rev4/keyboard.json index 5eaf58e14c..725a297b2f 100644 --- a/keyboards/planck/rev4/info.json +++ b/keyboards/planck/rev4/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xAE01", "device_version": "0.0.4" }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D0", "D5", "B5", "B6"] diff --git a/keyboards/planck/rev4/rules.mk b/keyboards/planck/rev4/rules.mk deleted file mode 100644 index 73d6182ff4..0000000000 --- a/keyboards/planck/rev4/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/keyboard.json index f9265e1409..f816d23e9b 100644 --- a/keyboards/planck/rev5/info.json +++ b/keyboards/planck/rev5/keyboard.json @@ -8,6 +8,15 @@ "pid": "0xAE01", "device_version": "0.0.5" }, + "features": { + "audio": true, + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": false, + "nkro": true + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D0", "D5", "B5", "B6"] diff --git a/keyboards/planck/rev5/rules.mk b/keyboards/planck/rev5/rules.mk deleted file mode 100644 index 73d6182ff4..0000000000 --- a/keyboards/planck/rev5/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h index 7fec8be56b..0935fad358 100644 --- a/keyboards/planck/rev6/config.h +++ b/keyboards/planck/rev6/config.h @@ -46,5 +46,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/keyboard.json index add17963b4..b0028795fe 100644 --- a/keyboards/planck/rev6/info.json +++ b/keyboards/planck/rev6/keyboard.json @@ -19,6 +19,18 @@ "driver": "ws2812", "sleep": true }, + "features": { + "audio": true, + "bootmagic": true, + "command": true, + "console": true, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "A7", "B0"], "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2"] diff --git a/keyboards/planck/rev6/rules.mk b/keyboards/planck/rev6/rules.mk deleted file mode 100644 index ce96f94079..0000000000 --- a/keyboards/planck/rev6/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. - -RGB_MATRIX_ENABLE = no -ENCODER_ENABLE = yes -DIP_SWITCH_ENABLE = yes diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h index 7fec8be56b..0935fad358 100644 --- a/keyboards/planck/rev6_drop/config.h +++ b/keyboards/planck/rev6_drop/config.h @@ -46,5 +46,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/keyboard.json index aff2eef5d7..ff301f8c86 100644 --- a/keyboards/planck/rev6_drop/info.json +++ b/keyboards/planck/rev6_drop/keyboard.json @@ -8,6 +8,18 @@ "pid": "0xA4F9", "device_version": "0.0.6" }, + "features": { + "audio": true, + "bootmagic": true, + "command": true, + "console": true, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "led_count": 9 }, diff --git a/keyboards/planck/rev6_drop/matrix.c b/keyboards/planck/rev6_drop/matrix.c index e31e473ae2..d140356738 100644 --- a/keyboards/planck/rev6_drop/matrix.c +++ b/keyboards/planck/rev6_drop/matrix.c @@ -15,7 +15,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "quantum.h" +#include "matrix.h" +#include "wait.h" /* matrix state(1:on, 0:off) */ static pin_t matrix_row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; diff --git a/keyboards/planck/rev6_drop/rules.mk b/keyboards/planck/rev6_drop/rules.mk index 022a5ccd53..30ce5d293b 100644 --- a/keyboards/planck/rev6_drop/rules.mk +++ b/keyboards/planck/rev6_drop/rules.mk @@ -1,19 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output CUSTOM_MATRIX = lite -# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE -RGB_MATRIX_ENABLE = no -ENCODER_ENABLE = yes -DIP_SWITCH_ENABLE = yes - SRC += matrix.c diff --git a/keyboards/planck/rev7/config.h b/keyboards/planck/rev7/config.h index a5e49c8a53..9ccbf4cc8a 100644 --- a/keyboards/planck/rev7/config.h +++ b/keyboards/planck/rev7/config.h @@ -27,8 +27,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 /* * Feature disable options diff --git a/keyboards/planck/rev7/info.json b/keyboards/planck/rev7/keyboard.json index d674af98d1..691394d5d5 100644 --- a/keyboards/planck/rev7/info.json +++ b/keyboards/planck/rev7/keyboard.json @@ -42,6 +42,7 @@ "command": true, "console": true, "encoder": true, + "dip_switch": true, "extrakey": true, "mousekey": true, "nkro": true, diff --git a/keyboards/planck/rev7/matrix.c b/keyboards/planck/rev7/matrix.c index 350ce93ce0..8cadfa5e8d 100644 --- a/keyboards/planck/rev7/matrix.c +++ b/keyboards/planck/rev7/matrix.c @@ -15,11 +15,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gpio.h" -#include "hal_pal.h" -#include "hal_pal_lld.h" -#include "quantum.h" +#include "matrix.h" +#include <hal_pal.h> #include <math.h> +#include "wait.h" // STM32-specific watchdog config calculations // timeout = 31.25us * PR * (RL + 1) diff --git a/keyboards/planck/rev7/rules.mk b/keyboards/planck/rev7/rules.mk index 04b21019ae..30ce5d293b 100644 --- a/keyboards/planck/rev7/rules.mk +++ b/keyboards/planck/rev7/rules.mk @@ -1,7 +1,2 @@ -# Build Options -# change yes to no to disable -# CUSTOM_MATRIX = lite -DIP_SWITCH_ENABLE = yes - SRC += matrix.c diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/keyboard.json index 24b8d5f0a5..b2c07ca0f0 100644 --- a/keyboards/planck/thk/info.json +++ b/keyboards/planck/thk/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x25A7", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, "matrix_pins": { "cols": ["D7", "C2", "C3", "C4", "C5", "C6", "C7", "A3", "A2", "A1", "A0", "B0"], "rows": ["A7", "A6", "A5", "A4"] diff --git a/keyboards/planck/thk/rules.mk b/keyboards/planck/thk/rules.mk index 417fb95129..c2ee0bc86f 100644 --- a/keyboards/planck/thk/rules.mk +++ b/keyboards/planck/thk/rules.mk @@ -1,17 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -DIP_SWITCH_ENABLE = yes |