aboutsummaryrefslogtreecommitdiff
path: root/keyboards/keychron/q60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keychron/q60')
-rw-r--r--keyboards/keychron/q60/ansi/ansi.c122
-rw-r--r--keyboards/keychron/q60/ansi/config.h20
-rw-r--r--keyboards/keychron/q60/ansi/info.json3
-rw-r--r--keyboards/keychron/q60/config.h65
-rw-r--r--keyboards/keychron/q60/info.json37
-rw-r--r--keyboards/keychron/q60/q60.c8
6 files changed, 98 insertions, 157 deletions
diff --git a/keyboards/keychron/q60/ansi/ansi.c b/keyboards/keychron/q60/ansi/ansi.c
index ac72737146..8b702eb5a6 100644
--- a/keyboards/keychron/q60/ansi/ansi.c
+++ b/keyboards/keychron/q60/ansi/ansi.c
@@ -20,77 +20,77 @@
// clang-format off
-const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
/* Refer to SNLED27351 manual for these locations
* driver
* | R location
* | | G location
* | | | B location
* | | | | */
- {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, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
- {0, I_1, G_1, H_1},
- {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, 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, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
- {0, L_1, J_1, K_1},
- {0, L_2, J_2, K_2},
- {0, L_3, J_3, K_3},
- {0, L_4, J_4, K_4},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_14, J_14, K_14},
+ {0, CB12_CA1, CB10_CA1, CB11_CA1},
+ {0, CB12_CA2, CB10_CA2, CB11_CA2},
+ {0, CB12_CA3, CB10_CA3, CB11_CA3},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
- {0, C_1, A_1, B_1},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {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, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {0, L_16, J_16, K_16},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
};
#define __ NO_LED
diff --git a/keyboards/keychron/q60/ansi/config.h b/keyboards/keychron/q60/ansi/config.h
deleted file mode 100644
index 05810cce64..0000000000
--- a/keyboards/keychron/q60/ansi/config.h
+++ /dev/null
@@ -1,20 +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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* RGB Matrix Configuration */
-#define RGB_MATRIX_LED_COUNT 60
diff --git a/keyboards/keychron/q60/ansi/info.json b/keyboards/keychron/q60/ansi/info.json
index f5832b2d8f..1d074c5e3c 100644
--- a/keyboards/keychron/q60/ansi/info.json
+++ b/keyboards/keychron/q60/ansi/info.json
@@ -8,9 +8,6 @@
"pid": "0x01C0",
"device_version": "1.0.0"
},
- "rgb_matrix": {
- "driver": "snled27351"
- },
"matrix_pins": {
"cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9"],
"rows": ["B4", "B3", "A15", "A14", "A13"]
diff --git a/keyboards/keychron/q60/config.h b/keyboards/keychron/q60/config.h
index 6b6c3c5f48..5e8e40cc5a 100644
--- a/keyboards/keychron/q60/config.h
+++ b/keyboards/keychron/q60/config.h
@@ -29,69 +29,4 @@
#define SNLED27351_CURRENT_TUNE \
{ 0xD8, 0xD8, 0x60, 0xD8, 0xD8, 0x60, 0xD8, 0xD8, 0x60, 0xD8, 0xD8, 0x60 }
-/* DIP switch */
-#define DIP_SWITCH_MATRIX_GRID { {4,4} }
-
-/* Disable DIP switch in matrix data */
-#define MATRIX_MASKED
-
-/* turn off effects when suspended */
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-
#define DYNAMIC_KEYMAP_LAYER_COUNT 6
-
-/* EEPROM Driver Configuration */
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-// #define ENABLE_RGB_MATRIX_BAND_SAT
-// #define ENABLE_RGB_MATRIX_BAND_VAL
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_DUAL_BEACON
-#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #define ENABLE_RGB_MATRIX_HUE_BREATHING
-// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
-// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_SPLASH
-// #define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/q60/info.json b/keyboards/keychron/q60/info.json
new file mode 100644
index 0000000000..553146eb39
--- /dev/null
+++ b/keyboards/keychron/q60/info.json
@@ -0,0 +1,37 @@
+{
+ "eeprom": {
+ "wear_leveling": {
+ "backing_size": 4096
+ }
+ },
+ "dip_switch": {
+ "matrix_grid": [ [4, 4] ]
+ },
+ "rgb_matrix": {
+ "animations": {
+ "breathing": true,
+ "band_spiral_val": 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
+ },
+ "driver": "snled27351",
+ "sleep": true
+ }
+}
diff --git a/keyboards/keychron/q60/q60.c b/keyboards/keychron/q60/q60.c
index d97f72fb8e..c6f2d1a38c 100644
--- a/keyboards/keychron/q60/q60.c
+++ b/keyboards/keychron/q60/q60.c
@@ -16,14 +16,6 @@
#include "quantum.h"
-const matrix_row_t matrix_mask[] = {
- 0b11111111111111,
- 0b11111111111111,
- 0b11111111111111,
- 0b11111111111111,
- 0b11111111101111,
-};
-
#ifdef DIP_SWITCH_ENABLE
bool dip_switch_update_kb(uint8_t index, bool active) {