From 8975dc6c3b35bc49a8b3d64f9e3dd17d82b52371 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 12 Sep 2023 10:09:31 +0100 Subject: Remove duplication of STM32L432 EEPROM defaults (#21981) --- keyboards/keychron/q0/rev_0130/rules.mk | 4 +--- keyboards/keychron/q0/rev_0131/rules.mk | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/keychron/q0') diff --git a/keyboards/keychron/q0/rev_0130/rules.mk b/keyboards/keychron/q0/rev_0130/rules.mk index f6868e88e3..6e7633bfe0 100644 --- a/keyboards/keychron/q0/rev_0130/rules.mk +++ b/keyboards/keychron/q0/rev_0130/rules.mk @@ -1,3 +1 @@ -EEPROM_DRIVER = wear_leveling -WEAR_LEVELING_DRIVER = embedded_flash - +# This file intentionally left blank diff --git a/keyboards/keychron/q0/rev_0131/rules.mk b/keyboards/keychron/q0/rev_0131/rules.mk index f6868e88e3..6e7633bfe0 100644 --- a/keyboards/keychron/q0/rev_0131/rules.mk +++ b/keyboards/keychron/q0/rev_0131/rules.mk @@ -1,3 +1 @@ -EEPROM_DRIVER = wear_leveling -WEAR_LEVELING_DRIVER = embedded_flash - +# This file intentionally left blank -- cgit v1.2.3 From 35aceab1a48076a0c508c663781de30717518fcb Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 13 Sep 2023 22:47:01 +1000 Subject: ckled2001: driver naming cleanups (#21890) --- keyboards/keychron/q0/rev_0130/config.h | 2 +- keyboards/keychron/q0/rev_0131/config.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'keyboards/keychron/q0') diff --git a/keyboards/keychron/q0/rev_0130/config.h b/keyboards/keychron/q0/rev_0130/config.h index 12ecfe1356..ce4d510e10 100644 --- a/keyboards/keychron/q0/rev_0130/config.h +++ b/keyboards/keychron/q0/rev_0130/config.h @@ -17,7 +17,7 @@ #pragma once /* RGB Matrix Driver Configuration */ -#define DRIVER_COUNT 1 +#define CKLED2001_DRIVER_COUNT 1 #define DRIVER_ADDR_1 0b1110100 /* RGB Matrix Configuration */ diff --git a/keyboards/keychron/q0/rev_0131/config.h b/keyboards/keychron/q0/rev_0131/config.h index e4c5c2d3fc..214bfc3455 100644 --- a/keyboards/keychron/q0/rev_0131/config.h +++ b/keyboards/keychron/q0/rev_0131/config.h @@ -17,15 +17,14 @@ #pragma once /* RGB Matrix Driver Configuration */ -#define DRIVER_COUNT 1 +#define CKLED2001_DRIVER_COUNT 1 #define DRIVER_ADDR_1 0b1110111 /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 26 #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL -/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */ -#define PHASE_CHANNEL MSKPHASE_9CHANNEL +#define CKLED2001_PHASE_CHANNEL CKLED2001_MSKPHASE_9CHANNEL /* Enable num-lock LED */ #define NUM_LOCK_LED_INDEX 5 -- cgit v1.2.3 From 8f221052897754870e5c08a2de92c24d20cd307e Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 19 Sep 2023 19:31:54 +1000 Subject: Add and use I2C address defines for ISSI LED drivers (#22008) --- keyboards/keychron/q0/rev_0130/config.h | 2 +- keyboards/keychron/q0/rev_0131/config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/keychron/q0') diff --git a/keyboards/keychron/q0/rev_0130/config.h b/keyboards/keychron/q0/rev_0130/config.h index ce4d510e10..c6a241a1ce 100644 --- a/keyboards/keychron/q0/rev_0130/config.h +++ b/keyboards/keychron/q0/rev_0130/config.h @@ -18,7 +18,7 @@ /* RGB Matrix Driver Configuration */ #define CKLED2001_DRIVER_COUNT 1 -#define DRIVER_ADDR_1 0b1110100 +#define DRIVER_ADDR_1 CKLED2001_I2C_ADDRESS_GND /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 21 diff --git a/keyboards/keychron/q0/rev_0131/config.h b/keyboards/keychron/q0/rev_0131/config.h index 214bfc3455..f1d06a2842 100644 --- a/keyboards/keychron/q0/rev_0131/config.h +++ b/keyboards/keychron/q0/rev_0131/config.h @@ -18,7 +18,7 @@ /* RGB Matrix Driver Configuration */ #define CKLED2001_DRIVER_COUNT 1 -#define DRIVER_ADDR_1 0b1110111 +#define DRIVER_ADDR_1 CKLED2001_I2C_ADDRESS_VDDIO /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 26 -- cgit v1.2.3 From c0f16be50fec33cdb30386ac512efb900f3f7470 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 4 Oct 2023 20:10:05 +1100 Subject: Rename CKLED2001 driver to SNLED27351 (#22071) --- keyboards/keychron/q0/config.h | 2 +- keyboards/keychron/q0/rev_0130/config.h | 4 ++-- keyboards/keychron/q0/rev_0130/info.json | 2 +- keyboards/keychron/q0/rev_0130/rev_0130.c | 4 ++-- keyboards/keychron/q0/rev_0131/config.h | 6 +++--- keyboards/keychron/q0/rev_0131/info.json | 2 +- keyboards/keychron/q0/rev_0131/rev_0131.c | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) (limited to 'keyboards/keychron/q0') diff --git a/keyboards/keychron/q0/config.h b/keyboards/keychron/q0/config.h index c0366b1ed8..f4ec417043 100644 --- a/keyboards/keychron/q0/config.h +++ b/keyboards/keychron/q0/config.h @@ -16,7 +16,7 @@ #pragma once -#define CKLED2001_CURRENT_TUNE { 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70 } +#define SNLED27351_CURRENT_TUNE { 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70, 0xFF, 0xFF, 0x70 } /* turn off effects when suspended */ #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/keychron/q0/rev_0130/config.h b/keyboards/keychron/q0/rev_0130/config.h index c6a241a1ce..8b14e05a29 100644 --- a/keyboards/keychron/q0/rev_0130/config.h +++ b/keyboards/keychron/q0/rev_0130/config.h @@ -17,8 +17,8 @@ #pragma once /* RGB Matrix Driver Configuration */ -#define CKLED2001_DRIVER_COUNT 1 -#define DRIVER_ADDR_1 CKLED2001_I2C_ADDRESS_GND +#define SNLED27351_DRIVER_COUNT 1 +#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 21 diff --git a/keyboards/keychron/q0/rev_0130/info.json b/keyboards/keychron/q0/rev_0130/info.json index f6225c884a..6b5a29d7ea 100644 --- a/keyboards/keychron/q0/rev_0130/info.json +++ b/keyboards/keychron/q0/rev_0130/info.json @@ -29,7 +29,7 @@ "processor": "STM32L432", "bootloader": "stm32-dfu", "rgb_matrix": { - "driver": "ckled2001", + "driver": "snled27351", "animations": { "band_spiral_val": true, "breathing": true, diff --git a/keyboards/keychron/q0/rev_0130/rev_0130.c b/keyboards/keychron/q0/rev_0130/rev_0130.c index ffe82a6d8c..05803234c0 100644 --- a/keyboards/keychron/q0/rev_0130/rev_0130.c +++ b/keyboards/keychron/q0/rev_0130/rev_0130.c @@ -20,8 +20,8 @@ // clang-format off -const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { -/* Refer to CKLED manual for these locations +const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to SNLED27351 manual for these locations * driver * | R location * | | G location diff --git a/keyboards/keychron/q0/rev_0131/config.h b/keyboards/keychron/q0/rev_0131/config.h index f1d06a2842..f3187704a7 100644 --- a/keyboards/keychron/q0/rev_0131/config.h +++ b/keyboards/keychron/q0/rev_0131/config.h @@ -17,14 +17,14 @@ #pragma once /* RGB Matrix Driver Configuration */ -#define CKLED2001_DRIVER_COUNT 1 -#define DRIVER_ADDR_1 CKLED2001_I2C_ADDRESS_VDDIO +#define SNLED27351_DRIVER_COUNT 1 +#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO /* RGB Matrix Configuration */ #define DRIVER_1_LED_TOTAL 26 #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL -#define CKLED2001_PHASE_CHANNEL CKLED2001_MSKPHASE_9CHANNEL +#define SNLED27351_PHASE_CHANNEL SNLED27351_MSKPHASE_9CHANNEL /* Enable num-lock LED */ #define NUM_LOCK_LED_INDEX 5 diff --git a/keyboards/keychron/q0/rev_0131/info.json b/keyboards/keychron/q0/rev_0131/info.json index c569e498f4..24d2a0488a 100644 --- a/keyboards/keychron/q0/rev_0131/info.json +++ b/keyboards/keychron/q0/rev_0131/info.json @@ -38,7 +38,7 @@ "processor": "STM32L432", "bootloader": "stm32-dfu", "rgb_matrix": { - "driver": "ckled2001", + "driver": "snled27351", "animations": { "band_spiral_val": true, "breathing": true, diff --git a/keyboards/keychron/q0/rev_0131/rev_0131.c b/keyboards/keychron/q0/rev_0131/rev_0131.c index 282c511ce2..0466e1a584 100644 --- a/keyboards/keychron/q0/rev_0131/rev_0131.c +++ b/keyboards/keychron/q0/rev_0131/rev_0131.c @@ -20,8 +20,8 @@ // clang-format off -const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { -/* Refer to CKLED manual for these locations +const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to SNLED27351 manual for these locations * driver * | R location * | | G location -- cgit v1.2.3 From 5f33a251b32677cc2cbc71adf47b1e1969d15598 Mon Sep 17 00:00:00 2001 From: adophoxia <100170946+adophoxia@users.noreply.github.com> Date: Wed, 4 Oct 2023 21:59:06 -0700 Subject: Update Keychron Q0 (#22068) Co-authored-by: Ryan Co-authored-by: Duncan Sutherland --- keyboards/keychron/q0/base/base.c | 57 +++++++++ keyboards/keychron/q0/base/config.h | 27 ++++ keyboards/keychron/q0/base/info.json | 75 +++++++++++ .../keychron/q0/base/keymaps/default/keymap.c | 37 ++++++ .../keychron/q0/base/keymaps/keychron/keymap.c | 65 ++++++++++ .../keychron/q0/base/keymaps/keychron/rules.mk | 4 + keyboards/keychron/q0/base/keymaps/via/keymap.c | 53 ++++++++ keyboards/keychron/q0/base/keymaps/via/rules.mk | 1 + keyboards/keychron/q0/base/readme.md | 1 + keyboards/keychron/q0/base/rules.mk | 1 + keyboards/keychron/q0/config.h | 4 - keyboards/keychron/q0/info.json | 52 ++++++++ keyboards/keychron/q0/plus/config.h | 32 +++++ keyboards/keychron/q0/plus/info.json | 94 ++++++++++++++ .../keychron/q0/plus/keymaps/default/keymap.c | 49 ++++++++ .../keychron/q0/plus/keymaps/default/rules.mk | 1 + .../keychron/q0/plus/keymaps/keychron/keymap.c | 83 +++++++++++++ .../keychron/q0/plus/keymaps/keychron/rules.mk | 5 + keyboards/keychron/q0/plus/keymaps/via/keymap.c | 69 +++++++++++ keyboards/keychron/q0/plus/keymaps/via/rules.mk | 2 + keyboards/keychron/q0/plus/plus.c | 62 ++++++++++ keyboards/keychron/q0/plus/readme.md | 12 ++ keyboards/keychron/q0/plus/rules.mk | 1 + keyboards/keychron/q0/readme.md | 10 +- keyboards/keychron/q0/rev_0130/config.h | 28 ----- keyboards/keychron/q0/rev_0130/info.json | 118 ------------------ .../keychron/q0/rev_0130/keymaps/default/keymap.c | 37 ------ .../keychron/q0/rev_0130/keymaps/keychron/keymap.c | 65 ---------- .../keychron/q0/rev_0130/keymaps/keychron/rules.mk | 4 - .../keychron/q0/rev_0130/keymaps/via/keymap.c | 53 -------- .../keychron/q0/rev_0130/keymaps/via/rules.mk | 1 - keyboards/keychron/q0/rev_0130/readme.md | 1 - keyboards/keychron/q0/rev_0130/rev_0130.c | 57 --------- keyboards/keychron/q0/rev_0130/rules.mk | 1 - keyboards/keychron/q0/rev_0131/config.h | 33 ----- keyboards/keychron/q0/rev_0131/info.json | 137 --------------------- .../keychron/q0/rev_0131/keymaps/default/keymap.c | 49 -------- .../keychron/q0/rev_0131/keymaps/default/rules.mk | 1 - .../keychron/q0/rev_0131/keymaps/keychron/keymap.c | 83 ------------- .../keychron/q0/rev_0131/keymaps/keychron/rules.mk | 5 - .../keychron/q0/rev_0131/keymaps/via/keymap.c | 69 ----------- .../keychron/q0/rev_0131/keymaps/via/rules.mk | 2 - keyboards/keychron/q0/rev_0131/readme.md | 6 - keyboards/keychron/q0/rev_0131/rev_0131.c | 62 ---------- keyboards/keychron/q0/rev_0131/rules.mk | 1 - 45 files changed, 790 insertions(+), 820 deletions(-) create mode 100644 keyboards/keychron/q0/base/base.c create mode 100644 keyboards/keychron/q0/base/config.h create mode 100644 keyboards/keychron/q0/base/info.json create mode 100644 keyboards/keychron/q0/base/keymaps/default/keymap.c create mode 100644 keyboards/keychron/q0/base/keymaps/keychron/keymap.c create mode 100644 keyboards/keychron/q0/base/keymaps/keychron/rules.mk create mode 100644 keyboards/keychron/q0/base/keymaps/via/keymap.c create mode 100644 keyboards/keychron/q0/base/keymaps/via/rules.mk create mode 100644 keyboards/keychron/q0/base/readme.md create mode 100644 keyboards/keychron/q0/base/rules.mk create mode 100644 keyboards/keychron/q0/info.json create mode 100644 keyboards/keychron/q0/plus/config.h create mode 100644 keyboards/keychron/q0/plus/info.json create mode 100644 keyboards/keychron/q0/plus/keymaps/default/keymap.c create mode 100644 keyboards/keychron/q0/plus/keymaps/default/rules.mk create mode 100644 keyboards/keychron/q0/plus/keymaps/keychron/keymap.c create mode 100644 keyboards/keychron/q0/plus/keymaps/keychron/rules.mk create mode 100644 keyboards/keychron/q0/plus/keymaps/via/keymap.c create mode 100644 keyboards/keychron/q0/plus/keymaps/via/rules.mk create mode 100644 keyboards/keychron/q0/plus/plus.c create mode 100644 keyboards/keychron/q0/plus/readme.md create mode 100644 keyboards/keychron/q0/plus/rules.mk delete mode 100644 keyboards/keychron/q0/rev_0130/config.h delete mode 100644 keyboards/keychron/q0/rev_0130/info.json delete mode 100644 keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c delete mode 100644 keyboards/keychron/q0/rev_0130/keymaps/keychron/keymap.c delete mode 100644 keyboards/keychron/q0/rev_0130/keymaps/keychron/rules.mk delete mode 100644 keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c delete mode 100644 keyboards/keychron/q0/rev_0130/keymaps/via/rules.mk delete mode 100644 keyboards/keychron/q0/rev_0130/readme.md delete mode 100644 keyboards/keychron/q0/rev_0130/rev_0130.c delete mode 100644 keyboards/keychron/q0/rev_0130/rules.mk delete mode 100644 keyboards/keychron/q0/rev_0131/config.h delete mode 100644 keyboards/keychron/q0/rev_0131/info.json delete mode 100644 keyboards/keychron/q0/rev_0131/keymaps/default/keymap.c delete mode 100644 keyboards/keychron/q0/rev_0131/keymaps/default/rules.mk delete mode 100644 keyboards/keychron/q0/rev_0131/keymaps/keychron/keymap.c delete mode 100644 keyboards/keychron/q0/rev_0131/keymaps/keychron/rules.mk delete mode 100644 keyboards/keychron/q0/rev_0131/keymaps/via/keymap.c delete mode 100644 keyboards/keychron/q0/rev_0131/keymaps/via/rules.mk delete mode 100644 keyboards/keychron/q0/rev_0131/readme.md delete mode 100644 keyboards/keychron/q0/rev_0131/rev_0131.c delete mode 100644 keyboards/keychron/q0/rev_0131/rules.mk (limited to 'keyboards/keychron/q0') diff --git a/keyboards/keychron/q0/base/base.c b/keyboards/keychron/q0/base/base.c new file mode 100644 index 0000000000..05803234c0 --- /dev/null +++ b/keyboards/keychron/q0/base/base.c @@ -0,0 +1,57 @@ +/* Copyright 2022 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "quantum.h" + +#ifdef RGB_MATRIX_ENABLE + +// clang-format off + +const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to SNLED27351 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, F_5, D_5, E_5}, // 0 + {0, I_5, G_5, H_5}, // 1 + {0, L_5, J_5, K_5}, // 2 + {0, C_5, A_5, B_5}, // 3 + + {0, F_4, D_4, E_4}, // 4 + {0, I_4, G_4, H_4}, // 5 + {0, L_4, J_4, K_4}, // 6 + {0, C_4, A_4, B_4}, // 7 + + {0, F_6, D_6, E_6}, // 8 + {0, I_6, G_6, H_6}, // 9 + {0, L_6, J_6, K_6}, // 10 + + {0, F_3, D_3, E_3}, // 11 + {0, I_3, G_3, H_3}, // 12 + {0, L_3, J_3, K_3}, // 13 + {0, C_6, A_6, B_6}, // 14 + + {0, F_2, D_2, E_2}, // 15 + {0, I_2, G_2, H_2}, // 16 + {0, L_2, J_2, K_2}, // 17 + + {0, F_1, D_1, E_1}, // 18 + {0, L_1, J_1, K_1}, // 19 + {0, C_2, A_2, B_2}, // 20 +}; +#endif // RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q0/base/config.h b/keyboards/keychron/q0/base/config.h new file mode 100644 index 0000000000..566f808762 --- /dev/null +++ b/keyboards/keychron/q0/base/config.h @@ -0,0 +1,27 @@ +/* Copyright 2022 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +/* RGB Matrix Driver Configuration */ +#define SNLED27351_DRIVER_COUNT 1 +#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND + +/* RGB Matrix Configuration */ +#define RGB_MATRIX_LED_COUNT 21 + +/* Enable num-lock LED */ +#define NUM_LOCK_LED_INDEX 4 diff --git a/keyboards/keychron/q0/base/info.json b/keyboards/keychron/q0/base/info.json new file mode 100644 index 0000000000..ad89cf84da --- /dev/null +++ b/keyboards/keychron/q0/base/info.json @@ -0,0 +1,75 @@ +{ + "keyboard_name": "Q0", + "usb": { + "pid": "0x0130", + "device_version": "1.0.2" + }, + "matrix_pins": { + "cols": ["A5", "A6", "A7", "B0"], + "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] + }, + "rgb_matrix": { + "center_point": [56, 16], + "layout": [ + {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, + {"flags": 1, "matrix": [0, 1], "x": 37, "y": 0}, + {"flags": 1, "matrix": [0, 2], "x": 75, "y": 0}, + {"flags": 1, "matrix": [0, 3], "x": 112, "y": 0}, + + {"flags": 9, "matrix": [1, 0], "x": 0, "y": 6}, + {"flags": 4, "matrix": [1, 1], "x": 37, "y": 6}, + {"flags": 4, "matrix": [1, 2], "x": 75, "y": 6}, + {"flags": 4, "matrix": [1, 3], "x": 112, "y": 6}, + + {"flags": 4, "matrix": [2, 0], "x": 0, "y": 13}, + {"flags": 4, "matrix": [2, 1], "x": 37, "y": 13}, + {"flags": 4, "matrix": [2, 2], "x": 75, "y": 13}, + + {"flags": 4, "matrix": [3, 0], "x": 0, "y": 19}, + {"flags": 4, "matrix": [3, 1], "x": 37, "y": 19}, + {"flags": 4, "matrix": [3, 2], "x": 75, "y": 19}, + {"flags": 4, "matrix": [2, 3], "x": 112, "y": 16}, + + {"flags": 4, "matrix": [4, 0], "x": 0, "y": 25}, + {"flags": 4, "matrix": [4, 1], "x": 37, "y": 25}, + {"flags": 4, "matrix": [4, 2], "x": 75, "y": 25}, + + {"flags": 4, "matrix": [5, 0], "x": 18, "y": 32}, + {"flags": 4, "matrix": [5, 2], "x": 75, "y": 32}, + {"flags": 1, "matrix": [4, 3], "x": 112, "y": 29} + ] + }, + "community_layouts": ["numpad_6x4"], + "layouts": { + "LAYOUT_numpad_6x4": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 2, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [4, 3], "x": 3, "y": 4, "h": 2} + ] + } + } +} diff --git a/keyboards/keychron/q0/base/keymaps/default/keymap.c b/keyboards/keychron/q0/base/keymaps/default/keymap.c new file mode 100644 index 0000000000..387ff2d686 --- /dev/null +++ b/keyboards/keychron/q0/base/keymaps/default/keymap.c @@ -0,0 +1,37 @@ +/* Copyright 2022 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +enum layers { _BASE, _FN1}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_numpad_6x4( + MO(_FN1), KC_ESC, KC_BSPC, KC_TAB, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, + KC_P0, KC_PDOT, KC_PENT), + + [_FN1] = LAYOUT_numpad_6x4( + _______, KC_MUTE, KC_VOLD, KC_VOLU, + RGB_MOD, RGB_VAI, RGB_HUI, KC_DEL, + RGB_RMOD, RGB_VAD, RGB_HUD, + RGB_SAI, RGB_SPI, KC_MPRV, _______, + RGB_SAD, RGB_SPD, KC_MPLY, + RGB_TOG, KC_MNXT, _______) +}; diff --git a/keyboards/keychron/q0/base/keymaps/keychron/keymap.c b/keyboards/keychron/q0/base/keymaps/keychron/keymap.c new file mode 100644 index 0000000000..73826716fc --- /dev/null +++ b/keyboards/keychron/q0/base/keymaps/keychron/keymap.c @@ -0,0 +1,65 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H +#include "keychron_common.h" + +enum layers { _BASE, _FN1, _RESERVED1, _RESERVED2 }; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_numpad_6x4( + MO(_FN1), KC_ESC, KC_BSPC, KC_TAB, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, + KC_P0, KC_PDOT, KC_PENT), + + [_FN1] = LAYOUT_numpad_6x4( + _______, KC_MUTE, KC_VOLD, KC_VOLU, + RGB_MOD, RGB_VAI, RGB_HUI, KC_DEL, + RGB_RMOD, RGB_VAD, RGB_HUD, + RGB_SAI, RGB_SPI, KC_MPRV, _______, + RGB_SAD, RGB_SPD, KC_MPLY, + RGB_TOG, KC_MNXT, _______), + + [_RESERVED1] = LAYOUT_numpad_6x4( + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______), + + [_RESERVED2] = LAYOUT_numpad_6x4( + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______) +}; + +void housekeeping_task_user(void) { + housekeeping_task_keychron(); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (!process_record_keychron(keycode, record)) { + return false; + } + return true; +} diff --git a/keyboards/keychron/q0/base/keymaps/keychron/rules.mk b/keyboards/keychron/q0/base/keymaps/keychron/rules.mk new file mode 100644 index 0000000000..495e8907b4 --- /dev/null +++ b/keyboards/keychron/q0/base/keymaps/keychron/rules.mk @@ -0,0 +1,4 @@ +VIA_ENABLE = yes + +VPATH += keyboards/keychron/common +SRC += keychron_common.c diff --git a/keyboards/keychron/q0/base/keymaps/via/keymap.c b/keyboards/keychron/q0/base/keymaps/via/keymap.c new file mode 100644 index 0000000000..32fd198cf0 --- /dev/null +++ b/keyboards/keychron/q0/base/keymaps/via/keymap.c @@ -0,0 +1,53 @@ +/* Copyright 2022 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +enum layers { _BASE, _FN1, _RESERVED1, _RESERVED2 }; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_numpad_6x4( + MO(_FN1), KC_ESC, KC_BSPC, KC_TAB, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, + KC_P0, KC_PDOT, KC_PENT), + + [_FN1] = LAYOUT_numpad_6x4( + _______, KC_MUTE, KC_VOLD, KC_VOLU, + RGB_MOD, RGB_VAI, RGB_HUI, KC_DEL, + RGB_RMOD, RGB_VAD, RGB_HUD, + RGB_SAI, RGB_SPI, KC_MPRV, _______, + RGB_SAD, RGB_SPD, KC_MPLY, + RGB_TOG, KC_MNXT, _______), + + [_RESERVED1] = LAYOUT_numpad_6x4( + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______), + + [_RESERVED2] = LAYOUT_numpad_6x4( + _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, + _______, _______, _______) +}; diff --git a/keyboards/keychron/q0/base/keymaps/via/rules.mk b/keyboards/keychron/q0/base/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/keychron/q0/base/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/keychron/q0/base/readme.md b/keyboards/keychron/q0/base/readme.md new file mode 100644 index 0000000000..a6db5bc015 --- /dev/null +++ b/keyboards/keychron/q0/base/readme.md @@ -0,0 +1 @@ +# The base variant of the Keychron Q0 diff --git a/keyboards/keychron/q0/base/rules.mk b/keyboards/keychron/q0/base/rules.mk new file mode 100644 index 0000000000..7ff128fa69 --- /dev/null +++ b/keyboards/keychron/q0/base/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q0/config.h b/keyboards/keychron/q0/config.h index f4ec417043..24b629a520 100644 --- a/keyboards/keychron/q0/config.h +++ b/keyboards/keychron/q0/config.h @@ -21,9 +21,5 @@ /* turn off effects when suspended */ #define RGB_DISABLE_WHEN_USB_SUSPENDED -/* EEPROM Driver Configuration */ -#define WEAR_LEVELING_LOGICAL_SIZE 2048 -#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2) - #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS \ No newline at end of file diff --git a/keyboards/keychron/q0/info.json b/keyboards/keychron/q0/info.json new file mode 100644 index 0000000000..70a726c520 --- /dev/null +++ b/keyboards/keychron/q0/info.json @@ -0,0 +1,52 @@ +{ + "manufacturer": "Keychron", + "maintainer": "lalalademaxiya1", + "bootloader": "stm32-dfu", + "diode_direction": "ROW2COL", + "eeprom": { + "wear_leveling": { + "backing_size": 4096 + } + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "processor": "STM32L432", + "rgb_matrix": { + "animations": { + "band_spiral_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "jellybean_raindrops": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_simple": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "snled27351" + }, + "url": "https://github.com/Keychron", + "usb": { + "force_nkro": true, + "vid": "0x3434" + } +} \ No newline at end of file diff --git a/keyboards/keychron/q0/plus/config.h b/keyboards/keychron/q0/plus/config.h new file mode 100644 index 0000000000..1c47234f12 --- /dev/null +++ b/keyboards/keychron/q0/plus/config.h @@ -0,0 +1,32 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +/* RGB Matrix Driver Configuration */ +#define SNLED27351_DRIVER_COUNT 1 +#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO + +/* RGB Matrix Configuration */ +#define RGB_MATRIX_LED_COUNT 26 + +#define SNLED27351_PHASE_CHANNEL SNLED27351_MSKPHASE_9CHANNEL + +/* Encoder Configuration*/ +#define ENCODER_DEFAULT_POS 0x3 + +/* Enable num-lock LED */ +#define NUM_LOCK_LED_INDEX 5 diff --git a/keyboards/keychron/q0/plus/info.json b/keyboards/keychron/q0/plus/info.json new file mode 100644 index 0000000000..b187a79139 --- /dev/null +++ b/keyboards/keychron/q0/plus/info.json @@ -0,0 +1,94 @@ +{ + "keyboard_name": "Keychron Q0 Plus", + "usb": { + "pid": "0x0131", + "device_version": "1.0.0" + }, + "matrix_pins": { + "cols": ["C14", "C15", "A0", "A1", "A2"], + "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] + }, + "encoder": { + "enabled": true, + "rotary": [ + {"pin_a": "A3", "pin_b": "A4"} + ] + }, + "bootmagic": { + "matrix": [0, 1] + }, + "rgb_matrix": { + "layout": [ + {"flags": 1, "matrix": [0, 1], "x": 56, "y": 0}, + {"flags": 1, "matrix": [0, 2], "x": 112, "y": 0}, + {"flags": 1, "matrix": [0, 3], "x": 168, "y": 0}, + {"flags": 1, "matrix": [0, 4], "x": 224, "y": 0}, + + {"flags": 4, "matrix": [1, 0], "x": 0, "y": 15}, + {"flags": 8, "matrix": [1, 1], "x": 56, "y": 15}, + {"flags": 4, "matrix": [1, 2], "x": 112, "y": 15}, + {"flags": 4, "matrix": [1, 3], "x": 168, "y": 15}, + {"flags": 4, "matrix": [1, 4], "x": 224, "y": 15}, + + {"flags": 4, "matrix": [2, 0], "x": 0, "y": 27}, + {"flags": 4, "matrix": [2, 1], "x": 56, "y": 27}, + {"flags": 4, "matrix": [2, 2], "x": 112, "y": 27}, + {"flags": 4, "matrix": [2, 3], "x": 168, "y": 27}, + {"flags": 4, "matrix": [2, 4], "x": 224, "y": 34}, + + {"flags": 4, "matrix": [3, 0], "x": 0, "y": 40}, + {"flags": 4, "matrix": [3, 1], "x": 56, "y": 40}, + {"flags": 4, "matrix": [3, 2], "x": 112, "y": 40}, + {"flags": 4, "matrix": [3, 3], "x": 168, "y": 40}, + + {"flags": 4, "matrix": [4, 0], "x": 0, "y": 52}, + {"flags": 4, "matrix": [4, 1], "x": 56, "y": 52}, + {"flags": 4, "matrix": [4, 2], "x": 112, "y": 52}, + {"flags": 4, "matrix": [4, 3], "x": 168, "y": 52}, + {"flags": 4, "matrix": [4, 4], "x": 224, "y": 58}, + + {"flags": 4, "matrix": [5, 0], "x": 0, "y": 64}, + {"flags": 4, "matrix": [5, 1], "x": 84, "y": 64}, + {"flags": 1, "matrix": [5, 3], "x": 168, "y": 64} + ] + }, + "community_layouts": ["numpad_6x5"], + "layouts": { + "LAYOUT_numpad_6x5": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1.25}, + {"matrix": [1, 2], "x": 2.25, "y": 1.25}, + {"matrix": [1, 3], "x": 3.25, "y": 1.25}, + {"matrix": [1, 4], "x": 4.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2.25}, + {"matrix": [2, 2], "x": 2.25, "y": 2.25}, + {"matrix": [2, 3], "x": 3.25, "y": 2.25}, + {"matrix": [2, 4], "x": 4.25, "y": 2.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3.25}, + {"matrix": [3, 3], "x": 3.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 2}, + {"matrix": [5, 3], "x": 3.25, "y": 5.25} + ] + } + } +} diff --git a/keyboards/keychron/q0/plus/keymaps/default/keymap.c b/keyboards/keychron/q0/plus/keymaps/default/keymap.c new file mode 100644 index 0000000000..4e281d4d7d --- /dev/null +++ b/keyboards/keychron/q0/plus/keymaps/default/keymap.c @@ -0,0 +1,49 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +// clang-format off + +enum layers { + BASE, + FUNC +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [BASE] = LAYOUT_numpad_6x5( + KC_MUTE, MO(FUNC), KC_ESC, KC_BSPC, KC_TAB, + _______, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + _______, KC_P7, KC_P8, KC_P9, KC_PPLS, + _______, KC_P4, KC_P5, KC_P6, + _______, KC_P1, KC_P2, KC_P3, KC_PENT, + _______, KC_P0, KC_PDOT), + + [FUNC] = LAYOUT_numpad_6x5( + RGB_TOG, _______, KC_MUTE, KC_VOLD, KC_VOLU, + _______, RGB_MOD, RGB_VAI, RGB_HUI, KC_DEL, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, _______, + _______, RGB_SAI, RGB_SPI, KC_MPRV, + _______, RGB_SAD, RGB_SPD, KC_MPLY, _______, + _______, RGB_TOG, KC_MNXT), +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [FUNC] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, +}; +#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/keychron/q0/plus/keymaps/default/rules.mk b/keyboards/keychron/q0/plus/keymaps/default/rules.mk new file mode 100644 index 0000000000..ee32568148 --- /dev/null +++ b/keyboards/keychron/q0/plus/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q0/plus/keymaps/keychron/keymap.c b/keyboards/keychron/q0/plus/keymaps/keychron/keymap.c new file mode 100644 index 0000000000..795c275543 --- /dev/null +++ b/keyboards/keychron/q0/plus/keymaps/keychron/keymap.c @@ -0,0 +1,83 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H +#include "keychron_common.h" + +// clang-format off + +enum layers { + BASE, + FUNC, + L2, + L3 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [BASE] = LAYOUT_numpad_6x5( + KC_MUTE, MO(FUNC), KC_ESC, KC_BSPC, KC_TAB, + MC_1, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + MC_2, KC_P7, KC_P8, KC_P9, KC_PPLS, + MC_3, KC_P4, KC_P5, KC_P6, + MC_4, KC_P1, KC_P2, KC_P3, KC_PENT, + MC_5, KC_P0, KC_PDOT), + + [FUNC] = LAYOUT_numpad_6x5( + RGB_TOG, _______, KC_MUTE, KC_VOLD, KC_VOLU, + MC_1, RGB_MOD, RGB_VAI, RGB_HUI, KC_DEL, + MC_2, RGB_RMOD, RGB_VAD, RGB_HUD, _______, + MC_3, RGB_SAI, RGB_SPI, KC_MPRV, + MC_4, RGB_SAD, RGB_SPD, KC_MPLY, _______, + MC_5, RGB_TOG, KC_MNXT), + + [L2] = LAYOUT_numpad_6x5( + _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______), + + [L3] = LAYOUT_numpad_6x5( + _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [FUNC] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, + [L2] = { ENCODER_CCW_CW(_______, _______) }, + [L3] = { ENCODER_CCW_CW(_______, _______) } +}; +#endif // ENCODER_MAP_ENABLE + +// clang-format on + +void housekeeping_task_user(void) { + housekeeping_task_keychron(); +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (!process_record_keychron(keycode, record)) { + return false; + } + return true; +} diff --git a/keyboards/keychron/q0/plus/keymaps/keychron/rules.mk b/keyboards/keychron/q0/plus/keymaps/keychron/rules.mk new file mode 100644 index 0000000000..9cf1a9b56c --- /dev/null +++ b/keyboards/keychron/q0/plus/keymaps/keychron/rules.mk @@ -0,0 +1,5 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes + +VPATH += keyboards/keychron/common +SRC += keychron_common.c diff --git a/keyboards/keychron/q0/plus/keymaps/via/keymap.c b/keyboards/keychron/q0/plus/keymaps/via/keymap.c new file mode 100644 index 0000000000..935d3edb76 --- /dev/null +++ b/keyboards/keychron/q0/plus/keymaps/via/keymap.c @@ -0,0 +1,69 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + + // clang-format off + +enum layers { + BASE, + FUNC, + L2, + L3 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [BASE] = LAYOUT_numpad_6x5( + KC_MUTE, MO(FUNC), KC_ESC, KC_BSPC, KC_TAB, + MC_0, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + MC_2, KC_P7, KC_P8, KC_P9, KC_PPLS, + MC_3, KC_P4, KC_P5, KC_P6, + MC_4, KC_P1, KC_P2, KC_P3, KC_PENT, + MC_5, KC_P0, KC_PDOT), + + [FUNC] = LAYOUT_numpad_6x5( + RGB_TOG, _______, KC_MUTE, KC_VOLD, KC_VOLU, + MC_1, RGB_MOD, RGB_VAI, RGB_HUI, KC_DEL, + MC_2, RGB_RMOD, RGB_VAD, RGB_HUD, _______, + MC_3, RGB_SAI, RGB_SPI, KC_MPRV, + MC_4, RGB_SAD, RGB_SPD, KC_MPLY, _______, + MC_5, RGB_TOG, KC_MNXT), + + [L2] = LAYOUT_numpad_6x5( + _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______), + + [L3] = LAYOUT_numpad_6x5( + _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______, _______, + _______, _______, _______, _______, _______, + _______, _______, _______) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [FUNC] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, + [L2] = { ENCODER_CCW_CW(_______, _______) }, + [L3] = { ENCODER_CCW_CW(_______, _______) } +}; +#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/keychron/q0/plus/keymaps/via/rules.mk b/keyboards/keychron/q0/plus/keymaps/via/rules.mk new file mode 100644 index 0000000000..f1adcab005 --- /dev/null +++ b/keyboards/keychron/q0/plus/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q0/plus/plus.c b/keyboards/keychron/q0/plus/plus.c new file mode 100644 index 0000000000..0466e1a584 --- /dev/null +++ b/keyboards/keychron/q0/plus/plus.c @@ -0,0 +1,62 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "quantum.h" + +#ifdef RGB_MATRIX_ENABLE + +// clang-format off + +const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to SNLED27351 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, I_2, G_2, H_2}, + {0, I_3, G_3, H_3}, + {0, I_4, G_4, H_4}, + {0, I_5, G_5, H_5}, + + {0, C_1, A_1, B_1}, + {0, C_2, A_2, B_2}, + {0, C_3, A_3, B_3}, + {0, C_4, A_4, B_4}, + {0, C_5, A_5, B_5}, + + {0, F_1, D_1, E_1}, + {0, F_2, D_2, E_2}, + {0, F_3, D_3, E_3}, + {0, F_4, D_4, E_4}, + {0, F_5, D_5, E_5}, + + {0, I_6, G_6, H_6}, + {0, I_7, G_7, H_7}, + {0, I_8, G_8, H_8}, + {0, I_9, G_9, H_9}, + + {0, C_6, A_6, B_6}, + {0, C_7, A_7, B_7}, + {0, C_8, A_8, B_8}, + {0, C_9, A_9, B_9}, + {0, C_10, A_10, B_10}, + + {0, F_6, D_6, E_6}, + {0, F_7, D_7, E_7}, + {0, F_9, D_9, E_9}, +}; +#endif // RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q0/plus/readme.md b/keyboards/keychron/q0/plus/readme.md new file mode 100644 index 0000000000..6cc6e263f4 --- /dev/null +++ b/keyboards/keychron/q0/plus/readme.md @@ -0,0 +1,12 @@ +# Keychron Q0 Plus + +![Keychron Q0 Plus](https://i.imgur.com/EDbfVVOh.jpg) + +* Keyboard Maintainer: [Keychron](https://github.com/keychron) +* Hardware Supported: Keychron Q0 Plus +* Hardware Availability: [Keychron Q0 Plus QMK Custom Number Pad](https://www.keychron.com/products/keychron-q0-plus-qmk-custom-number-pad) + +1. The name of this keyboard is "Keychron Q0 Plus" +2. Enables EC11 rotary encoder + - Turn clockwise to increase volume and turn anti-clockwise to decrease volume + - Press the knob button to mute diff --git a/keyboards/keychron/q0/plus/rules.mk b/keyboards/keychron/q0/plus/rules.mk new file mode 100644 index 0000000000..7ff128fa69 --- /dev/null +++ b/keyboards/keychron/q0/plus/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/q0/readme.md b/keyboards/keychron/q0/readme.md index d0180d386e..aa6d109a29 100644 --- a/keyboards/keychron/q0/readme.md +++ b/keyboards/keychron/q0/readme.md @@ -1,18 +1,22 @@ # Keychron Q0 +![Keychron Q0](https://i.imgur.com/cLbEiZ0h.jpg) + A customizable number keypad. * Keyboard Maintainer: [Keychron](https://github.com/keychron) * Hardware Supported: Keychron Q0 -* Hardware Availability: [Keychron](https://www.keychron.com) +* Hardware Availability: [Keychron Q0 QMK Custom Number Pad](https://www.keychron.com/products/keychron-q0-qmk-custom-number-pad) Make example for this keyboard (after setting up your build environment): - make keychron/q0/rev_0130:default + make keychron/q0/base:default + make keychron/q0/plus:default Flashing example for this keyboard: - make keychron/q0/rev_0130:default:flash + make keychron/q0/base:default:flash + make keychron/q0/plus:default:flash **Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard. diff --git a/keyboards/keychron/q0/rev_0130/config.h b/keyboards/keychron/q0/rev_0130/config.h deleted file mode 100644 index 8b14e05a29..0000000000 --- a/keyboards/keychron/q0/rev_0130/config.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* RGB Matrix Driver Configuration */ -#define SNLED27351_DRIVER_COUNT 1 -#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND - -/* RGB Matrix Configuration */ -#define DRIVER_1_LED_TOTAL 21 -#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL - -/* Enable num-lock LED */ -#define NUM_LOCK_LED_INDEX 4 diff --git a/keyboards/keychron/q0/rev_0130/info.json b/keyboards/keychron/q0/rev_0130/info.json deleted file mode 100644 index 6b5a29d7ea..0000000000 --- a/keyboards/keychron/q0/rev_0130/info.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "keyboard_name": "Q0", - "manufacturer": "Keychron", - "url": "https://github.com/Keychron", - "maintainer": "lalalademaxiya1", - "usb": { - "vid": "0x3434", - "pid": "0x0130", - "device_version": "1.0.2", - "force_nkro": true - }, - "matrix_pins": { - "cols": ["A5", "A6", "A7", "B0"], - "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] - }, - "features": { - "audio": false, - "backlight": false, - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true, - "rgb_matrix": true, - "rgblight": false - }, - "diode_direction": "ROW2COL", - "processor": "STM32L432", - "bootloader": "stm32-dfu", - "rgb_matrix": { - "driver": "snled27351", - "animations": { - "band_spiral_val": true, - "breathing": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "jellybean_raindrops": true, - "pixel_rain": true, - "typing_heatmap": true, - "digital_rain": true, - "solid_reactive_simple": true, - "solid_reactive_multiwide": true, - "solid_reactive_multinexus": true, - "splash": true, - "solid_splash": true - }, - "center_point": [56, 16], - "layout": [ - {"flags": 1, "matrix": [0, 0], "x": 0, "y": 0}, - {"flags": 1, "matrix": [0, 1], "x": 37, "y": 0}, - {"flags": 1, "matrix": [0, 2], "x": 75, "y": 0}, - {"flags": 1, "matrix": [0, 3], "x": 112, "y": 0}, - - {"flags": 9, "matrix": [1, 0], "x": 0, "y": 6}, - {"flags": 4, "matrix": [1, 1], "x": 37, "y": 6}, - {"flags": 4, "matrix": [1, 2], "x": 75, "y": 6}, - {"flags": 4, "matrix": [1, 3], "x": 112, "y": 6}, - - {"flags": 4, "matrix": [2, 0], "x": 0, "y": 13}, - {"flags": 4, "matrix": [2, 1], "x": 37, "y": 13}, - {"flags": 4, "matrix": [2, 2], "x": 75, "y": 13}, - - {"flags": 4, "matrix": [3, 0], "x": 0, "y": 19}, - {"flags": 4, "matrix": [3, 1], "x": 37, "y": 19}, - {"flags": 4, "matrix": [3, 2], "x": 75, "y": 19}, - {"flags": 4, "matrix": [2, 3], "x": 112, "y": 16}, - - {"flags": 4, "matrix": [4, 0], "x": 0, "y": 25}, - {"flags": 4, "matrix": [4, 1], "x": 37, "y": 25}, - {"flags": 4, "matrix": [4, 2], "x": 75, "y": 25}, - - {"flags": 4, "matrix": [5, 0], "x": 18, "y": 32}, - {"flags": 4, "matrix": [5, 2], "x": 75, "y": 32}, - {"flags": 1, "matrix": [4, 3], "x": 112, "y": 29} - ] - }, - "layouts": { - "LAYOUT_numpad_6x4": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [2, 3], "x": 3, "y": 2, "h": 2}, - - {"matrix": [4, 0], "x": 0, "y": 4}, - {"matrix": [4, 1], "x": 1, "y": 4}, - {"matrix": [4, 2], "x": 2, "y": 4}, - - {"matrix": [5, 0], "x": 0, "y": 5, "w": 2}, - {"matrix": [5, 2], "x": 2, "y": 5}, - {"matrix": [4, 3], "x": 3, "y": 4, "h": 2} - ] - } - } -} diff --git a/keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c b/keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c deleted file mode 100644 index 387ff2d686..0000000000 --- a/keyboards/keychron/q0/rev_0130/keymaps/default/keymap.c +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - -enum layers { _BASE, _FN1}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_numpad_6x4( - MO(_FN1), KC_ESC, KC_BSPC, KC_TAB, - KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, - KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_P1, KC_P2, KC_P3, - KC_P0, KC_PDOT, KC_PENT), - - [_FN1] = LAYOUT_numpad_6x4( - _______, KC_MUTE, KC_VOLD, KC_VOLU, - RGB_MOD, RGB_VAI, RGB_HUI, KC_DEL, - RGB_RMOD, RGB_VAD, RGB_HUD, - RGB_SAI, RGB_SPI, KC_MPRV, _______, - RGB_SAD, RGB_SPD, KC_MPLY, - RGB_TOG, KC_MNXT, _______) -}; diff --git a/keyboards/keychron/q0/rev_0130/keymaps/keychron/keymap.c b/keyboards/keychron/q0/rev_0130/keymaps/keychron/keymap.c deleted file mode 100644 index 73826716fc..0000000000 --- a/keyboards/keychron/q0/rev_0130/keymaps/keychron/keymap.c +++ /dev/null @@ -1,65 +0,0 @@ -/* Copyright 2023 @ Keychron (https://www.keychron.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H -#include "keychron_common.h" - -enum layers { _BASE, _FN1, _RESERVED1, _RESERVED2 }; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_numpad_6x4( - MO(_FN1), KC_ESC, KC_BSPC, KC_TAB, - KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, - KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_P1, KC_P2, KC_P3, - KC_P0, KC_PDOT, KC_PENT), - - [_FN1] = LAYOUT_numpad_6x4( - _______, KC_MUTE, KC_VOLD, KC_VOLU, - RGB_MOD, RGB_VAI, RGB_HUI, KC_DEL, - RGB_RMOD, RGB_VAD, RGB_HUD, - RGB_SAI, RGB_SPI, KC_MPRV, _______, - RGB_SAD, RGB_SPD, KC_MPLY, - RGB_TOG, KC_MNXT, _______), - - [_RESERVED1] = LAYOUT_numpad_6x4( - _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, - _______, _______, _______), - - [_RESERVED2] = LAYOUT_numpad_6x4( - _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, - _______, _______, _______) -}; - -void housekeeping_task_user(void) { - housekeeping_task_keychron(); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/q0/rev_0130/keymaps/keychron/rules.mk b/keyboards/keychron/q0/rev_0130/keymaps/keychron/rules.mk deleted file mode 100644 index 495e8907b4..0000000000 --- a/keyboards/keychron/q0/rev_0130/keymaps/keychron/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -VIA_ENABLE = yes - -VPATH += keyboards/keychron/common -SRC += keychron_common.c diff --git a/keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c b/keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c deleted file mode 100644 index 32fd198cf0..0000000000 --- a/keyboards/keychron/q0/rev_0130/keymaps/via/keymap.c +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - -enum layers { _BASE, _FN1, _RESERVED1, _RESERVED2 }; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_numpad_6x4( - MO(_FN1), KC_ESC, KC_BSPC, KC_TAB, - KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, - KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_P1, KC_P2, KC_P3, - KC_P0, KC_PDOT, KC_PENT), - - [_FN1] = LAYOUT_numpad_6x4( - _______, KC_MUTE, KC_VOLD, KC_VOLU, - RGB_MOD, RGB_VAI, RGB_HUI, KC_DEL, - RGB_RMOD, RGB_VAD, RGB_HUD, - RGB_SAI, RGB_SPI, KC_MPRV, _______, - RGB_SAD, RGB_SPD, KC_MPLY, - RGB_TOG, KC_MNXT, _______), - - [_RESERVED1] = LAYOUT_numpad_6x4( - _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, - _______, _______, _______), - - [_RESERVED2] = LAYOUT_numpad_6x4( - _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, - _______, _______, _______) -}; diff --git a/keyboards/keychron/q0/rev_0130/keymaps/via/rules.mk b/keyboards/keychron/q0/rev_0130/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/keychron/q0/rev_0130/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/keychron/q0/rev_0130/readme.md b/keyboards/keychron/q0/rev_0130/readme.md deleted file mode 100644 index a6db5bc015..0000000000 --- a/keyboards/keychron/q0/rev_0130/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The base variant of the Keychron Q0 diff --git a/keyboards/keychron/q0/rev_0130/rev_0130.c b/keyboards/keychron/q0/rev_0130/rev_0130.c deleted file mode 100644 index 05803234c0..0000000000 --- a/keyboards/keychron/q0/rev_0130/rev_0130.c +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "quantum.h" - -#ifdef RGB_MATRIX_ENABLE - -// clang-format off - -const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { -/* Refer to SNLED27351 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ - {0, F_5, D_5, E_5}, // 0 - {0, I_5, G_5, H_5}, // 1 - {0, L_5, J_5, K_5}, // 2 - {0, C_5, A_5, B_5}, // 3 - - {0, F_4, D_4, E_4}, // 4 - {0, I_4, G_4, H_4}, // 5 - {0, L_4, J_4, K_4}, // 6 - {0, C_4, A_4, B_4}, // 7 - - {0, F_6, D_6, E_6}, // 8 - {0, I_6, G_6, H_6}, // 9 - {0, L_6, J_6, K_6}, // 10 - - {0, F_3, D_3, E_3}, // 11 - {0, I_3, G_3, H_3}, // 12 - {0, L_3, J_3, K_3}, // 13 - {0, C_6, A_6, B_6}, // 14 - - {0, F_2, D_2, E_2}, // 15 - {0, I_2, G_2, H_2}, // 16 - {0, L_2, J_2, K_2}, // 17 - - {0, F_1, D_1, E_1}, // 18 - {0, L_1, J_1, K_1}, // 19 - {0, C_2, A_2, B_2}, // 20 -}; -#endif // RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q0/rev_0130/rules.mk b/keyboards/keychron/q0/rev_0130/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/q0/rev_0130/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/q0/rev_0131/config.h b/keyboards/keychron/q0/rev_0131/config.h deleted file mode 100644 index f3187704a7..0000000000 --- a/keyboards/keychron/q0/rev_0131/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2023 @ Keychron (https://www.keychron.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* RGB Matrix Driver Configuration */ -#define SNLED27351_DRIVER_COUNT 1 -#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO - -/* RGB Matrix Configuration */ -#define DRIVER_1_LED_TOTAL 26 -#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL - -#define SNLED27351_PHASE_CHANNEL SNLED27351_MSKPHASE_9CHANNEL - -/* Enable num-lock LED */ -#define NUM_LOCK_LED_INDEX 5 - -/* Encoder Configuration */ -#define ENCODER_DEFAULT_POS 0x3 diff --git a/keyboards/keychron/q0/rev_0131/info.json b/keyboards/keychron/q0/rev_0131/info.json deleted file mode 100644 index 24d2a0488a..0000000000 --- a/keyboards/keychron/q0/rev_0131/info.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "keyboard_name": "Keychron Q0 Plus", - "manufacturer": "Keychron", - "url": "https://github.com/Keychron", - "maintainer": "lalalademaxiya1", - "usb": { - "vid": "0x3434", - "pid": "0x0131", - "device_version": "1.0.0", - "force_nkro": true - }, - "matrix_pins": { - "cols": ["C14", "C15", "A0", "A1", "A2"], - "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] - }, - "features": { - "audio": false, - "backlight": false, - "bootmagic": true, - "command": false, - "console": false, - "encoder": true, - "extrakey": true, - "mousekey": true, - "nkro": true, - "rgb_matrix": true, - "rgblight": false - }, - "diode_direction": "ROW2COL", - "encoder": { - "rotary": [ - {"pin_a": "A3", "pin_b": "A4"} - ] - }, - "bootmagic": { - "matrix": [0, 1] - }, - "processor": "STM32L432", - "bootloader": "stm32-dfu", - "rgb_matrix": { - "driver": "snled27351", - "animations": { - "band_spiral_val": true, - "breathing": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "jellybean_raindrops": true, - "pixel_rain": true, - "typing_heatmap": true, - "digital_rain": true, - "solid_reactive_simple": true, - "solid_reactive_multiwide": true, - "solid_reactive_multinexus": true, - "splash": true, - "solid_splash": true - }, - "layout": [ - {"flags": 1, "matrix": [0, 1], "x": 56, "y": 0}, - {"flags": 1, "matrix": [0, 2], "x": 112, "y": 0}, - {"flags": 1, "matrix": [0, 3], "x": 168, "y": 0}, - {"flags": 1, "matrix": [0, 4], "x": 224, "y": 0}, - - {"flags": 4, "matrix": [1, 0], "x": 0, "y": 15}, - {"flags": 8, "matrix": [1, 1], "x": 56, "y": 15}, - {"flags": 4, "matrix": [1, 2], "x": 112, "y": 15}, - {"flags": 4, "matrix": [1, 3], "x": 168, "y": 15}, - {"flags": 4, "matrix": [1, 4], "x": 224, "y": 15}, - - {"flags": 4, "matrix": [2, 0], "x": 0, "y": 27}, - {"flags": 4, "matrix": [2, 1], "x": 56, "y": 27}, - {"flags": 4, "matrix": [2, 2], "x": 112, "y": 27}, - {"flags": 4, "matrix": [2, 3], "x": 168, "y": 27}, - {"flags": 4, "matrix": [2, 4], "x": 224, "y": 34}, - - {"flags": 4, "matrix": [3, 0], "x": 0, "y": 40}, - {"flags": 4, "matrix": [3, 1], "x": 56, "y": 40}, - {"flags": 4, "matrix": [3, 2], "x": 112, "y": 40}, - {"flags": 4, "matrix": [3, 3], "x": 168, "y": 40}, - - {"flags": 4, "matrix": [4, 0], "x": 0, "y": 52}, - {"flags": 4, "matrix": [4, 1], "x": 56, "y": 52}, - {"flags": 4, "matrix": [4, 2], "x": 112, "y": 52}, - {"flags": 4, "matrix": [4, 3], "x": 168, "y": 52}, - {"flags": 4, "matrix": [4, 4], "x": 224, "y": 58}, - - {"flags": 4, "matrix": [5, 0], "x": 0, "y": 64}, - {"flags": 4, "matrix": [5, 1], "x": 84, "y": 64}, - {"flags": 1, "matrix": [5, 3], "x": 168, "y": 64} - ] - }, - "layouts": { - "LAYOUT_numpad_6x5": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1.25, "y": 0}, - {"matrix": [0, 2], "x": 2.25, "y": 0}, - {"matrix": [0, 3], "x": 3.25, "y": 0}, - {"matrix": [0, 4], "x": 4.25, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1.25}, - {"matrix": [1, 1], "x": 1.25, "y": 1.25}, - {"matrix": [1, 2], "x": 2.25, "y": 1.25}, - {"matrix": [1, 3], "x": 3.25, "y": 1.25}, - {"matrix": [1, 4], "x": 4.25, "y": 1.25}, - - {"matrix": [2, 0], "x": 0, "y": 2.25}, - {"matrix": [2, 1], "x": 1.25, "y": 2.25}, - {"matrix": [2, 2], "x": 2.25, "y": 2.25}, - {"matrix": [2, 3], "x": 3.25, "y": 2.25}, - {"matrix": [2, 4], "x": 4.25, "y": 2.25, "h": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3.25}, - {"matrix": [3, 1], "x": 1.25, "y": 3.25}, - {"matrix": [3, 2], "x": 2.25, "y": 3.25}, - {"matrix": [3, 3], "x": 3.25, "y": 3.25}, - - {"matrix": [4, 0], "x": 0, "y": 4.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4.25}, - {"matrix": [4, 2], "x": 2.25, "y": 4.25}, - {"matrix": [4, 3], "x": 3.25, "y": 4.25}, - {"matrix": [4, 4], "x": 4.25, "y": 4.25, "h": 2}, - - {"matrix": [5, 0], "x": 0, "y": 5.25}, - {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 2}, - {"matrix": [5, 3], "x": 3.25, "y": 5.25} - ] - } - } -} diff --git a/keyboards/keychron/q0/rev_0131/keymaps/default/keymap.c b/keyboards/keychron/q0/rev_0131/keymaps/default/keymap.c deleted file mode 100644 index 4e281d4d7d..0000000000 --- a/keyboards/keychron/q0/rev_0131/keymaps/default/keymap.c +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2023 @ Keychron (https://www.keychron.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - -// clang-format off - -enum layers { - BASE, - FUNC -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [BASE] = LAYOUT_numpad_6x5( - KC_MUTE, MO(FUNC), KC_ESC, KC_BSPC, KC_TAB, - _______, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - _______, KC_P7, KC_P8, KC_P9, KC_PPLS, - _______, KC_P4, KC_P5, KC_P6, - _______, KC_P1, KC_P2, KC_P3, KC_PENT, - _______, KC_P0, KC_PDOT), - - [FUNC] = LAYOUT_numpad_6x5( - RGB_TOG, _______, KC_MUTE, KC_VOLD, KC_VOLU, - _______, RGB_MOD, RGB_VAI, RGB_HUI, KC_DEL, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, _______, - _______, RGB_SAI, RGB_SPI, KC_MPRV, - _______, RGB_SAD, RGB_SPD, KC_MPLY, _______, - _______, RGB_TOG, KC_MNXT), -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [FUNC] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, -}; -#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/keychron/q0/rev_0131/keymaps/default/rules.mk b/keyboards/keychron/q0/rev_0131/keymaps/default/rules.mk deleted file mode 100644 index ee32568148..0000000000 --- a/keyboards/keychron/q0/rev_0131/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q0/rev_0131/keymaps/keychron/keymap.c b/keyboards/keychron/q0/rev_0131/keymaps/keychron/keymap.c deleted file mode 100644 index 795c275543..0000000000 --- a/keyboards/keychron/q0/rev_0131/keymaps/keychron/keymap.c +++ /dev/null @@ -1,83 +0,0 @@ -/* Copyright 2023 @ Keychron (https://www.keychron.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H -#include "keychron_common.h" - -// clang-format off - -enum layers { - BASE, - FUNC, - L2, - L3 -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [BASE] = LAYOUT_numpad_6x5( - KC_MUTE, MO(FUNC), KC_ESC, KC_BSPC, KC_TAB, - MC_1, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - MC_2, KC_P7, KC_P8, KC_P9, KC_PPLS, - MC_3, KC_P4, KC_P5, KC_P6, - MC_4, KC_P1, KC_P2, KC_P3, KC_PENT, - MC_5, KC_P0, KC_PDOT), - - [FUNC] = LAYOUT_numpad_6x5( - RGB_TOG, _______, KC_MUTE, KC_VOLD, KC_VOLU, - MC_1, RGB_MOD, RGB_VAI, RGB_HUI, KC_DEL, - MC_2, RGB_RMOD, RGB_VAD, RGB_HUD, _______, - MC_3, RGB_SAI, RGB_SPI, KC_MPRV, - MC_4, RGB_SAD, RGB_SPD, KC_MPLY, _______, - MC_5, RGB_TOG, KC_MNXT), - - [L2] = LAYOUT_numpad_6x5( - _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______), - - [L3] = LAYOUT_numpad_6x5( - _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______) -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [FUNC] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, - [L2] = { ENCODER_CCW_CW(_______, _______) }, - [L3] = { ENCODER_CCW_CW(_______, _______) } -}; -#endif // ENCODER_MAP_ENABLE - -// clang-format on - -void housekeeping_task_user(void) { - housekeeping_task_keychron(); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/q0/rev_0131/keymaps/keychron/rules.mk b/keyboards/keychron/q0/rev_0131/keymaps/keychron/rules.mk deleted file mode 100644 index 9cf1a9b56c..0000000000 --- a/keyboards/keychron/q0/rev_0131/keymaps/keychron/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -VIA_ENABLE = yes -ENCODER_MAP_ENABLE = yes - -VPATH += keyboards/keychron/common -SRC += keychron_common.c diff --git a/keyboards/keychron/q0/rev_0131/keymaps/via/keymap.c b/keyboards/keychron/q0/rev_0131/keymaps/via/keymap.c deleted file mode 100644 index 935d3edb76..0000000000 --- a/keyboards/keychron/q0/rev_0131/keymaps/via/keymap.c +++ /dev/null @@ -1,69 +0,0 @@ -/* Copyright 2023 @ Keychron (https://www.keychron.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - - // clang-format off - -enum layers { - BASE, - FUNC, - L2, - L3 -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [BASE] = LAYOUT_numpad_6x5( - KC_MUTE, MO(FUNC), KC_ESC, KC_BSPC, KC_TAB, - MC_0, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - MC_2, KC_P7, KC_P8, KC_P9, KC_PPLS, - MC_3, KC_P4, KC_P5, KC_P6, - MC_4, KC_P1, KC_P2, KC_P3, KC_PENT, - MC_5, KC_P0, KC_PDOT), - - [FUNC] = LAYOUT_numpad_6x5( - RGB_TOG, _______, KC_MUTE, KC_VOLD, KC_VOLU, - MC_1, RGB_MOD, RGB_VAI, RGB_HUI, KC_DEL, - MC_2, RGB_RMOD, RGB_VAD, RGB_HUD, _______, - MC_3, RGB_SAI, RGB_SPI, KC_MPRV, - MC_4, RGB_SAD, RGB_SPD, KC_MPLY, _______, - MC_5, RGB_TOG, KC_MNXT), - - [L2] = LAYOUT_numpad_6x5( - _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______), - - [L3] = LAYOUT_numpad_6x5( - _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______) -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [FUNC] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, - [L2] = { ENCODER_CCW_CW(_______, _______) }, - [L3] = { ENCODER_CCW_CW(_______, _______) } -}; -#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/keychron/q0/rev_0131/keymaps/via/rules.mk b/keyboards/keychron/q0/rev_0131/keymaps/via/rules.mk deleted file mode 100644 index f1adcab005..0000000000 --- a/keyboards/keychron/q0/rev_0131/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q0/rev_0131/readme.md b/keyboards/keychron/q0/rev_0131/readme.md deleted file mode 100644 index df07c40e49..0000000000 --- a/keyboards/keychron/q0/rev_0131/readme.md +++ /dev/null @@ -1,6 +0,0 @@ -# The enhanced version with encoder of the Keychron Q0 - -- The name of this keyboard is "Q0 Plus" -- Enable EC11 rotary encoder -- Turn clockwise to increase volume and turn anti-clockwise to decrease volume -- Press the knob button to mute diff --git a/keyboards/keychron/q0/rev_0131/rev_0131.c b/keyboards/keychron/q0/rev_0131/rev_0131.c deleted file mode 100644 index 0466e1a584..0000000000 --- a/keyboards/keychron/q0/rev_0131/rev_0131.c +++ /dev/null @@ -1,62 +0,0 @@ -/* Copyright 2023 @ Keychron (https://www.keychron.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "quantum.h" - -#ifdef RGB_MATRIX_ENABLE - -// clang-format off - -const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { -/* Refer to SNLED27351 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ - {0, I_2, G_2, H_2}, - {0, I_3, G_3, H_3}, - {0, I_4, G_4, H_4}, - {0, I_5, G_5, H_5}, - - {0, C_1, A_1, B_1}, - {0, C_2, A_2, B_2}, - {0, C_3, A_3, B_3}, - {0, C_4, A_4, B_4}, - {0, C_5, A_5, B_5}, - - {0, F_1, D_1, E_1}, - {0, F_2, D_2, E_2}, - {0, F_3, D_3, E_3}, - {0, F_4, D_4, E_4}, - {0, F_5, D_5, E_5}, - - {0, I_6, G_6, H_6}, - {0, I_7, G_7, H_7}, - {0, I_8, G_8, H_8}, - {0, I_9, G_9, H_9}, - - {0, C_6, A_6, B_6}, - {0, C_7, A_7, B_7}, - {0, C_8, A_8, B_8}, - {0, C_9, A_9, B_9}, - {0, C_10, A_10, B_10}, - - {0, F_6, D_6, E_6}, - {0, F_7, D_7, E_7}, - {0, F_9, D_9, E_9}, -}; -#endif // RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q0/rev_0131/rules.mk b/keyboards/keychron/q0/rev_0131/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/q0/rev_0131/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank -- cgit v1.2.3 From d56ee70c524b4fc4d1638e5e8c4bdeb89e752993 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 21 Oct 2023 21:41:59 +1000 Subject: Rename `DRIVER_ADDR_n` defines (#22200) Co-authored-by: Nick Brassel --- keyboards/keychron/q0/base/config.h | 2 +- keyboards/keychron/q0/plus/config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/keychron/q0') diff --git a/keyboards/keychron/q0/base/config.h b/keyboards/keychron/q0/base/config.h index 566f808762..82dd796660 100644 --- a/keyboards/keychron/q0/base/config.h +++ b/keyboards/keychron/q0/base/config.h @@ -18,7 +18,7 @@ /* RGB Matrix Driver Configuration */ #define SNLED27351_DRIVER_COUNT 1 -#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_GND +#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND /* RGB Matrix Configuration */ #define RGB_MATRIX_LED_COUNT 21 diff --git a/keyboards/keychron/q0/plus/config.h b/keyboards/keychron/q0/plus/config.h index 1c47234f12..a27ec9cfa6 100644 --- a/keyboards/keychron/q0/plus/config.h +++ b/keyboards/keychron/q0/plus/config.h @@ -18,7 +18,7 @@ /* RGB Matrix Driver Configuration */ #define SNLED27351_DRIVER_COUNT 1 -#define DRIVER_ADDR_1 SNLED27351_I2C_ADDRESS_VDDIO +#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO /* RGB Matrix Configuration */ #define RGB_MATRIX_LED_COUNT 26 -- cgit v1.2.3 From dda6e7fb36f20821c60fbd7638c9bd016ef217d6 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 21 Nov 2023 02:48:23 +1100 Subject: LED drivers: register naming cleanups (#22436) --- keyboards/keychron/q0/plus/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/keychron/q0') diff --git a/keyboards/keychron/q0/plus/config.h b/keyboards/keychron/q0/plus/config.h index a27ec9cfa6..524a73c54d 100644 --- a/keyboards/keychron/q0/plus/config.h +++ b/keyboards/keychron/q0/plus/config.h @@ -23,7 +23,7 @@ /* RGB Matrix Configuration */ #define RGB_MATRIX_LED_COUNT 26 -#define SNLED27351_PHASE_CHANNEL SNLED27351_MSKPHASE_9CHANNEL +#define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL /* Encoder Configuration*/ #define ENCODER_DEFAULT_POS 0x3 -- cgit v1.2.3 From b35bac6afbadc88cf6e8e3d1c8cc7494a510bb60 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 22 Nov 2023 21:37:32 +0000 Subject: Remove unnecessary driver counts (#22435) --- keyboards/keychron/q0/base/config.h | 1 - keyboards/keychron/q0/plus/config.h | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/keychron/q0') diff --git a/keyboards/keychron/q0/base/config.h b/keyboards/keychron/q0/base/config.h index 82dd796660..1d6c1a6757 100644 --- a/keyboards/keychron/q0/base/config.h +++ b/keyboards/keychron/q0/base/config.h @@ -17,7 +17,6 @@ #pragma once /* RGB Matrix Driver Configuration */ -#define SNLED27351_DRIVER_COUNT 1 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND /* RGB Matrix Configuration */ diff --git a/keyboards/keychron/q0/plus/config.h b/keyboards/keychron/q0/plus/config.h index 524a73c54d..01320b1f31 100644 --- a/keyboards/keychron/q0/plus/config.h +++ b/keyboards/keychron/q0/plus/config.h @@ -17,7 +17,6 @@ #pragma once /* RGB Matrix Driver Configuration */ -#define SNLED27351_DRIVER_COUNT 1 #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO /* RGB Matrix Configuration */ -- cgit v1.2.3