diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index f7bfc45cf3..66a129f7af 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -625,7 +625,6 @@ ifeq ($(strip $(VIA_ENABLE)), yes) RAW_ENABLE := yes BOOTMAGIC_ENABLE := yes TRI_LAYER_ENABLE := yes - SEND_STRING_ENABLE := yes endif VALID_MAGIC_TYPES := yes diff --git a/drivers/led/snled27351-simple.h b/drivers/led/snled27351-simple.h index 9b9a72ff64..89f6ec418a 100644 --- a/drivers/led/snled27351-simple.h +++ b/drivers/led/snled27351-simple.h @@ -22,18 +22,6 @@ #include "util.h" // ======== DEPRECATED DEFINES - DO NOT USE ======== -#ifdef DRIVER_ADDR_1 -# define SNLED27351_I2C_ADDRESS_1 DRIVER_ADDR_1 -#endif -#ifdef DRIVER_ADDR_2 -# define SNLED27351_I2C_ADDRESS_2 DRIVER_ADDR_2 -#endif -#ifdef DRIVER_ADDR_3 -# define SNLED27351_I2C_ADDRESS_3 DRIVER_ADDR_3 -#endif -#ifdef DRIVER_ADDR_4 -# define SNLED27351_I2C_ADDRESS_4 DRIVER_ADDR_4 -#endif #ifdef CKLED2001_TIMEOUT # define SNLED27351_I2C_TIMEOUT CKLED2001_TIMEOUT #endif diff --git a/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_rgb.json b/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_rgb.json index f033b05774..4e36b6ec6b 100644 --- a/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_rgb.json +++ b/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_rgb.json @@ -333,10 +333,10 @@ "5,16", { "x": 0.25, - "c": "#cccccc", - "w": 2 + "c": "#cccccc" }, "5,17", + "5,18", "5,19" ] ] diff --git a/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_white.json b/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_white.json index 6352afe5f0..7eb1ca27d9 100644 --- a/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_white.json +++ b/keyboards/keychron/k10_pro/via_json/k10_pro_ansi_white.json @@ -273,10 +273,10 @@ "5,16", { "x": 0.25, - "c": "#cccccc", - "w": 2 + "c": "#cccccc" }, "5,17", + "5,18", "5,19" ] ] diff --git a/keyboards/keychron/k10_pro/via_json/k10_pro_iso_rgb.json b/keyboards/keychron/k10_pro/via_json/k10_pro_iso_rgb.json index 3676b9200f..bf3a1f6bfc 100644 --- a/keyboards/keychron/k10_pro/via_json/k10_pro_iso_rgb.json +++ b/keyboards/keychron/k10_pro/via_json/k10_pro_iso_rgb.json @@ -32,7 +32,7 @@ ["08. CYCLE_OUT_IN", 8], ["09. CYCLE_OUT_IN_DUAL", 9], ["10. CYCLE_PINWHEEL", 10], - ["11. CYCLE_SPIRAL", 11], + ["11. CYCKE_SPIRAL", 11], ["12. DUAL_BEACON", 12], ["13. RAINBOW_BEACON", 13], ["14. JELLYBEAN_RAINDROPS", 14], diff --git a/keyboards/keychron/k10_pro/via_json/k10_pro_jis_rgb.json b/keyboards/keychron/k10_pro/via_json/k10_pro_jis_rgb.json index 9360904173..85e67eff7d 100644 --- a/keyboards/keychron/k10_pro/via_json/k10_pro_jis_rgb.json +++ b/keyboards/keychron/k10_pro/via_json/k10_pro_jis_rgb.json @@ -32,7 +32,7 @@ ["08. CYCLE_OUT_IN", 8], ["09. CYCLE_OUT_IN_DUAL", 9], ["10. CYCLE_PINWHEEL", 10], - ["11. CYCLE_SPIRAL", 11], + ["11. CYCKE_SPIRAL", 11], ["12. DUAL_BEACON", 12], ["13. RAINBOW_BEACON", 13], ["14. JELLYBEAN_RAINDROPS", 14], diff --git a/keyboards/keychron/k10_pro_se2/info.json b/keyboards/keychron/k10_pro_se2/info.json index 9435381163..b9084eeaf3 100644 --- a/keyboards/keychron/k10_pro_se2/info.json +++ b/keyboards/keychron/k10_pro_se2/info.json @@ -33,7 +33,6 @@ }, "indicators": { "caps_lock": "C9", - "num_lock": "B2", "on_state": 1 }, "matrix_pins": { diff --git a/keyboards/keychron/k11_max/ansi_encoder/rgb/info.json b/keyboards/keychron/k11_max/ansi_encoder/rgb/info.json index 6b3ea7f118..3bf519bb46 100644 --- a/keyboards/keychron/k11_max/ansi_encoder/rgb/info.json +++ b/keyboards/keychron/k11_max/ansi_encoder/rgb/info.json @@ -4,7 +4,16 @@ "device_version": "1.0.0" }, "features": { - "rgb_matrix": true + "rgb_matrix": true, + "encoder": true + }, + "encoder": { + "rotary": [ + { + "pin_a": "A8", + "pin_b": "C9" + } + ] }, "rgb_matrix": { "driver": "snled27351_spi", diff --git a/keyboards/keychron/k11_max/ansi_encoder/rgb/rgb.c b/keyboards/keychron/k11_max/ansi_encoder/rgb/rgb.c index 1e3d42da4d..96e5a953ba 100644 --- a/keyboards/keychron/k11_max/ansi_encoder/rgb/rgb.c +++ b/keyboards/keychron/k11_max/ansi_encoder/rgb/rgb.c @@ -19,7 +19,7 @@ // clang-format off #ifdef RGB_MATRIX_ENABLE const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { -/* Refer to SNLED27351 manual for these locations +/* Refer to snled27351manual for these locations * driver * | R location * | | G location diff --git a/keyboards/keychron/k11_max/ansi_encoder/white/info.json b/keyboards/keychron/k11_max/ansi_encoder/white/info.json index 87e2a2967c..6e904cac72 100644 --- a/keyboards/keychron/k11_max/ansi_encoder/white/info.json +++ b/keyboards/keychron/k11_max/ansi_encoder/white/info.json @@ -4,7 +4,16 @@ "device_version": "1.0.0" }, "features": { - "led_matrix": true + "led_matrix": true, + "encoder": true + }, + "encoder": { + "rotary": [ + { + "pin_a": "A8", + "pin_b": "C9" + } + ] }, "led_matrix": { "driver": "snled27351_spi", diff --git a/keyboards/keychron/k11_max/config.h b/keyboards/keychron/k11_max/config.h index 0d5601eaa0..3b062844b8 100644 --- a/keyboards/keychron/k11_max/config.h +++ b/keyboards/keychron/k11_max/config.h @@ -1,4 +1,4 @@ -/* Copyright 2024 ~ 2025 @ Keychron (https://www.keychron.com) +/* Copyright 2024 @ 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 @@ -19,19 +19,6 @@ #define ENCODER_DEFAULT_POS 0x3 #define ENCODER_MAP_KEY_DELAY 2 -#if defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE) || defined(LK_WIRELESS_ENABLE) -/* SPI configuration */ -# define SPI_DRIVER SPID1 -# define SPI_SCK_PIN A5 -# define SPI_MISO_PIN A6 -# define SPI_MOSI_PIN A7 -#endif - -#if defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE) -# define LED_DRIVER_SHUTDOWN_PIN B7 -# define SNLED23751_SPI_DIVISOR 16 -#endif - #ifdef LK_WIRELESS_ENABLE /* Hardware configuration */ # define P2P4_MODE_SELECT_PIN A10 @@ -56,19 +43,26 @@ # if defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE) +# define LED_DRIVER_SHUTDOWN_PIN B7 + # define BT_HOST_LED_MATRIX_LIST \ { 15, 16, 17 } + # define P2P4G_HOST_LED_MATRIX_LIST \ { 18 } + # define BAT_LEVEL_LED_LIST \ { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 } /* Backlit disable timeout when keyboard is disconnected(unit: second) */ # define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40 + /* Backlit disable timeout when keyboard is connected(unit: second) */ # define CONNECTED_BACKLIGHT_DISABLE_TIMEOUT 600 + /* Reinit LED driver on tranport changed */ # define REINIT_LED_DRIVER 1 + # endif /* Keep USB connection in blueooth mode */ @@ -77,6 +71,11 @@ /* Enable bluetooth NKRO */ # define WIRELESS_NKRO_ENABLE +/* Raw hid command for factory test and bluetooth DFU */ +# define RAW_HID_CMD 0xAA ... 0xAB +#else +/* Raw hid command for factory test */ +# define RAW_HID_CMD 0xAB #endif /* Factory test keys */ diff --git a/keyboards/keychron/k11_max/info.json b/keyboards/keychron/k11_max/info.json index 6e3a29a767..3e82a7d3d1 100644 --- a/keyboards/keychron/k11_max/info.json +++ b/keyboards/keychron/k11_max/info.json @@ -27,14 +27,6 @@ "dip_switch": { "pins": ["B14"] }, - "encoder": { - "rotary": [ - { - "pin_a": "A8", - "pin_b": "C9" - } - ] - }, "indicators": { "caps_lock": "A13", "on_state": 1 @@ -204,87 +196,7 @@ {"matrix":[4,14], "x":17.25, "y":4.5}, {"matrix":[4,15], "x":18.25, "y":4.5} ] - }, - "LAYOUT_73_jis": { - "layout": [ - {"matrix":[0, 0], "x":0.75, "y":0.25}, - {"matrix":[0, 1], "x":1.75, "y":0.25}, - {"matrix":[0, 2], "x":2.75, "y":0}, - {"matrix":[0, 3], "x":3.75, "y":0.25}, - {"matrix":[0, 4], "x":4.75, "y":0.25}, - {"matrix":[0, 5], "x":5.75, "y":0.25}, - {"matrix":[0, 6], "x":6.75, "y":0.25}, - {"matrix":[0, 7], "x":9.5, "y":0.25}, - {"matrix":[0, 8], "x":10.5, "y":0.25}, - {"matrix":[0, 9], "x":11.5, "y":0.25}, - {"matrix":[0,10], "x":12.5, "y":0.25}, - {"matrix":[0,11], "x":13.5, "y":0}, - {"matrix":[0,12], "x":14.5, "y":0.25}, - {"matrix":[0,13], "x":15.5, "y":0.25}, - {"matrix":[0,14], "x":15.5, "y":0.25}, - {"matrix":[0,15], "x":18, "y":0}, - - {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5}, - {"matrix":[1, 1], "x":2, "y":1.25}, - {"matrix":[1, 2], "x":3.25, "y":1.25}, - {"matrix":[1, 3], "x":4.25, "y":1.25}, - {"matrix":[1, 4], "x":5.25, "y":1.25}, - {"matrix":[1, 5], "x":6.25, "y":1.25}, - {"matrix":[1, 6], "x":9, "y":1.25}, - {"matrix":[1, 7], "x":10, "y":1.25}, - {"matrix":[1, 8], "x":11, "y":1.25}, - {"matrix":[1, 9], "x":12, "y":1.25}, - {"matrix":[1,10], "x":13.25, "y":1.25}, - {"matrix":[1,11], "x":14.25, "y":1.25}, - {"matrix":[1,12], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":18.25, "y":1.5}, - - {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75}, - {"matrix":[2, 1], "x":2, "y":2.25}, - {"matrix":[2, 2], "x":3.5, "y":2.25}, - {"matrix":[2, 3], "x":4.5, "y":2.25}, - {"matrix":[2, 4], "x":5.5, "y":2.25}, - {"matrix":[2, 5], "x":6.5, "y":2.25}, - {"matrix":[2, 6], "x":9.5, "y":2.25}, - {"matrix":[2, 7], "x":10.25, "y":2.25}, - {"matrix":[2, 8], "x":11.25, "y":2.25}, - {"matrix":[2, 9], "x":12.25, "y":2.25}, - {"matrix":[2,10], "x":13.25, "y":2.25}, - {"matrix":[2,11], "x":14.75, "y":2.25}, - {"matrix":[2,13], "x":15.75, "y":2.25, "w":2.25}, - {"matrix":[1,13], "x":16.75, "y":1.25, "w":1.25, "h":2}, - {"matrix":[2,15], "x":18.5, "y":2.5}, - - {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25}, - {"matrix":[3, 2], "x":2.25, "y":3.25}, - {"matrix":[3, 3], "x":3.75, "y":3.25}, - {"matrix":[3, 4], "x":4.75, "y":3.25}, - {"matrix":[3, 5], "x":5.75, "y":3.25}, - {"matrix":[3, 6], "x":6.75, "y":3.25}, - {"matrix":[3, 7], "x":8.5, "y":3.25}, - {"matrix":[3, 8], "x":9.5, "y":3.25}, - {"matrix":[3, 9], "x":10.5, "y":3.25}, - {"matrix":[3,10], "x":11.5, "y":3.25}, - {"matrix":[3,11], "x":12.5, "y":3.25}, - {"matrix":[3,12], "x":13.5, "y":3.25}, - {"matrix":[3,13], "x":14.25, "y":3.25}, - {"matrix":[3,14], "x":15.25, "y":3.25}, - {"matrix":[3,15], "x":17.25, "y":3.5}, - - {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, - {"matrix":[4, 1], "x":1.25, "y":4.25}, - {"matrix":[4, 2], "x":2.25, "y":4.25}, - {"matrix":[4, 3], "x":3.75, "y":4.25, "w":1.25}, - {"matrix":[4, 4], "x":5, "y":4.25, "w":2.25}, - {"matrix":[4, 6], "x":7.25, "y":4.25}, - {"matrix":[4, 7], "x":8.75, "y":4.25}, - {"matrix":[4, 9], "x":9.75, "y":4.25}, - {"matrix":[4,11], "x":10.75, "y":4.25}, - {"matrix":[4,12], "x":12.5, "y":4.25}, - {"matrix":[4,13], "x":16.25, "y":4.5}, - {"matrix":[4,14], "x":17.25, "y":4.5}, - {"matrix":[4,15], "x":18.25, "y":4.5} - ] } + } } diff --git a/keyboards/keychron/k11_max/iso_encoder/rgb/info.json b/keyboards/keychron/k11_max/iso_encoder/rgb/info.json index ee2871e590..8422f7e995 100644 --- a/keyboards/keychron/k11_max/iso_encoder/rgb/info.json +++ b/keyboards/keychron/k11_max/iso_encoder/rgb/info.json @@ -4,7 +4,16 @@ "device_version": "1.0.0" }, "features": { - "rgb_matrix": true + "rgb_matrix": true, + "encoder": true + }, + "encoder": { + "rotary": [ + { + "pin_a": "A8", + "pin_b": "C9" + } + ] }, "rgb_matrix": { "driver": "snled27351_spi", diff --git a/keyboards/keychron/k11_max/iso_encoder/rgb/rgb.c b/keyboards/keychron/k11_max/iso_encoder/rgb/rgb.c index 60803e7a18..13ab3d9aa1 100644 --- a/keyboards/keychron/k11_max/iso_encoder/rgb/rgb.c +++ b/keyboards/keychron/k11_max/iso_encoder/rgb/rgb.c @@ -19,7 +19,7 @@ // clang-format off #ifdef RGB_MATRIX_ENABLE const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { -/* Refer to SNLED27351 manual for these locations +/* Refer to snled27351manual for these locations * driver * | R location * | | G location diff --git a/keyboards/keychron/k11_max/iso_encoder/white/info.json b/keyboards/keychron/k11_max/iso_encoder/white/info.json index 51a1ebd748..bdd4d9c591 100644 --- a/keyboards/keychron/k11_max/iso_encoder/white/info.json +++ b/keyboards/keychron/k11_max/iso_encoder/white/info.json @@ -4,7 +4,16 @@ "device_version": "1.0.0" }, "features": { - "led_matrix": true + "led_matrix": true, + "encoder": true + }, + "encoder": { + "rotary": [ + { + "pin_a": "A8", + "pin_b": "C9" + } + ] }, "led_matrix": { "driver": "snled27351_spi", diff --git a/keyboards/keychron/k11_max/jis_encoder/rgb/config.h b/keyboards/keychron/k11_max/jis_encoder/rgb/config.h deleted file mode 100644 index c928db9850..0000000000 --- a/keyboards/keychron/k11_max/jis_encoder/rgb/config.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2025 @ 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 - -#ifdef RGB_MATRIX_ENABLE -/* RGB Matrix driver configuration */ -# define DRIVER_COUNT 2 -# define RGB_MATRIX_LED_COUNT 72 -# define DRIVER_CS_PINS \ - { B8, B9 } - -/* Set LED driver current */ -# define SNLED27351_CURRENT_TUNE \ - { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 } - -/* Set to infinit, which is use in USB mode by default */ -# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE -/* Allow shutdown of led driver to save power */ -# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE -/* Turn off backlight on low brightness to save power */ -# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 - -/* Indications */ -# define LOW_BAT_IND_INDEX \ - { 63, 66 } -# define DIM_CAPS_LOCK -# define CAPS_LOCK_INDEX 30 - -# define RGB_MATRIX_KEYPRESSES -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS - -#endif diff --git a/keyboards/keychron/k11_max/jis_encoder/rgb/info.json b/keyboards/keychron/k11_max/jis_encoder/rgb/info.json deleted file mode 100644 index 62a1bb0674..0000000000 --- a/keyboards/keychron/k11_max/jis_encoder/rgb/info.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "usb": { - "pid": "0x0AB5", - "device_version": "1.0.0" - }, - "features": { - "rgb_matrix": true - }, - "rgb_matrix": { - "driver": "snled27351_spi", - "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 - } - } -} diff --git a/keyboards/keychron/k11_max/jis_encoder/rgb/keymaps/default/keymap.c b/keyboards/keychron/k11_max/jis_encoder/rgb/keymaps/default/keymap.c deleted file mode 100644 index 263038063b..0000000000 --- a/keyboards/keychron/k11_max/jis_encoder/rgb/keymaps/default/keymap.c +++ /dev/null @@ -1,81 +0,0 @@ -/* Copyright 2025 @ 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 { - MAC_BASE, - WIN_BASE, - MAC_FN1, - WIN_FN1, - FN2, - }; - // clang-format off - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_73_jis( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_MUTE, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, MO(MAC_FN1), MO(FN2), KC_SPC, KC_LNG1, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT), - - [WIN_BASE] = LAYOUT_73_jis( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_MUTE, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, - KC_LCTL, KC_LWIN, KC_LALT, KC_INT5, KC_SPC, MO(WIN_FN1), MO(FN2), KC_SPC, KC_INT4, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), - - [MAC_FN1] = LAYOUT_73_jis( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, KC_PGUP, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______), - - [WIN_FN1] = LAYOUT_73_jis( - KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, KC_PGUP, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______), - - [FN2] = LAYOUT_73_jis( - KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) - }; - - #if defined(ENCODER_MAP_ENABLE) - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [WIN_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [FN2] = { ENCODER_CCW_CW(_______, _______)}, - }; - #endif // ENCODER_MAP_ENABLE - - // clang-format on - bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; - } diff --git a/keyboards/keychron/k11_max/jis_encoder/rgb/keymaps/via/keymap.c b/keyboards/keychron/k11_max/jis_encoder/rgb/keymaps/via/keymap.c deleted file mode 100644 index 5037354b86..0000000000 --- a/keyboards/keychron/k11_max/jis_encoder/rgb/keymaps/via/keymap.c +++ /dev/null @@ -1,81 +0,0 @@ -/* Copyright 2025 @ 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 { - MAC_BASE, - WIN_BASE, - MAC_FN1, - WIN_FN1, - FN2, -}; -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_73_jis( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_MUTE, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, MO(MAC_FN1), MO(FN2), KC_SPC, KC_LNG1, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT), - - [WIN_BASE] = LAYOUT_73_jis( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_MUTE, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, - KC_LCTL, KC_LWIN, KC_LALT, KC_INT5, KC_SPC, MO(WIN_FN1), MO(FN2), KC_SPC, KC_INT4, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), - - [MAC_FN1] = LAYOUT_73_jis( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, KC_PGUP, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______), - - [WIN_FN1] = LAYOUT_73_jis( - KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, KC_PGUP, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______), - - [FN2] = LAYOUT_73_jis( - KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) -}; - -#if defined(ENCODER_MAP_ENABLE) - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [WIN_FN1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [FN2] = { ENCODER_CCW_CW(_______, _______)}, - }; -#endif // ENCODER_MAP_ENABLE - -// clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/k11_max/jis_encoder/rgb/keymaps/via/rules.mk b/keyboards/keychron/k11_max/jis_encoder/rgb/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/keychron/k11_max/jis_encoder/rgb/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/keychron/k11_max/jis_encoder/rgb/rgb.c b/keyboards/keychron/k11_max/jis_encoder/rgb/rgb.c deleted file mode 100644 index fe1cd2bb5c..0000000000 --- a/keyboards/keychron/k11_max/jis_encoder/rgb/rgb.c +++ /dev/null @@ -1,135 +0,0 @@ -/* Copyright 2025 @ 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" - -// clang-format off -#ifdef RGB_MATRIX_ENABLE -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, A_1, C_1, B_1}, - {0, A_2, C_2, B_2}, - {0, A_3, C_3, B_3}, - {0, A_4, C_4, B_4}, - {0, A_5, C_5, B_5}, - {0, A_6, C_6, B_6}, - {0, A_7, C_7, B_7}, - {0, A_8, C_8, B_8}, - {0, A_9, C_9, B_9}, - {0, A_10, C_10, B_10}, - {0, A_11, C_11, B_11}, - {0, A_12, C_12, B_12}, - {0, A_13, C_13, B_13}, - {0, A_14, C_14, B_14}, - {0, A_15, C_15, B_15}, - - {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_16, D_16, E_16}, - - {1, I_1, G_1, H_1}, - {1, I_2, G_2, H_2}, - {1, I_3, G_3, H_3}, - {1, I_4, G_4, H_4}, - {1, I_5, G_5, H_5}, - {1, I_6, G_6, H_6}, - {1, I_7, G_7, H_7}, - {1, I_8, G_8, H_8}, - {1, I_9, G_9, H_9}, - {1, I_10, G_10, H_10}, - {1, I_11, G_11, H_11}, - {1, I_12, G_12, H_12}, - {1, I_14, G_14, H_14}, - {1, I_16, G_16, H_16}, - - {1, C_1, A_1, B_1}, - {1, C_3, A_3, B_3}, - {1, C_4, A_4, B_4}, - {1, C_5, A_5, B_5}, - {1, C_6, A_6, B_6}, - {1, C_7, A_7, B_7}, - {1, C_8, A_8, B_8}, - {1, C_9, A_9, B_9}, - {1, C_10, A_10, B_10}, - {1, C_11, A_11, B_11}, - {1, C_12, A_12, B_12}, - {1, C_13, A_13, B_13}, - {1, C_14, A_14, B_14}, - {1, C_15, A_15, B_15}, - {1, C_16, A_16, B_16}, - - {1, F_1, D_1, E_1}, - {1, F_2, D_2, E_2}, - {1, F_3, D_3, E_3}, - {1, F_4, D_4, E_4}, - {1, F_5, D_5, E_5}, - {1, F_7, D_7, E_7}, - {1, F_8, D_8, E_8}, - {1, F_10, D_10, E_10}, - {1, F_12, D_12, E_12}, - {1, F_13, D_13, E_13}, - {1, F_14, D_14, E_14}, - {1, F_15, D_15, E_15}, - {1, F_16, D_16, E_16} -}; - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to LED Index - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, __ }, - { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, __, 29 }, - { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, __, 42, __, 43 }, - { 44, __, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58 }, - { 59, 60, 61, 62, 63, __, 64, 65, __, 66, __, 67, 68, 69, 70, 71 }, - }, - { - // LED Index to Physical Position - {8, 1}, {20, 1}, {33, 0}, {48, 3}, {61, 6}, {74, 8}, {86,11}, {106,11}, {119, 8}, {132, 6}, {145, 3}, {160, 0}, {173, 1}, {186, 1}, {199, 1}, - {8,14}, {24,14}, {39,14}, {52,17}, {65,20}, {78,22}, {103,25},{116,22}, {129,20}, {142,17}, {155,14}, {171,14}, {184,14}, {204,20}, {222,14}, - {8,27}, {24,27}, {39,28}, {52,30}, {65,33}, {78,36}, {109,37},{122,34}, {135,32}, {148,29}, {162,27}, {176,27}, {190,27}, {224,27}, - {8,40}, {28,40}, {43,42}, {56,44}, {69,47}, {82,50}, {102,52},{115,49}, {128,46}, {141,44}, {154,44}, {169,40}, {182,40}, {196,40}, {209,43}, - {0,53}, {15,53}, {28,53}, {42,55}, {65,60}, {86,64}, {107,64}, {131,59}, {156,54}, {169,53}, {196,56}, {209,56}, {222,56}, - }, - { - // LED Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - } -}; - -#endif diff --git a/keyboards/keychron/k11_max/jis_encoder/rgb/rules.mk b/keyboards/keychron/k11_max/jis_encoder/rgb/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/k11_max/jis_encoder/rgb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/k11_max/jis_encoder/white/config.h b/keyboards/keychron/k11_max/jis_encoder/white/config.h deleted file mode 100644 index 966958a001..0000000000 --- a/keyboards/keychron/k11_max/jis_encoder/white/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright 2025 @ 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 - -#ifdef LED_MATRIX_ENABLE -/* LED matrix driver configuration */ -# define DRIVER_COUNT 1 -# define LED_MATRIX_LED_COUNT 72 -# define LED_MATRIX_VAL_STEP 16 -# define DRIVER_CS_PINS \ - { B9 } - -/* Set LED driver scan phase */ -# define SNLED27351_PHASE_CHANNEL MSKPHASE_6CHANNEL -/* Set LED driver current */ -# define SNLED27351_CURRENT_TUNE \ - { 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50 } - -/* Set to infinit, which is use in USB mode by default */ -# define LED_MATRIX_TIMEOUT LED_MATRIX_TIMEOUT_INFINITE -/* Allow shutdown of led driver to save power */ -# define LED_MATRIX_DRIVER_SHUTDOWN_ENABLE -/* Turn off backlight on low brightness to save power */ -# define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 - -/* Indications */ -# define DIM_CAPS_LOCK -# define CAPS_LOCK_INDEX 30 - -/* Low battery indicating led */ -# define LOW_BAT_IND_INDEX \ - { 63, 66 } - -# define LED_MATRIX_KEYPRESSES - -# define VOLTAGE_TRIM_LED_MATRIX 200 -#endif diff --git a/keyboards/keychron/k11_max/jis_encoder/white/info.json b/keyboards/keychron/k11_max/jis_encoder/white/info.json deleted file mode 100644 index c24cb3487f..0000000000 --- a/keyboards/keychron/k11_max/jis_encoder/white/info.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "usb": { - "pid": "0x0ABB", - "device_version": "1.0.0" - }, - "features": { - "led_matrix": true - }, - "led_matrix": { - "driver": "snled27351_spi", - "animations": { - "none": true, - "solid": true, - "breathing": true, - "band_pinwheel": true, - "band_spiral": true, - "cycle_left_right": true, - "cycle_up_down": true, - "cycle_out_in": true, - "dual_beacon": true, - "solid_reactive_simple": true, - "solid_reactive_multiwide": true, - "solid_reactive_multinexus": true, - "solid_splash": true, - "wave_left_right": true, - "wave_up_down": true - } - } -} diff --git a/keyboards/keychron/k11_max/jis_encoder/white/keymaps/default/keymap.c b/keyboards/keychron/k11_max/jis_encoder/white/keymaps/default/keymap.c deleted file mode 100644 index cd47ccb89a..0000000000 --- a/keyboards/keychron/k11_max/jis_encoder/white/keymaps/default/keymap.c +++ /dev/null @@ -1,82 +0,0 @@ -/* Copyright 2025 @ 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{ - MAC_BASE, - WIN_BASE, - MAC_FN1, - WIN_FN1, - FN2, - }; - // clang-format off - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_73_jis( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_MUTE, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, MO(MAC_FN1), MO(FN2), KC_SPC, KC_LNG1, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT), - - [WIN_BASE] = LAYOUT_73_jis( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_MUTE, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, - KC_LCTL, KC_LWIN, KC_LALT, KC_INT5, KC_SPC, MO(WIN_FN1), MO(FN2), KC_SPC, KC_INT4, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), - - [MAC_FN1] = LAYOUT_73_jis( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, _______, BL_DOWN, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, KC_PGUP, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______), - - [WIN_FN1] = LAYOUT_73_jis( - KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, _______, BL_DOWN, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, KC_PGUP, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______), - - [FN2] = LAYOUT_73_jis( - KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) - }; - - #if defined(ENCODER_MAP_ENABLE) - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN1] = { ENCODER_CCW_CW(BL_DOWN, BL_UP)}, - [WIN_FN1] = { ENCODER_CCW_CW(BL_DOWN, BL_UP)}, - [FN2] = { ENCODER_CCW_CW(_______, _______)}, - }; - #endif // ENCODER_MAP_ENABLE - - // clang-format on - bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; - } - diff --git a/keyboards/keychron/k11_max/jis_encoder/white/keymaps/via/keymap.c b/keyboards/keychron/k11_max/jis_encoder/white/keymaps/via/keymap.c deleted file mode 100644 index 45d8cebf16..0000000000 --- a/keyboards/keychron/k11_max/jis_encoder/white/keymaps/via/keymap.c +++ /dev/null @@ -1,82 +0,0 @@ -/* Copyright 2025 @ 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{ - MAC_BASE, - WIN_BASE, - MAC_FN1, - WIN_FN1, - FN2, -}; -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_73_jis( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_MUTE, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, MO(MAC_FN1), MO(FN2), KC_SPC, KC_LNG1, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT), - - [WIN_BASE] = LAYOUT_73_jis( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_MUTE, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, - KC_LCTL, KC_LWIN, KC_LALT, KC_INT5, KC_SPC, MO(WIN_FN1), MO(FN2), KC_SPC, KC_INT4, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), - - [MAC_FN1] = LAYOUT_73_jis( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, _______, BL_DOWN, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, KC_PGUP, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______), - - [WIN_FN1] = LAYOUT_73_jis( - KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, _______, BL_DOWN, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, KC_PGUP, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______), - - [FN2] = LAYOUT_73_jis( - KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN1] = { ENCODER_CCW_CW(BL_DOWN, BL_UP)}, - [WIN_FN1] = { ENCODER_CCW_CW(BL_DOWN, BL_UP)}, - [FN2] = { ENCODER_CCW_CW(_______, _______)}, -}; -#endif // ENCODER_MAP_ENABLE - -// clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} - diff --git a/keyboards/keychron/k11_max/jis_encoder/white/keymaps/via/rules.mk b/keyboards/keychron/k11_max/jis_encoder/white/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/keychron/k11_max/jis_encoder/white/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/keychron/k11_max/jis_encoder/white/rules.mk b/keyboards/keychron/k11_max/jis_encoder/white/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/k11_max/jis_encoder/white/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/k11_max/jis_encoder/white/white.c b/keyboards/keychron/k11_max/jis_encoder/white/white.c deleted file mode 100644 index 9e31272000..0000000000 --- a/keyboards/keychron/k11_max/jis_encoder/white/white.c +++ /dev/null @@ -1,133 +0,0 @@ -/* Copyright 2025 @ 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" - -// clang-format off -#ifdef LED_MATRIX_ENABLE -const snled27351_led_t g_snled27351_leds[LED_MATRIX_LED_COUNT] = { -/* Refer to SNLED27351 manual for these locations - * driver - * | LED address - * | | */ - {0, E_1}, - {0, E_2}, - {0, E_3}, - {0, E_4}, - {0, E_5}, - {0, E_6}, - {0, E_7}, - {0, E_8}, - {0, E_9}, - {0, E_10}, - {0, E_11}, - {0, E_12}, - {0, E_13}, - {0, E_14}, - {0, E_15}, - - {0, D_1}, - {0, D_2}, - {0, D_3}, - {0, D_4}, - {0, D_5}, - {0, D_6}, - {0, D_7}, - {0, D_8}, - {0, D_9}, - {0, D_10}, - {0, D_11}, - {0, D_12}, - {0, D_13}, - {0, D_14}, - {0, D_16}, - - {0, C_1}, - {0, C_2}, - {0, C_3}, - {0, C_4}, - {0, C_5}, - {0, C_6}, - {0, C_7}, - {0, C_8}, - {0, C_9}, - {0, C_10}, - {0, C_11}, - {0, C_12}, - {0, C_14}, - {0, C_16}, - - {0, B_1}, - {0, B_3}, - {0, B_4}, - {0, B_5}, - {0, B_6}, - {0, B_7}, - {0, B_8}, - {0, B_9}, - {0, B_10}, - {0, B_11}, - {0, B_12}, - {0, B_13}, - {0, B_14}, - {0, B_15}, - {0, B_16}, - - {0, A_1}, - {0, A_2}, - {0, A_3}, - {0, A_4}, - {0, A_5}, - {0, A_7}, - {0, A_8}, - {0, A_10}, - {0, A_12}, - {0, A_13}, - {0, A_14}, - {0, A_15}, - {0, A_16}, -}; - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to LED Index - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, __ }, - { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, __, 29 }, - { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, __, 42, __, 43 }, - { 44, __, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58 }, - { 59, 60, 61, 62, 63, __, 64, 65, __, 66, __, 67, 68, 69, 70, 71 }, - }, - { - // LED Index to Physical Position - {8, 1}, {20, 1}, {33, 0}, {48, 3}, {61, 6}, {74, 8}, {86,11}, {106,11}, {119, 8}, {132, 6}, {145, 3}, {160, 0}, {173, 1}, {186, 1}, {199, 1}, - {8,14}, {24,14}, {39,14}, {52,17}, {65,20}, {78,22}, {103,25},{116,22}, {129,20}, {142,17}, {155,14}, {171,14}, {184,14}, {204,20}, {222,14}, - {8,27}, {24,27}, {39,28}, {52,30}, {65,33}, {78,36}, {109,37},{122,34}, {135,32}, {148,29}, {162,27}, {176,27}, {190,27}, {224,27}, - {8,40}, {28,40}, {43,42}, {56,44}, {69,47}, {82,50}, {102,52},{115,49}, {128,46}, {141,44}, {154,44}, {169,40}, {182,40}, {196,40}, {209,43}, - {0,53}, {15,53}, {28,53}, {42,55}, {65,60}, {86,64}, {107,64}, {131,59}, {156,54}, {169,53}, {196,56}, {209,56}, {222,56}, - }, - { - // LED Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - } -}; - -#endif diff --git a/keyboards/keychron/k11_max/via_json/k11_max_jis_rgb_encoder.json b/keyboards/keychron/k11_max/via_json/k11_max_jis_rgb_encoder.json deleted file mode 100644 index 431c8387be..0000000000 --- a/keyboards/keychron/k11_max/via_json/k11_max_jis_rgb_encoder.json +++ /dev/null @@ -1,358 +0,0 @@ -{ - "name": "Keychron K11 Max JIS RGB Knob", - "vendorId": "0x3434", - "productId": "0x0AB5", - "keycodes": ["qmk_lighting"], - "menus": [ - { - "label": "Lighting", - "content": [ - { - "label": "Backlight", - "content": [ - { - "label": "Brightness", - "type": "range", - "options": [0, 255], - "content": ["id_qmk_rgb_matrix_brightness", 3, 1] - }, - { - "label": "Effect", - "type": "dropdown", - "content": ["id_qmk_rgb_matrix_effect", 3, 2], - "options": [ - ["None", 0], - ["Solid Color", 1], - ["Breathing", 2], - ["Band Spiral Val", 3], - ["Cycle All", 4], - ["Cycle Left Right", 5], - ["Cycle Up Down", 6], - ["Rainbow Moving Chevron", 7], - ["Cycle Out In", 8], - ["Cycle Out In Dual", 9], - ["Cycle Pinwheel", 10], - ["Cycle Spiral", 11], - ["Dual Beacon", 12], - ["Rainbow Beacon", 13], - ["Jellybean Raindrops", 14], - ["Pixel Rain", 15], - ["Typing Heatmap", 16], - ["Digital Rain", 17], - ["Reactive Simple", 18], - ["Reactive Multiwide", 19], - ["Reactive Multinexus", 20], - ["Splash", 21], - ["Solid Splash", 22] - ] - }, - { - "showIf": "{id_qmk_rgb_matrix_effect} > 1", - "label": "Effect Speed", - "type": "range", - "options": [0, 255], - "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] - }, - { - "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ", - "label": "Color", - "type": "color", - "content": ["id_qmk_rgb_matrix_color", 3, 4] - } - ] - } - ] - } - ], - "customKeycodes": [ - {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"}, - {"name": "Misson Control", "title": "Misson Control in Mac", "shortName": "MCtl"}, - {"name": "Lanuch Pad", "title": "Lanuch Pad in Windows", "shortName": "LPad"}, - {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"}, - {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"}, - {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, - {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, - {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"}, - {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} - ], - "matrix": {"rows": 5, "cols": 16}, - "layouts": { - "keymap": [ - [ - { - "x": 2.75 - }, - "0,2", - { - "x": 8.85 - }, - "0,11" - ], - [ - { - "y": -0.95, - "x": 0.75, - "c": "#777777" - }, - "0,0\nESC", - { - "c": "#cccccc" - }, - "0,1" - ], - [ - { - "y": -0.85, - "x": 14.6, - "c": "#aaaaaa" - }, - "0,13", - "0,14", - { - "x": 0.5 - }, - "0,15\n\n\n\n\n\n\n\n\ne0" - ], - [ - { - "y": -1, - "x": 13.6, - "c": "#cccccc" - }, - "0,12" - ], - [ - { - "y": -0.15, - "x": 0.5, - "c": "#aaaaaa", - "w": 1.5 - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1" - ], - [ - { - "y": -0.85, - "x": 13.6 - }, - "1,11", - "1,12", - { - "x": 0.25, - "c": "#aaaaaa", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "1,13", - { - "x": 0.25 - }, - "1,15" - ], - [ - { - "y": -0.15, - "x": 0.25, - "w": 1.75 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1" - ], - [ - { - "y": -0.85, - "x": 12.85 - }, - "2,10", - "2,11", - { - "c": "#aaaaaa" - }, - "2,13", - { - "x": 1.75 - }, - "2,15" - ], - [ - { - "y": -0.15, - "w": 2.25 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,2" - ], - [ - { - "y": -0.85, - "x": 13.3 - }, - "3,12", - { - "c": "#aaaaaa" - }, - "3,13", - "3,14" - ], - [ - { - "y": -0.75, - "x": 16.3, - "c": "#cccccc" - }, - "3,15" - ], - [ - { - "y": -0.4, - "c": "#aaaaaa", - "w": 1.25 - }, - "4,0", - "4,1", - "4,2" - ], - [ - { - "y": -0.85, - "x":13.3 - }, - "4,12" - ], - [ - { - "y": -0.76, - "x": 15.3, - "c": "#cccccc" - }, - "4,13", - "4,14", - "4,15" - ], - [ - { - "r": 6, - "y": -5.7, - "x": 3.85, - "c": "#cccccc" - }, - "0,3", - "0,4", - "0,5", - "0,6" - ], - [ - { - "x": 3.3 - }, - "1,2", - "1,3", - "1,4", - "1,5" - ], - [ - { - "x": 3.55 - }, - "2,2", - "2,3", - "2,4", - "2,5" - ], - [ - { - "x": 3.9 - }, - "3,3", - "3,4", - "3,5", - "3,6" - ], - [ - { - "x": 4.2, - "c": "#aaaaaa" - }, - "4,3", - { - "w": 2.25 - }, - "4,4", - "4,6" - ], - [ - { - "r": -6, - "y": -3.3, - "x": 8.45, - "c": "#cccccc" - }, - "0,7", - "0,8", - "0,9", - "0,10" - ], - [ - { - "x": 8.0 - }, - "1,6", - "1,7", - "1,8", - "1,9", - "1,10" - ], - [ - { - "x": 8.35 - }, - "2,6", - "2,7", - "2,8", - "2,9" - ], - [ - { - "x": 7.65 - }, - "3,7", - "3,8", - "3,9", - "3,10", - "3,11" - ], - [ - { - "x": 7.65, - "c": "#aaaaaa" - }, - "4,7", - { - "w": 2.75 - }, - "4,9", - "4,11" - ] - ] - } -} \ No newline at end of file diff --git a/keyboards/keychron/k11_max/via_json/k11_max_jis_white_encoder.json b/keyboards/keychron/k11_max/via_json/k11_max_jis_white_encoder.json deleted file mode 100644 index cc991ee4b4..0000000000 --- a/keyboards/keychron/k11_max/via_json/k11_max_jis_white_encoder.json +++ /dev/null @@ -1,297 +0,0 @@ -{ - "name": "Keychron K11 Max JIS White Knob", - "vendorId": "0x3434", - "productId": "0x0ABB", - "keycodes": ["qmk_lighting"], - "customKeycodes": [ - {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"}, - {"name": "Misson Control", "title": "Misson Control in Mac", "shortName": "MCtl"}, - {"name": "Lanuch Pad", "title": "Lanuch Pad in Windows", "shortName": "LPad"}, - {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"}, - {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"}, - {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, - {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, - {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"}, - {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} - ], - "matrix": {"rows": 5, "cols": 16}, - "layouts": { - "keymap": [ - [ - { - "x": 2.75 - }, - "0,2", - { - "x": 8.85 - }, - "0,11" - ], - [ - { - "y": -0.95, - "x": 0.75, - "c": "#777777" - }, - "0,0\nESC", - { - "c": "#cccccc" - }, - "0,1" - ], - [ - { - "y": -0.85, - "x": 14.6, - "c": "#aaaaaa" - }, - "0,13", - "0,14", - { - "x": 0.5 - }, - "0,15\n\n\n\n\n\n\n\n\ne0" - ], - [ - { - "y": -1, - "x": 13.6, - "c": "#cccccc" - }, - "0,12" - ], - [ - { - "y": -0.15, - "x": 0.5, - "c": "#aaaaaa", - "w": 1.5 - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1" - ], - [ - { - "y": -0.85, - "x": 13.6 - }, - "1,11", - "1,12", - { - "x": 0.25, - "c": "#aaaaaa", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "1,13", - { - "x": 0.25 - }, - "1,15" - ], - [ - { - "y": -0.15, - "x": 0.25, - "w": 1.75 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1" - ], - [ - { - "y": -0.85, - "x": 12.85 - }, - "2,10", - "2,11", - { - "c": "#aaaaaa" - }, - "2,13", - { - "x": 1.75 - }, - "2,15" - ], - [ - { - "y": -0.15, - "w": 2.25 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,2" - ], - [ - { - "y": -0.85, - "x": 13.3 - }, - "3,12", - { - "c": "#aaaaaa" - }, - "3,13", - "3,14" - ], - [ - { - "y": -0.75, - "x": 16.3, - "c": "#cccccc" - }, - "3,15" - ], - [ - { - "y": -0.4, - "c": "#aaaaaa", - "w": 1.25 - }, - "4,0", - "4,1", - "4,2" - ], - [ - { - "y": -0.85, - "x":13.3 - }, - "4,12" - ], - [ - { - "y": -0.76, - "x": 15.3, - "c": "#cccccc" - }, - "4,13", - "4,14", - "4,15" - ], - [ - { - "r": 6, - "y": -5.7, - "x": 3.85, - "c": "#cccccc" - }, - "0,3", - "0,4", - "0,5", - "0,6" - ], - [ - { - "x": 3.3 - }, - "1,2", - "1,3", - "1,4", - "1,5" - ], - [ - { - "x": 3.55 - }, - "2,2", - "2,3", - "2,4", - "2,5" - ], - [ - { - "x": 3.9 - }, - "3,3", - "3,4", - "3,5", - "3,6" - ], - [ - { - "x": 4.2, - "c": "#aaaaaa" - }, - "4,3", - { - "w": 2.25 - }, - "4,4", - "4,6" - ], - [ - { - "r": -6, - "y": -3.3, - "x": 8.45, - "c": "#cccccc" - }, - "0,7", - "0,8", - "0,9", - "0,10" - ], - [ - { - "x": 8.0 - }, - "1,6", - "1,7", - "1,8", - "1,9", - "1,10" - ], - [ - { - "x": 8.35 - }, - "2,6", - "2,7", - "2,8", - "2,9" - ], - [ - { - "x": 7.65 - }, - "3,7", - "3,8", - "3,9", - "3,10", - "3,11" - ], - [ - { - "x": 7.65, - "c": "#aaaaaa" - }, - "4,7", - { - "w": 2.75 - }, - "4,9", - "4,11" - ] - ] - } -} \ No newline at end of file diff --git a/keyboards/keychron/k17_max/ansi_encoder/rgb/config.h b/keyboards/keychron/k17_max/ansi_encoder/rgb/config.h deleted file mode 100644 index 8f36bcb0f3..0000000000 --- a/keyboards/keychron/k17_max/ansi_encoder/rgb/config.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2024 @ 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 - -#ifdef RGB_MATRIX_ENABLE -/* RGB Matrix driver configuration */ -# define RGB_MATRIX_LED_COUNT 103 -# define DRIVER_COUNT 2 -# define DRIVER_CS_PINS \ - { B8, B9 } - -/* Scan phase of led driver set as MSKPHASE_12CHANNEL(defined as 0x03 in snled27351.h) */ -# define SNLED27351_PHASE_CHANNEL MSKPHASE_12CHANNEL -/* Set LED driver current */ -# define SNLED27351_CURRENT_TUNE \ - { 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14 } - -/* Set to infinit, which is use in USB mode by default */ -# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE -/* Allow shutdown of led driver to save power */ -# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE -/* Turn off backlight on low brightness to save power */ -# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 - -/* Indications */ -# define CAPS_LOCK_INDEX 57 -# define NUM_LOCK_INDEX 34 -# define LOW_BAT_IND_INDEX \ - { 94 } -# define BT_HOST_LED_MATRIX_LIST \ - { 20, 21, 22 } -# define P2P4G_HOST_LED_MATRIX_LIST \ - { 23 } -# define BAT_LEVEL_LED_LIST \ - { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 } - -# define RGB_MATRIX_KEYPRESSES -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS - -#endif diff --git a/keyboards/keychron/k17_max/ansi_encoder/rgb/info.json b/keyboards/keychron/k17_max/ansi_encoder/rgb/info.json deleted file mode 100644 index 233f029566..0000000000 --- a/keyboards/keychron/k17_max/ansi_encoder/rgb/info.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "usb": { - "pid": "0x0A00", - "device_version": "1.0.0" - }, - "features": { - "rgb_matrix": true - }, - "matrix_pins": { - "cols": ["C6", "C7", "C8", "A14", "A15", "C10", "C11", "C13", "C14", "C15", "C0", "C1", "C2", "C3", "A0", "A1", "A2", "A3", "C5", "B10"], - "rows": ["C12", "D2", "B3", "B4", "B5", "B6"] - }, - "layouts": { - "LAYOUT_104_ansi": { - "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":[0,4], "x":4, "y":0}, - {"matrix":[0,5], "x":5, "y":0}, - {"matrix":[0,6], "x":6, "y":0}, - {"matrix":[0,7], "x":7, "y":0}, - {"matrix":[0,8], "x":8, "y":0}, - {"matrix":[0,9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0}, - {"matrix":[0,14], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, - {"matrix":[0,16], "x":16.5, "y":0}, - {"matrix":[0,17], "x":17.5, "y":0}, - {"matrix":[0,18], "x":18.5, "y":0}, - {"matrix":[0,19], "x":19.5, "y":0}, - - {"matrix":[1,0], "x":0, "y":1.25}, - {"matrix":[1,1], "x":1, "y":1.25}, - {"matrix":[1,2], "x":2, "y":1.25}, - {"matrix":[1,3], "x":3, "y":1.25}, - {"matrix":[1,4], "x":4, "y":1.25}, - {"matrix":[1,5], "x":5, "y":1.25}, - {"matrix":[1,6], "x":6, "y":1.25}, - {"matrix":[1,7], "x":7, "y":1.25}, - {"matrix":[1,8], "x":8, "y":1.25}, - {"matrix":[1,9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,14], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.25, "y":1.25}, - {"matrix":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[1,18], "x":18.5, "y":1.25}, - {"matrix":[1,19], "x":19.5, "y":1.25}, - - {"matrix":[2,0], "x":0, "y":2.25, "w":1.5}, - {"matrix":[2,1], "x":1.5, "y":2.25}, - {"matrix":[2,2], "x":2.5, "y":2.25}, - {"matrix":[2,3], "x":3.5, "y":2.25}, - {"matrix":[2,4], "x":4.5, "y":2.25}, - {"matrix":[2,5], "x":5.5, "y":2.25}, - {"matrix":[2,6], "x":6.5, "y":2.25}, - {"matrix":[2,7], "x":7.5, "y":2.25}, - {"matrix":[2,8], "x":8.5, "y":2.25}, - {"matrix":[2,9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,15], "x":15.25, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.5, "y":2.25}, - {"matrix":[2,18], "x":18.5, "y":2.25}, - {"matrix":[2,19], "x":19.5, "y":2.25, "h":2}, - - {"matrix":[3,0], "x":0, "y":3.25, "w":1.75}, - {"matrix":[3,1], "x":1.75, "y":3.25}, - {"matrix":[3,2], "x":2.75, "y":3.25}, - {"matrix":[3,3], "x":3.75, "y":3.25}, - {"matrix":[3,4], "x":4.75, "y":3.25}, - {"matrix":[3,5], "x":5.75, "y":3.25}, - {"matrix":[3,6], "x":6.75, "y":3.25}, - {"matrix":[3,7], "x":7.75, "y":3.25}, - {"matrix":[3,8], "x":8.75, "y":3.25}, - {"matrix":[3,9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, - {"matrix":[3,15], "x":15.25, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[3,18], "x":18.5, "y":3.25}, - - {"matrix":[4,0], "x":0, "y":4.25, "w":2.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}, - {"matrix":[4,5], "x":5.25, "y":4.25}, - {"matrix":[4,6], "x":6.25, "y":4.25}, - {"matrix":[4,7], "x":7.25, "y":4.25}, - {"matrix":[4,8], "x":8.25, "y":4.25}, - {"matrix":[4,9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "y":4.25}, - {"matrix":[4,18], "x":18.5, "y":4.25}, - {"matrix":[4,19], "x":19.5, "y":4.25, "h":2}, - - {"matrix":[5,0], "x":0, "y":5.25, "w":1.25}, - {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25}, - {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25}, - {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.25}, - {"matrix":[5,14], "x":14.25, "y":5.25}, - {"matrix":[5,15], "x":15.25, "y":5.25}, - {"matrix":[5,16], "x":16.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":18.5, "y":5.25} - ] - } - }, - "rgb_matrix": { - "driver": "snled27351_spi", - "sleep": true, - "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 - } - } -} diff --git a/keyboards/keychron/k17_max/ansi_encoder/rgb/keymaps/default/keymap.c b/keyboards/keychron/k17_max/ansi_encoder/rgb/keymaps/default/keymap.c deleted file mode 100644 index 0587c2e1cd..0000000000 --- a/keyboards/keychron/k17_max/ansi_encoder/rgb/keymaps/default/keymap.c +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright 2024 @ 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{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN, -}; - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_104_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, RGB_MOD, KC_DEL, KC_F13, KC_F14, KC_F15, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - - [MAC_FN] = LAYOUT_104_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, _______, _______, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - - [WIN_BASE] = LAYOUT_104_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, RGB_MOD, KC_DEL, _______, _______, _______, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - - [WIN_FN] = LAYOUT_104_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, _______, _______, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, -}; -#endif - -// clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/k17_max/ansi_encoder/rgb/keymaps/via/keymap.c b/keyboards/keychron/k17_max/ansi_encoder/rgb/keymaps/via/keymap.c deleted file mode 100644 index e97074bbda..0000000000 --- a/keyboards/keychron/k17_max/ansi_encoder/rgb/keymaps/via/keymap.c +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright 2024 @ 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{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN, -}; - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_104_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, RGB_MOD, KC_DEL, KC_F13, KC_F14, KC_F15, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - - [MAC_FN] = LAYOUT_104_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, _______, _______, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - - [WIN_BASE] = LAYOUT_104_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, RGB_MOD, KC_DEL, _______, _______, _______, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - - [WIN_FN] = LAYOUT_104_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, _______, _______, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, -}; -#endif - -// clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/k17_max/ansi_encoder/rgb/keymaps/via/rules.mk b/keyboards/keychron/k17_max/ansi_encoder/rgb/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/keychron/k17_max/ansi_encoder/rgb/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/keychron/k17_max/ansi_encoder/rgb/rgb.c b/keyboards/keychron/k17_max/ansi_encoder/rgb/rgb.c deleted file mode 100644 index 3c7599fa29..0000000000 --- a/keyboards/keychron/k17_max/ansi_encoder/rgb/rgb.c +++ /dev/null @@ -1,169 +0,0 @@ -/* Copyright 2024 @ 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" - -// clang-format off -#ifdef RGB_MATRIX_ENABLE -const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { -/* Refer to SNLED27351 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ - {0, G_1, I_1, H_1}, - {0, G_2, I_2, H_2}, - {0, G_3, I_3, H_3}, - {0, G_4, I_4, H_4}, - {0, G_5, I_5, H_5}, - {0, G_6, I_6, H_6}, - {0, G_7, I_7, H_7}, - {0, G_8, I_8, H_8}, - {0, G_9, I_9, H_9}, - {0, G_10, I_10, H_10}, - {0, G_11, I_11, H_11}, - {0, G_12, I_12, H_12}, - {0, G_13, I_13, H_13}, - {0, G_14, I_14, H_14}, - {0, G_15, I_15, H_15}, - {0, G_16, I_16, H_16}, - {1, D_8, F_8, E_8}, - {1, D_9, F_9, E_9}, - {1, D_10, F_10, E_10}, - - {0, D_1, F_1, E_1}, - {0, D_2, F_2, E_2}, - {0, D_3, F_3, E_3}, - {0, D_4, F_4, E_4}, - {0, D_5, F_5, E_5}, - {0, D_6, F_6, E_6}, - {0, D_7, F_7, E_7}, - {0, D_8, F_8, E_8}, - {0, D_9, F_9, E_9}, - {0, D_10, F_10, E_10}, - {0, D_11, F_11, E_11}, - {0, D_12, F_12, E_12}, - {0, D_13, F_13, E_13}, - {0, D_15, F_15, E_15}, - {0, D_16, F_16, E_16}, - {0, J_7, L_7, K_7}, - {0, J_8, L_8, K_8}, - {0, J_9, L_9, K_9}, - {0, J_10, L_10, K_10}, - - {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, 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_15, A_15, B_15}, - {0, C_16, A_16, B_16}, - {0, J_12, L_12, K_12}, - {0, J_13, L_13, K_13}, - {0, J_14, L_14, K_14}, - {0, J_15, L_15, K_15}, - - {1, G_1, I_1, H_1}, - {1, G_2, I_2, H_2}, - {1, G_3, I_3, H_3}, - {1, G_4, I_4, H_4}, - {1, G_5, I_5, H_5}, - {1, G_6, I_6, H_6}, - {1, G_7, I_7, H_7}, - {1, G_8, I_8, H_8}, - {1, G_9, I_9, H_9}, - {1, G_10, I_10, H_10}, - {1, G_11, I_11, H_11}, - {1, G_12, I_12, H_12}, - {1, G_14, I_14, H_14}, - {1, G_16, I_16, H_16}, - {1, J_7, L_7, K_7}, - {1, J_8, L_8, K_8}, - {1, J_9, L_9, K_9}, - - {1, A_1, C_1, B_1}, - {1, A_3, C_3, B_3}, - {1, A_4, C_4, B_4}, - {1, A_5, C_5, B_5}, - {1, A_6, C_6, B_6}, - {1, A_7, C_7, B_7}, - {1, A_8, C_8, B_8}, - {1, A_9, C_9, B_9}, - {1, A_10, C_10, B_10}, - {1, A_11, C_11, B_11}, - {1, A_12, C_12, B_12}, - {1, A_13, C_13, B_13}, - {1, A_15, C_15, B_15}, - {1, J_10, L_10, K_10}, - {1, J_11, L_11, K_11}, - {1, J_12, L_12, K_12}, - {1, J_13, L_13, K_13}, - - {1, D_1, F_1, E_1}, - {1, D_2, F_2, E_2}, - {1, D_3, F_3, E_3}, - {1, D_7, F_7, E_7}, - {1, D_11, F_11, E_11}, - {1, D_12, F_12, E_12}, - {1, D_13, F_13, E_13}, - {1, D_14, F_14, E_14}, - {1, D_15, F_15, E_15}, - {1, D_16, F_16, E_16}, - {1, J_14, L_14, K_14}, - {1, J_16, L_16, K_16} -}; - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to RGB Index - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, __ }, - { 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, __, 32, 33, 34, 35, 36, 37 }, - { 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, __, 51, 52, 53, 54, 55, 56 }, - { 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, __, 69, __, 70, 71, 72, 73, __ }, - { 74, __, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, __, 86, __, 87, 88, 89, 90 }, - { 91, 92, 93, __, __, __, 94, __, __, __, 95, 96, 97, 98, 99,100,101,__, 102, __ }, - }, - { - // RGB Index to Physical Position - {0, 0}, {12, 0}, {24, 0}, {36, 0}, {48, 0}, {60, 0}, {72, 0}, {84, 0}, {96, 0}, {108, 0}, {120, 0}, {132, 0}, {144, 0}, {156, 0}, {168, 0}, {180, 0},{192, 0},{203, 0},{213, 0}, - {0,13}, {12,13}, {24,13}, {36,13}, {48,13}, {60,13}, {72,13}, {84,13}, {96,13}, {108,13}, {120,13}, {132,13}, {144,13}, {162,13}, {180,13},{192,13},{203,13},{213,13},{224,13}, - {2,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {90,26}, {102,26},{114,26}, {126,26}, {138,26}, {150,26}, {164,26}, {180,26},{192,26},{203,26},{213,26},{224,32}, - {4,39}, {22,39}, {34,39}, {46,39}, {58,39}, {70,39}, {82,39}, {94,39}, {106,39},{118,39}, {130,39}, {142,39}, {163,39}, {180,39},{192,39},{203,39},{213,39}, - {8,51}, {28,51}, {40,51}, {52,51}, {64,51}, {76,51}, {88,51}, {100,51},{112,51}, {124,51}, {136,51}, {148,51}, {168,51}, {192,51},{203,51},{213,51},{224,57}, - {1,64}, {16,64}, {30,64}, {78,64}, {120,64}, {132,64}, {144,64}, {156,64}, {168,64}, {180,64},{197,64}, {213,64}, - }, - { - // RGB Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - } -}; -#endif diff --git a/keyboards/keychron/k17_max/ansi_encoder/rgb/rules.mk b/keyboards/keychron/k17_max/ansi_encoder/rgb/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/k17_max/ansi_encoder/rgb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/k17_max/ansi_encoder/white/config.h b/keyboards/keychron/k17_max/ansi_encoder/white/config.h deleted file mode 100644 index 9c8ed0a112..0000000000 --- a/keyboards/keychron/k17_max/ansi_encoder/white/config.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright 2024 @ 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 - -#ifdef LED_MATRIX_ENABLE -/* LED Matrix driver configuration */ -# define LED_MATRIX_LED_COUNT 103 -# define DRIVER_COUNT 1 -# define DRIVER_CS_PINS \ - { B9 } - -/* Scan phase of led driver set as MSKPHASE_8CHANNEL(defined as 0x03 in snled27351.h) */ -# define SNLED27351_PHASE_CHANNEL MSKPHASE_8CHANNEL -/* Set LED driver current */ -# define SNLED27351_CURRENT_TUNE \ - { 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A } - -/* Set to infinit, which is use in USB mode by default */ -# define LED_MATRIX_TIMEOUT LED_MATRIX_TIMEOUT_INFINITE - -/* Allow shutdown of led driver to save power */ -# define LED_MATRIX_DRIVER_SHUTDOWN_ENABLE -/* Turn off backlight on low brightness to save power */ -# define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 - -/* Indications */ -# define DIM_CAPS_LOCK -# define CAPS_LOCK_INDEX 57 -# define LOW_BAT_IND_INDEX \ - { 94 } -# define BT_HOST_LED_MATRIX_LIST \ - { 20, 21, 22 } -# define P2P4G_HOST_LED_MATRIX_LIST \ - { 23 } -# define BAT_LEVEL_LED_LIST \ - { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 } - -# define LED_MATRIX_KEYPRESSES -#endif diff --git a/keyboards/keychron/k17_max/ansi_encoder/white/info.json b/keyboards/keychron/k17_max/ansi_encoder/white/info.json deleted file mode 100644 index 9fffeb4ff2..0000000000 --- a/keyboards/keychron/k17_max/ansi_encoder/white/info.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "usb": { - "pid": "0x0A03", - "device_version": "1.0.0" - }, - "features": { - "led_matrix": true - }, - "indicators": { - "caps_lock": "A13", - "num_lock": "B10", - "on_state": 1 - }, - "matrix_pins": { - "cols": ["C6", "C7", "C8", "A14", "A15", "C10", "C11", "C13", "C14", "C15", "C0", "C1", "C2", "C3", "A0", "A1", "A2", "A3", "C5", "B10"], - "rows": ["C12", "D2", "B3", "B4", "B5", "B6"] - }, - "layouts": { - "LAYOUT_104_ansi": { - "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":[0,4], "x":4, "y":0}, - {"matrix":[0,5], "x":5, "y":0}, - {"matrix":[0,6], "x":6, "y":0}, - {"matrix":[0,7], "x":7, "y":0}, - {"matrix":[0,8], "x":8, "y":0}, - {"matrix":[0,9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0}, - {"matrix":[0,14], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, - {"matrix":[0,16], "x":16.5, "y":0}, - {"matrix":[0,17], "x":17.5, "y":0}, - {"matrix":[0,18], "x":18.5, "y":0}, - {"matrix":[0,19], "x":19.5, "y":0}, - - {"matrix":[1,0], "x":0, "y":1.25}, - {"matrix":[1,1], "x":1, "y":1.25}, - {"matrix":[1,2], "x":2, "y":1.25}, - {"matrix":[1,3], "x":3, "y":1.25}, - {"matrix":[1,4], "x":4, "y":1.25}, - {"matrix":[1,5], "x":5, "y":1.25}, - {"matrix":[1,6], "x":6, "y":1.25}, - {"matrix":[1,7], "x":7, "y":1.25}, - {"matrix":[1,8], "x":8, "y":1.25}, - {"matrix":[1,9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,14], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.25, "y":1.25}, - {"matrix":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[1,18], "x":18.5, "y":1.25}, - {"matrix":[1,19], "x":19.5, "y":1.25}, - - {"matrix":[2,0], "x":0, "y":2.25, "w":1.5}, - {"matrix":[2,1], "x":1.5, "y":2.25}, - {"matrix":[2,2], "x":2.5, "y":2.25}, - {"matrix":[2,3], "x":3.5, "y":2.25}, - {"matrix":[2,4], "x":4.5, "y":2.25}, - {"matrix":[2,5], "x":5.5, "y":2.25}, - {"matrix":[2,6], "x":6.5, "y":2.25}, - {"matrix":[2,7], "x":7.5, "y":2.25}, - {"matrix":[2,8], "x":8.5, "y":2.25}, - {"matrix":[2,9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,15], "x":15.25, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.5, "y":2.25}, - {"matrix":[2,18], "x":18.5, "y":2.25}, - {"matrix":[2,19], "x":19.5, "y":2.25, "h":2}, - - {"matrix":[3,0], "x":0, "y":3.25, "w":1.75}, - {"matrix":[3,1], "x":1.75, "y":3.25}, - {"matrix":[3,2], "x":2.75, "y":3.25}, - {"matrix":[3,3], "x":3.75, "y":3.25}, - {"matrix":[3,4], "x":4.75, "y":3.25}, - {"matrix":[3,5], "x":5.75, "y":3.25}, - {"matrix":[3,6], "x":6.75, "y":3.25}, - {"matrix":[3,7], "x":7.75, "y":3.25}, - {"matrix":[3,8], "x":8.75, "y":3.25}, - {"matrix":[3,9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25}, - {"matrix":[3,15], "x":15.25, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[3,18], "x":18.5, "y":3.25}, - - {"matrix":[4,0], "x":0, "y":4.25, "w":2.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}, - {"matrix":[4,5], "x":5.25, "y":4.25}, - {"matrix":[4,6], "x":6.25, "y":4.25}, - {"matrix":[4,7], "x":7.25, "y":4.25}, - {"matrix":[4,8], "x":8.25, "y":4.25}, - {"matrix":[4,9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "y":4.25}, - {"matrix":[4,18], "x":18.5, "y":4.25}, - {"matrix":[4,19], "x":19.5, "y":4.25, "h":2}, - - {"matrix":[5,0], "x":0, "y":5.25, "w":1.25}, - {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25}, - {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25}, - {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.25}, - {"matrix":[5,14], "x":14.25, "y":5.25}, - {"matrix":[5,15], "x":15.25, "y":5.25}, - {"matrix":[5,16], "x":16.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":18.5, "y":5.25} - ] - } - }, - "led_matrix": { - "driver": "snled27351_spi", - "sleep": true, - "animations": { - "none": true, - "solid": true, - "breathing": true, - "band_pinwheel": true, - "band_spiral": true, - "cycle_left_right": true, - "cycle_up_down": true, - "cycle_out_in": true, - "dual_beacon": true, - "solid_reactive_simple": true, - "solid_reactive_multiwide": true, - "solid_reactive_multinexus": true, - "solid_splash": true, - "wave_left_right": true, - "wave_up_down": true - } - } -} diff --git a/keyboards/keychron/k17_max/ansi_encoder/white/keymaps/default/keymap.c b/keyboards/keychron/k17_max/ansi_encoder/white/keymaps/default/keymap.c deleted file mode 100644 index 61ced7bff9..0000000000 --- a/keyboards/keychron/k17_max/ansi_encoder/white/keymaps/default/keymap.c +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright 2024 @ 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{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN, -}; - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_104_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, BL_STEP, KC_DEL, KC_F13, KC_F14, KC_F15, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - - [MAC_FN] = LAYOUT_104_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, BL_TOGG, _______, _______, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - - [WIN_BASE] = LAYOUT_104_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, BL_STEP, KC_DEL, _______, _______, _______, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - - [WIN_FN] = LAYOUT_104_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, BL_TOGG, _______, _______, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN] = {ENCODER_CCW_CW(BL_DOWN, BL_UP)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_FN] = {ENCODER_CCW_CW(BL_DOWN, BL_UP)}, -}; -#endif - -// clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/k17_max/ansi_encoder/white/keymaps/via/keymap.c b/keyboards/keychron/k17_max/ansi_encoder/white/keymaps/via/keymap.c deleted file mode 100644 index 6b6f014564..0000000000 --- a/keyboards/keychron/k17_max/ansi_encoder/white/keymaps/via/keymap.c +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright 2024 @ 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{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN, -}; - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_104_ansi( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, BL_STEP, KC_DEL, KC_F13, KC_F14, KC_F15, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - - [MAC_FN] = LAYOUT_104_ansi( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, BL_TOGG, _______, _______, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - - [WIN_BASE] = LAYOUT_104_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, BL_STEP, KC_DEL, _______, _______, _______, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - - [WIN_FN] = LAYOUT_104_ansi( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, BL_TOGG, _______, _______, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN] = {ENCODER_CCW_CW(BL_DOWN, BL_UP)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_FN] = {ENCODER_CCW_CW(BL_DOWN, BL_UP)}, -}; -#endif - -// clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/k17_max/ansi_encoder/white/keymaps/via/rules.mk b/keyboards/keychron/k17_max/ansi_encoder/white/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/keychron/k17_max/ansi_encoder/white/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/keychron/k17_max/ansi_encoder/white/rules.mk b/keyboards/keychron/k17_max/ansi_encoder/white/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/k17_max/ansi_encoder/white/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/k17_max/ansi_encoder/white/white.c b/keyboards/keychron/k17_max/ansi_encoder/white/white.c deleted file mode 100644 index d79b5d15bd..0000000000 --- a/keyboards/keychron/k17_max/ansi_encoder/white/white.c +++ /dev/null @@ -1,168 +0,0 @@ -/* Copyright 2024 @ 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" - -// clang-format off -#ifdef LED_MATRIX_ENABLE -const snled27351_led_t g_snled27351_leds[LED_MATRIX_LED_COUNT] = { -/* Refer to SNLED27351 manual for these locations - * driver - * | LED address - * | | */ - {0, F_1}, - {0, F_2}, - {0, F_3}, - {0, F_4}, - {0, F_5}, - {0, F_6}, - {0, F_7}, - {0, F_8}, - {0, F_9}, - {0, F_10}, - {0, F_11}, - {0, F_12}, - {0, F_13}, - {0, F_14}, - {0, F_15}, - {0, F_16}, - {0, A_8}, - {0, A_9}, - {0, A_10}, - - {0, E_1}, - {0, E_2}, - {0, E_3}, - {0, E_4}, - {0, E_5}, - {0, E_6}, - {0, E_7}, - {0, E_8}, - {0, E_9}, - {0, E_10}, - {0, E_11}, - {0, E_12}, - {0, E_13}, - {0, E_15}, - {0, E_16}, - {0, H_7}, - {0, H_8}, - {0, H_9}, - {0, H_10}, - - {0, D_1}, - {0, D_2}, - {0, D_3}, - {0, D_4}, - {0, D_5}, - {0, D_6}, - {0, D_7}, - {0, D_8}, - {0, D_9}, - {0, D_10}, - {0, D_11}, - {0, D_12}, - {0, D_13}, - {0, D_15}, - {0, D_16}, - {0, H_12}, - {0, H_13}, - {0, H_14}, - {0, H_15}, - - {0, C_1}, - {0, C_2}, - {0, C_3}, - {0, C_4}, - {0, C_5}, - {0, C_6}, - {0, C_7}, - {0, C_8}, - {0, C_9}, - {0, C_10}, - {0, C_11}, - {0, C_12}, - {0, C_14}, - {0, C_16}, - {0, G_7}, - {0, G_8}, - {0, G_9}, - - {0, B_1}, - {0, B_3}, - {0, B_4}, - {0, B_5}, - {0, B_6}, - {0, B_7}, - {0, B_8}, - {0, B_9}, - {0, B_10}, - {0, B_11}, - {0, B_12}, - {0, B_13}, - {0, B_15}, - {0, G_10}, - {0, G_11}, - {0, G_12}, - {0, G_13}, - - {0, A_1}, - {0, A_2}, - {0, A_3}, - {0, A_7}, - {0, A_11}, - {0, A_12}, - {0, A_13}, - {0, A_14}, - {0, A_15}, - {0, A_16}, - {0, G_14}, - {0, G_16}, - -}; - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to LED Index - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, __ }, - { 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, __, 32, 33, 34, 35, 36, 37 }, - { 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, __, 51, 52, 53, 54, 55, 56 }, - { 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, __, 69, __, 70, 71, 72, 73, __ }, - { 74, __, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, __, 86, __, 87, 88, 89, 90 }, - { 91, 92, 93, __, __, __, 94, __, __, __, 95, 96, 97, 98, 99,100,101,__, 102, __ }, - }, - { - // LED Index to Physical Position - {0, 0}, {12, 0}, {24, 0}, {36, 0}, {48, 0}, {60, 0}, {72, 0}, {84, 0}, {96, 0}, {108, 0}, {120, 0}, {132, 0}, {144, 0}, {156, 0}, {168, 0}, {180, 0},{192, 0},{203, 0},{213, 0}, - {0,13}, {12,13}, {24,13}, {36,13}, {48,13}, {60,13}, {72,13}, {84,13}, {96,13}, {108,13}, {120,13}, {132,13}, {144,13}, {162,13}, {180,13},{192,13},{203,13},{213,13},{224,13}, - {2,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {90,26}, {102,26},{114,26}, {126,26}, {138,26}, {150,26}, {164,26}, {180,26},{192,26},{203,26},{213,26},{224,32}, - {4,39}, {22,39}, {34,39}, {46,39}, {58,39}, {70,39}, {82,39}, {94,39}, {106,39},{118,39}, {130,39}, {142,39}, {163,39}, {180,39},{192,39},{203,39},{213,39}, - {8,51}, {28,51}, {40,51}, {52,51}, {64,51}, {76,51}, {88,51}, {100,51},{112,51}, {124,51}, {136,51}, {148,51}, {168,51}, {192,51},{203,51},{213,51},{224,57}, - {1,64}, {16,64}, {30,64}, {78,64}, {120,64}, {132,64}, {144,64}, {156,64}, {168,64}, {180,64},{197,64}, {213,64}, - }, - { - // LED Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - } -}; -#endif diff --git a/keyboards/keychron/k17_max/board.h b/keyboards/keychron/k17_max/board.h deleted file mode 100644 index 1ed65145a4..0000000000 --- a/keyboards/keychron/k17_max/board.h +++ /dev/null @@ -1,226 +0,0 @@ -/* Copyright 2024 @ 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 - -#include_next - -// clang-format off - -/* Set GPIOA_SWDIO to INPUT and NOT FLOATING */ -#undef VAL_GPIOA_MODER -#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_BUTTON) | \ - PIN_MODE_INPUT(GPIOA_PIN1) | \ - PIN_MODE_INPUT(GPIOA_PIN2) | \ - PIN_MODE_INPUT(GPIOA_PIN3) | \ - PIN_MODE_ALTERNATE(GPIOA_CS43L22_LRCK) |\ - PIN_MODE_ALTERNATE(GPIOA_L3GD20_SCL) | \ - PIN_MODE_ALTERNATE(GPIOA_L3GD20_SD0) | \ - PIN_MODE_ALTERNATE(GPIOA_L3GD20_SDI) | \ - PIN_MODE_INPUT(GPIOA_PIN8) | \ - PIN_MODE_INPUT(GPIOA_VBUS_FS) | \ - PIN_MODE_ALTERNATE(GPIOA_OTG_FS_ID) | \ - PIN_MODE_ALTERNATE(GPIOA_OTG_FS_DM) | \ - PIN_MODE_ALTERNATE(GPIOA_OTG_FS_DP) | \ - PIN_MODE_INPUT(GPIOA_SWDIO) | \ - PIN_MODE_INPUT(GPIOA_SWCLK) | \ - PIN_MODE_INPUT(GPIOA_PIN15)) - -#undef VAL_GPIOA_PUPDR -#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_BUTTON) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN1) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN2) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN3) | \ - PIN_PUPDR_FLOATING(GPIOA_CS43L22_LRCK) |\ - PIN_PUPDR_FLOATING(GPIOA_L3GD20_SCL) | \ - PIN_PUPDR_PULLUP(GPIOA_L3GD20_SD0) | \ - PIN_PUPDR_PULLUP(GPIOA_L3GD20_SDI) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN8) | \ - PIN_PUPDR_FLOATING(GPIOA_VBUS_FS) | \ - PIN_PUPDR_FLOATING(GPIOA_OTG_FS_ID) | \ - PIN_PUPDR_FLOATING(GPIOA_OTG_FS_DM) | \ - PIN_PUPDR_FLOATING(GPIOA_OTG_FS_DP) | \ - PIN_PUPDR_PULLUP(GPIOA_SWDIO) | \ - PIN_PUPDR_PULLUP(GPIOA_SWCLK) | \ - PIN_PUPDR_PULLUP(GPIOA_PIN15)) - -#undef VAL_GPIOB_MODER -#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_PIN0) | \ - PIN_MODE_INPUT(GPIOB_PIN1) | \ - PIN_MODE_INPUT(GPIOB_PIN2) | \ - PIN_MODE_INPUT(GPIOB_SWO) | \ - PIN_MODE_INPUT(GPIOB_PIN4) | \ - PIN_MODE_INPUT(GPIOB_PIN5) | \ - PIN_MODE_INPUT(GPIOB_LSM303DLHC_SCL) | \ - PIN_MODE_INPUT(GPIOB_PIN7) | \ - PIN_MODE_INPUT(GPIOB_PIN8) | \ - PIN_MODE_INPUT(GPIOB_LSM303DLHC_SDA) | \ - PIN_MODE_INPUT(GPIOB_MP45DT02_CLK_IN) |\ - PIN_MODE_INPUT(GPIOB_PIN11) | \ - PIN_MODE_INPUT(GPIOB_PIN12) | \ - PIN_MODE_INPUT(GPIOB_PIN13) | \ - PIN_MODE_INPUT(GPIOB_PIN14) | \ - PIN_MODE_INPUT(GPIOB_PIN15)) - -#undef VAL_GPIOB_PUPDR -#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLDOWN(GPIOB_PIN0) | \ - PIN_PUPDR_PULLDOWN(GPIOB_PIN1) | \ - PIN_PUPDR_PULLDOWN(GPIOB_PIN2) | \ - PIN_PUPDR_PULLDOWN(GPIOB_SWO) | \ - PIN_PUPDR_PULLDOWN(GPIOB_PIN4) | \ - PIN_PUPDR_PULLDOWN(GPIOB_PIN5) | \ - PIN_PUPDR_PULLDOWN(GPIOB_LSM303DLHC_SCL) |\ - PIN_PUPDR_PULLDOWN(GPIOB_PIN7) | \ - PIN_PUPDR_PULLDOWN(GPIOB_PIN8) | \ - PIN_PUPDR_PULLDOWN(GPIOB_LSM303DLHC_SDA) |\ - PIN_PUPDR_PULLDOWN(GPIOB_MP45DT02_CLK_IN) |\ - PIN_PUPDR_PULLDOWN(GPIOB_PIN11) | \ - PIN_PUPDR_PULLDOWN(GPIOB_PIN12) | \ - PIN_PUPDR_PULLDOWN(GPIOB_PIN13) | \ - PIN_PUPDR_PULLDOWN(GPIOB_PIN14) | \ - PIN_PUPDR_PULLDOWN(GPIOB_PIN15)) - -#undef VAL_GPIOB_AFRL -#define VAL_GPIOB_AFRL (PIN_AFIO_AF(GPIOB_PIN0, 0U) | \ - PIN_AFIO_AF(GPIOB_PIN1, 0U) | \ - PIN_AFIO_AF(GPIOB_PIN2, 0U) | \ - PIN_AFIO_AF(GPIOB_SWO, 0U) | \ - PIN_AFIO_AF(GPIOB_PIN4, 0U) | \ - PIN_AFIO_AF(GPIOB_PIN5, 0U) | \ - PIN_AFIO_AF(GPIOB_LSM303DLHC_SCL, 0) | \ - PIN_AFIO_AF(GPIOB_PIN7, 0U)) - -#undef VAL_GPIOB_AFRH -#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_PIN8, 0U) | \ - PIN_AFIO_AF(GPIOB_LSM303DLHC_SDA, 0) | \ - PIN_AFIO_AF(GPIOB_MP45DT02_CLK_IN, 0U) |\ - PIN_AFIO_AF(GPIOB_PIN11, 0U) | \ - PIN_AFIO_AF(GPIOB_PIN12, 0U) | \ - PIN_AFIO_AF(GPIOB_PIN13, 0U) | \ - PIN_AFIO_AF(GPIOB_PIN14, 0U) | \ - PIN_AFIO_AF(GPIOB_PIN15, 0U)) - -/* C5 Need to be pulldown */ -#undef VAL_GPIOC_MODER -#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_OTG_FS_POWER_ON) |\ - PIN_MODE_INPUT(GPIOC_PIN1) | \ - PIN_MODE_INPUT(GPIOC_PIN2) | \ - PIN_MODE_INPUT(GPIOC_CS43L22_AIN4x) | \ - PIN_MODE_INPUT(GPIOC_PIN4) | \ - PIN_MODE_INPUT(GPIOC_PIN5) | \ - PIN_MODE_INPUT(GPIOC_PIN6) | \ - PIN_MODE_INPUT(GPIOC_CS43L22_MCLK) | \ - PIN_MODE_INPUT(GPIOC_PIN8) | \ - PIN_MODE_INPUT(GPIOC_PIN9) | \ - PIN_MODE_INPUT(GPIOC_CS43L22_SCLK) | \ - PIN_MODE_INPUT(GPIOC_PIN11) | \ - PIN_MODE_INPUT(GPIOC_CS43L22_SDIN) | \ - PIN_MODE_INPUT(GPIOC_PIN13) | \ - PIN_MODE_INPUT(GPIOC_OSC32_IN) | \ - PIN_MODE_INPUT(GPIOC_OSC32_OUT)) - -#undef VAL_GPIOC_PUPDR -#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_OTG_FS_POWER_ON) |\ - PIN_PUPDR_PULLUP(GPIOC_PIN1) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN2) | \ - PIN_PUPDR_PULLUP(GPIOC_CS43L22_AIN4x) |\ - PIN_PUPDR_PULLUP(GPIOC_PIN4) | \ - PIN_PUPDR_PULLDOWN(GPIOC_PIN5) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN6) | \ - PIN_PUPDR_PULLUP(GPIOC_CS43L22_MCLK) | \ - PIN_PUPDR_PULLDOWN(GPIOC_PIN8) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN9) | \ - PIN_PUPDR_PULLUP(GPIOC_CS43L22_SCLK) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN11) | \ - PIN_PUPDR_PULLUP(GPIOC_CS43L22_SDIN) | \ - PIN_PUPDR_PULLUP(GPIOC_PIN13) | \ - PIN_PUPDR_PULLUP(GPIOC_OSC32_IN) | \ - PIN_PUPDR_PULLUP(GPIOC_OSC32_OUT)) - -/* Set all GPIOD pins to INPUT & PULLUP to avoid FLOATING */ -#undef VAL_GPIOD_MODER -#define VAL_GPIOD_MODER (PIN_MODE_INPUT(GPIOD_PIN0) | \ - PIN_MODE_INPUT(GPIOD_PIN1) | \ - PIN_MODE_INPUT(GPIOD_PIN2) | \ - PIN_MODE_INPUT(GPIOD_PIN3) | \ - PIN_MODE_INPUT(GPIOD_CS43L22_RESET) | \ - PIN_MODE_INPUT(GPIOD_OverCurrent) | \ - PIN_MODE_INPUT(GPIOD_PIN6) | \ - PIN_MODE_INPUT(GPIOD_PIN7) | \ - PIN_MODE_INPUT(GPIOD_PIN8) | \ - PIN_MODE_INPUT(GPIOD_PIN9) | \ - PIN_MODE_INPUT(GPIOD_PIN10) | \ - PIN_MODE_INPUT(GPIOD_PIN11) | \ - PIN_MODE_INPUT(GPIOD_LED4) | \ - PIN_MODE_INPUT(GPIOD_LED3) | \ - PIN_MODE_INPUT(GPIOD_LED5) | \ - PIN_MODE_INPUT(GPIOD_LED6)) - -#undef VAL_GPIOD_PUPDR -#define VAL_GPIOD_PUPDR (PIN_PUPDR_PULLUP(GPIOD_PIN0) | \ - PIN_PUPDR_PULLUP(GPIOD_PIN1) | \ - PIN_PUPDR_PULLUP(GPIOD_PIN2) | \ - PIN_PUPDR_PULLUP(GPIOD_PIN3) | \ - PIN_PUPDR_PULLUP(GPIOD_CS43L22_RESET) |\ - PIN_PUPDR_PULLUP(GPIOD_OverCurrent) | \ - PIN_PUPDR_PULLUP(GPIOD_PIN6) | \ - PIN_PUPDR_PULLUP(GPIOD_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOD_PIN8) | \ - PIN_PUPDR_PULLUP(GPIOD_PIN9) | \ - PIN_PUPDR_PULLUP(GPIOD_PIN10) | \ - PIN_PUPDR_PULLUP(GPIOD_PIN11) | \ - PIN_PUPDR_PULLUP(GPIOD_LED4) | \ - PIN_PUPDR_PULLUP(GPIOD_LED3) | \ - PIN_PUPDR_PULLUP(GPIOD_LED5) | \ - PIN_PUPDR_PULLUP(GPIOD_LED6)) - -/* Set all GPIOE pins to INPUT & PULLUP to avoid FLOATING */ -#undef VAL_GPIOE_MODER -#define VAL_GPIOE_MODER (PIN_MODE_INPUT(GPIOE_L3GD20_INT1) | \ - PIN_MODE_INPUT(GPIOE_L3GD20_INT2) | \ - PIN_MODE_INPUT(GPIOE_LSM303DLHC_DRDY) |\ - PIN_MODE_INPUT(GPIOE_L3GD20_CS) | \ - PIN_MODE_INPUT(GPIOE_LSM303DLHC_INT1) |\ - PIN_MODE_INPUT(GPIOE_LSM303DLHC_INT2) |\ - PIN_MODE_INPUT(GPIOE_PIN6) | \ - PIN_MODE_INPUT(GPIOE_PIN7) | \ - PIN_MODE_INPUT(GPIOE_PIN8) | \ - PIN_MODE_INPUT(GPIOE_PIN9) | \ - PIN_MODE_INPUT(GPIOE_PIN10) | \ - PIN_MODE_INPUT(GPIOE_PIN11) | \ - PIN_MODE_INPUT(GPIOE_PIN12) | \ - PIN_MODE_INPUT(GPIOE_PIN13) | \ - PIN_MODE_INPUT(GPIOE_PIN14) | \ - PIN_MODE_INPUT(GPIOE_PIN15)) - -#undef VAL_GPIOE_PUPDR -#define VAL_GPIOE_PUPDR (PIN_PUPDR_PULLUP(GPIOE_L3GD20_INT1) | \ - PIN_PUPDR_PULLUP(GPIOE_L3GD20_INT2) | \ - PIN_PUPDR_PULLUP(GPIOE_LSM303DLHC_DRDY) |\ - PIN_PUPDR_PULLUP(GPIOE_L3GD20_CS) | \ - PIN_PUPDR_PULLUP(GPIOE_LSM303DLHC_INT1) |\ - PIN_PUPDR_PULLUP(GPIOE_LSM303DLHC_INT2) |\ - PIN_PUPDR_PULLUP(GPIOE_PIN6) | \ - PIN_PUPDR_PULLUP(GPIOE_PIN7) | \ - PIN_PUPDR_PULLUP(GPIOE_PIN8) | \ - PIN_PUPDR_PULLUP(GPIOE_PIN9) | \ - PIN_PUPDR_PULLUP(GPIOE_PIN10) | \ - PIN_PUPDR_PULLUP(GPIOE_PIN11) | \ - PIN_PUPDR_PULLUP(GPIOE_PIN12) | \ - PIN_PUPDR_PULLUP(GPIOE_PIN13) | \ - PIN_PUPDR_PULLUP(GPIOE_PIN14) | \ - PIN_PUPDR_PULLUP(GPIOE_PIN15)) - diff --git a/keyboards/keychron/k17_max/config.h b/keyboards/keychron/k17_max/config.h deleted file mode 100644 index 71fc6bd6f3..0000000000 --- a/keyboards/keychron/k17_max/config.h +++ /dev/null @@ -1,81 +0,0 @@ -/* Copyright 2024 @ 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 -/* Encoder Configuration */ -#define ENCODER_DEFAULT_POS 0x3 -#define ENCODER_MAP_KEY_DELAY 2 - -#if defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE) || defined(LK_WIRELESS_ENABLE) -/* SPI configuration */ -# define SPI_DRIVER SPID1 -# define SPI_SCK_PIN A5 -# define SPI_MISO_PIN A6 -# define SPI_MOSI_PIN A7 -#endif - -#if defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE) -# define LED_DRIVER_SHUTDOWN_PIN B7 -# define SNLED23751_SPI_DIVISOR 16 -#endif - -#ifdef LK_WIRELESS_ENABLE -/* Hardware configuration */ -# define P2P4_MODE_SELECT_PIN A10 -# define BT_MODE_SELECT_PIN A9 - -# define LKBT51_RESET_PIN C4 -# define LKBT51_INT_INPUT_PIN B1 -# define BLUETOOTH_INT_OUTPUT_PIN A4 - -# define USB_POWER_SENSE_PIN B0 -# define USB_POWER_CONNECTED_LEVEL 0 - -# define BAT_CHARGING_PIN B13 -# define BAT_CHARGING_LEVEL 0 - -# define BAT_LOW_LED_PIN B12 -# define BAT_LOW_LED_PIN_ON_STATE 1 - -# define BT_HOST_DEVICES_COUNT 3 - -# if defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE) - -/* Backlit disable timeout when keyboard is disconnected(unit: second) */ -# define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40 - -/* Backlit disable timeout when keyboard is connected(unit: second) */ -# define CONNECTED_BACKLIGHT_DISABLE_TIMEOUT 600 - -/* Reinit LED driver on tranport changed */ -# define REINIT_LED_DRIVER 1 -# endif - -/* Keep USB connection in blueooth mode */ -# define KEEP_USB_CONNECTION_IN_WIRELESS_MODE - -/* Enable bluetooth NKRO */ -# define WIRELESS_NKRO_ENABLE - -#endif - -/* Factory test keys */ -#define FN_KEY_1 MO(1) -#define FN_KEY_2 MO(3) - -#define FN_BL_TRIG_KEY KC_END - -#define MATRIX_IO_DELAY 10 diff --git a/keyboards/keychron/k17_max/halconf.h b/keyboards/keychron/k17_max/halconf.h deleted file mode 100644 index 37bcc7c47b..0000000000 --- a/keyboards/keychron/k17_max/halconf.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2024 @ 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 - -#define _CHIBIOS_HAL_CONF_VER_8_0_ - -#define HAL_USE_SPI TRUE - -#ifdef LK_WIRELESS_ENABLE -# define HAL_USE_RTC TRUE -#endif - -#if defined(LK_WIRELESS_ENABLE) || defined(ENCODER_ENABLE) -# define PAL_USE_CALLBACKS TRUE -#endif - -#include_next diff --git a/keyboards/keychron/k17_max/info.json b/keyboards/keychron/k17_max/info.json deleted file mode 100644 index e7a5c52f9d..0000000000 --- a/keyboards/keychron/k17_max/info.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "keyboard_name": "Keychron K17 Max", - "manufacturer": "Keychron", - "url": "https://github.com/Keychron", - "maintainer": "Keychron", - "processor": "STM32F401", - "bootloader": "stm32-dfu", - "usb": { - "vid": "0x3434" - }, - "features": { - "bootmagic": true, - "extrakey": true, - "mousekey": true, - "dip_switch": true, - "encoder": true, - "encoder_map": true, - "nkro": true, - "raw": true, - "send_string": true - }, - "diode_direction": "ROW2COL", - "dip_switch": { - "pins": ["B14"] - }, - "eeprom": { - "wear_leveling": { - "driver": "embedded_flash", - "logical_size": 2048, - "backing_size": 4096 - } - }, - "encoder": { - "rotary": [ - { - "pin_a": "A8", - "pin_b": "C9" - } - ] - }, - "dynamic_keymap": { - "layer_count": 4 - } -} diff --git a/keyboards/keychron/k17_max/iso_encoder/rgb/config.h b/keyboards/keychron/k17_max/iso_encoder/rgb/config.h deleted file mode 100644 index 97cc5c9b03..0000000000 --- a/keyboards/keychron/k17_max/iso_encoder/rgb/config.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2024 @ 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 - -#ifdef RGB_MATRIX_ENABLE -/* RGB Matrix driver configuration */ -# define RGB_MATRIX_LED_COUNT 104 -# define DRIVER_COUNT 2 -# define DRIVER_CS_PINS \ - { B8, B9 } - -/* Scan phase of led driver set as MSKPHASE_12CHANNEL(defined as 0x03 in snled27351.h) */ -# define SNLED27351_PHASE_CHANNEL MSKPHASE_12CHANNEL -/* Set LED driver current */ -# define SNLED27351_CURRENT_TUNE \ - { 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14 } - -/* Set to infinit, which is use in USB mode by default */ -# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE -/* Allow shutdown of led driver to save power */ -# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE -/* Turn off backlight on low brightness to save power */ -# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 - -/* Indications */ -# define CAPS_LOCK_INDEX 57 -# define NUM_LOCK_INDEX 34 -# define LOW_BAT_IND_INDEX \ - { 95 } -# define BT_HOST_LED_MATRIX_LIST \ - { 20, 21, 22 } -# define P2P4G_HOST_LED_MATRIX_LIST \ - { 23 } -# define BAT_LEVEL_LED_LIST \ - { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 } - -# define RGB_MATRIX_KEYPRESSES -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS - -#endif diff --git a/keyboards/keychron/k17_max/iso_encoder/rgb/info.json b/keyboards/keychron/k17_max/iso_encoder/rgb/info.json deleted file mode 100644 index 3a1c5fb3db..0000000000 --- a/keyboards/keychron/k17_max/iso_encoder/rgb/info.json +++ /dev/null @@ -1,156 +0,0 @@ -{ - "usb": { - "pid": "0x0A01", - "device_version": "1.0.0" - }, - "features": { - "rgb_matrix": true - }, - "matrix_pins": { - "cols": ["C6", "C7", "C8", "A14", "A15", "C10", "C11", "C13", "C14", "C15", "C0", "C1", "C2", "C3", "A0", "A1", "A2", "A3", "C5", "B10"], - "rows": ["C12", "D2", "B3", "B4", "B5", "B6"] - }, - "layouts":{ - "LAYOUT_105_iso": { - "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":[0,4], "x":4, "y":0}, - {"matrix":[0,5], "x":5, "y":0}, - {"matrix":[0,6], "x":6, "y":0}, - {"matrix":[0,7], "x":7, "y":0}, - {"matrix":[0,8], "x":8, "y":0}, - {"matrix":[0,9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0}, - {"matrix":[0,14], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, - {"matrix":[0,16], "x":16.5, "y":0}, - {"matrix":[0,17], "x":17.5, "y":0}, - {"matrix":[0,18], "x":18.5, "y":0}, - {"matrix":[0,19], "x":19.5, "y":0}, - - {"matrix":[1,0], "x":0, "y":1.25}, - {"matrix":[1,1], "x":1, "y":1.25}, - {"matrix":[1,2], "x":2, "y":1.25}, - {"matrix":[1,3], "x":3, "y":1.25}, - {"matrix":[1,4], "x":4, "y":1.25}, - {"matrix":[1,5], "x":5, "y":1.25}, - {"matrix":[1,6], "x":6, "y":1.25}, - {"matrix":[1,7], "x":7, "y":1.25}, - {"matrix":[1,8], "x":8, "y":1.25}, - {"matrix":[1,9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,14], "x":13, "y":1.25, "w":2}, - {"matrix":[1,15], "x":15.25, "y":1.25}, - {"matrix":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[1,18], "x":18.5, "y":1.25}, - {"matrix":[1,19], "x":19.5, "y":1.25}, - - {"matrix":[2,0], "x":0, "y":2.25, "w":1.5}, - {"matrix":[2,1], "x":1.5, "y":2.25}, - {"matrix":[2,2], "x":2.5, "y":2.25}, - {"matrix":[2,3], "x":3.5, "y":2.25}, - {"matrix":[2,4], "x":4.5, "y":2.25}, - {"matrix":[2,5], "x":5.5, "y":2.25}, - {"matrix":[2,6], "x":6.5, "y":2.25}, - {"matrix":[2,7], "x":7.5, "y":2.25}, - {"matrix":[2,8], "x":8.5, "y":2.25}, - {"matrix":[2,9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,15], "x":15.25, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.5, "y":2.25}, - {"matrix":[2,18], "x":18.5, "y":2.25}, - {"matrix":[2,19], "x":19.5, "y":2.25, "h":2}, - - {"matrix":[3,0], "x":0, "y":3.25, "w":1.75}, - {"matrix":[3,1], "x":1.75, "y":3.25}, - {"matrix":[3,2], "x":2.75, "y":3.25}, - {"matrix":[3,3], "x":3.75, "y":3.25}, - {"matrix":[3,4], "x":4.75, "y":3.25}, - {"matrix":[3,5], "x":5.75, "y":3.25}, - {"matrix":[3,6], "x":6.75, "y":3.25}, - {"matrix":[3,7], "x":7.75, "y":3.25}, - {"matrix":[3,8], "x":8.75, "y":3.25}, - {"matrix":[3,9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,14], "x":13.75, "y":2.25, "w":1.25, "h": 2}, - {"matrix":[3,15], "x":15.25, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[3,18], "x":18.5, "y":3.25}, - - {"matrix":[4,0], "x":0, "y":4.25, "w":1.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}, - {"matrix":[4,5], "x":5.25, "y":4.25}, - {"matrix":[4,6], "x":6.25, "y":4.25}, - {"matrix":[4,7], "x":7.25, "y":4.25}, - {"matrix":[4,8], "x":8.25, "y":4.25}, - {"matrix":[4,9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,14], "x":14.25, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "y":4.25}, - {"matrix":[4,18], "x":18.5, "y":4.25}, - {"matrix":[4,19], "x":19.5, "y":4.25, "h":2}, - - {"matrix":[5,0], "x":0, "y":5.25, "w":1.25}, - {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25}, - {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25}, - {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.25}, - {"matrix":[5,14], "x":14.25, "y":5.25}, - {"matrix":[5,15], "x":15.25, "y":5.25}, - {"matrix":[5,16], "x":16.5, "y":5.25, "w":2}, - {"matrix":[5,18], "x":18.5, "y":5.25} - ] - } - }, - "rgb_matrix": { - "driver": "snled27351_spi", - "sleep": true, - "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 - } - } -} diff --git a/keyboards/keychron/k17_max/iso_encoder/rgb/keymaps/default/keymap.c b/keyboards/keychron/k17_max/iso_encoder/rgb/keymaps/default/keymap.c deleted file mode 100644 index 931dc23d2e..0000000000 --- a/keyboards/keychron/k17_max/iso_encoder/rgb/keymaps/default/keymap.c +++ /dev/null @@ -1,74 +0,0 @@ -/* Copyright 2024 @ 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{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN, -}; - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_105_iso( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, RGB_MOD, KC_DEL, KC_F13, KC_F14, KC_F15, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [MAC_FN] = LAYOUT_105_iso( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, _______, _______, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [WIN_BASE] = LAYOUT_105_iso( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, RGB_MOD, KC_DEL, _______, _______, _______, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [WIN_FN] = LAYOUT_105_iso( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, _______, _______, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, -}; -#endif - -// clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/k17_max/iso_encoder/rgb/keymaps/via/keymap.c b/keyboards/keychron/k17_max/iso_encoder/rgb/keymaps/via/keymap.c deleted file mode 100644 index 931dc23d2e..0000000000 --- a/keyboards/keychron/k17_max/iso_encoder/rgb/keymaps/via/keymap.c +++ /dev/null @@ -1,74 +0,0 @@ -/* Copyright 2024 @ 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{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN, -}; - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_105_iso( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, RGB_MOD, KC_DEL, KC_F13, KC_F14, KC_F15, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [MAC_FN] = LAYOUT_105_iso( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, _______, _______, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [WIN_BASE] = LAYOUT_105_iso( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, RGB_MOD, KC_DEL, _______, _______, _______, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [WIN_FN] = LAYOUT_105_iso( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, _______, _______, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, -}; -#endif - -// clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/k17_max/iso_encoder/rgb/keymaps/via/rules.mk b/keyboards/keychron/k17_max/iso_encoder/rgb/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/keychron/k17_max/iso_encoder/rgb/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/keychron/k17_max/iso_encoder/rgb/rgb.c b/keyboards/keychron/k17_max/iso_encoder/rgb/rgb.c deleted file mode 100644 index cbda6726bb..0000000000 --- a/keyboards/keychron/k17_max/iso_encoder/rgb/rgb.c +++ /dev/null @@ -1,170 +0,0 @@ -/* Copyright 2024 @ 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" - -// clang-format off -#ifdef RGB_MATRIX_ENABLE -const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { -/* Refer to SNLED27351 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ - {0, G_1, I_1, H_1}, - {0, G_2, I_2, H_2}, - {0, G_3, I_3, H_3}, - {0, G_4, I_4, H_4}, - {0, G_5, I_5, H_5}, - {0, G_6, I_6, H_6}, - {0, G_7, I_7, H_7}, - {0, G_8, I_8, H_8}, - {0, G_9, I_9, H_9}, - {0, G_10, I_10, H_10}, - {0, G_11, I_11, H_11}, - {0, G_12, I_12, H_12}, - {0, G_13, I_13, H_13}, - {0, G_14, I_14, H_14}, - {0, G_15, I_15, H_15}, - {0, G_16, I_16, H_16}, - {1, D_8, F_8, E_8}, - {1, D_9, F_9, E_9}, - {1, D_10, F_10, E_10}, - - {0, D_1, F_1, E_1}, - {0, D_2, F_2, E_2}, - {0, D_3, F_3, E_3}, - {0, D_4, F_4, E_4}, - {0, D_5, F_5, E_5}, - {0, D_6, F_6, E_6}, - {0, D_7, F_7, E_7}, - {0, D_8, F_8, E_8}, - {0, D_9, F_9, E_9}, - {0, D_10, F_10, E_10}, - {0, D_11, F_11, E_11}, - {0, D_12, F_12, E_12}, - {0, D_13, F_13, E_13}, - {0, D_15, F_15, E_15}, - {0, D_16, F_16, E_16}, - {0, J_7, L_7, K_7}, - {0, J_8, L_8, K_8}, - {0, J_9, L_9, K_9}, - {0, J_10, L_10, K_10}, - - {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, 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_15, A_15, B_15}, - {0, C_16, A_16, B_16}, - {0, J_12, L_12, K_12}, - {0, J_13, L_13, K_13}, - {0, J_14, L_14, K_14}, - {0, J_15, L_15, K_15}, - - {1, G_1, I_1, H_1}, - {1, G_2, I_2, H_2}, - {1, G_3, I_3, H_3}, - {1, G_4, I_4, H_4}, - {1, G_5, I_5, H_5}, - {1, G_6, I_6, H_6}, - {1, G_7, I_7, H_7}, - {1, G_8, I_8, H_8}, - {1, G_9, I_9, H_9}, - {1, G_10, I_10, H_10}, - {1, G_11, I_11, H_11}, - {1, G_12, I_12, H_12}, - {1, G_14, I_14, H_14}, - {1, G_16, I_16, H_16}, - {1, J_7, L_7, K_7}, - {1, J_8, L_8, K_8}, - {1, J_9, L_9, K_9}, - - {1, A_1, C_1, B_1}, - {1, A_2, C_2, B_2}, - {1, A_3, C_3, B_3}, - {1, A_4, C_4, B_4}, - {1, A_5, C_5, B_5}, - {1, A_6, C_6, B_6}, - {1, A_7, C_7, B_7}, - {1, A_8, C_8, B_8}, - {1, A_9, C_9, B_9}, - {1, A_10, C_10, B_10}, - {1, A_11, C_11, B_11}, - {1, A_12, C_12, B_12}, - {1, A_13, C_13, B_13}, - {1, A_15, C_15, B_15}, - {1, J_10, L_10, K_10}, - {1, J_11, L_11, K_11}, - {1, J_12, L_12, K_12}, - {1, J_13, L_13, K_13}, - - {1, D_1, F_1, E_1}, - {1, D_2, F_2, E_2}, - {1, D_3, F_3, E_3}, - {1, D_7, F_7, E_7}, - {1, D_11, F_11, E_11}, - {1, D_12, F_12, E_12}, - {1, D_13, F_13, E_13}, - {1, D_14, F_14, E_14}, - {1, D_15, F_15, E_15}, - {1, D_16, F_16, E_16}, - {1, J_14, L_14, K_14}, - {1, J_16, L_16, K_16} -}; - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to RGB Index - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, __ }, - { 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, __, 32, 33, 34, 35, 36, 37 }, - { 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, __, 51, 52, 53, 54, 55, 56 }, - { 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, __, 69, __, 70, 71, 72, 73, __ }, - { 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, __, 87, __, 88, 89, 90, 91 }, - { 92, 93, 94, __, __, __, 95, __, __, __, 96, 97, 98, 99,100,101,102, __,103, __ }, - }, - { - // RGB Index to Physical Position - {0, 0}, {12, 0}, {24, 0}, {36, 0}, {48, 0}, {60, 0}, {72, 0}, {84, 0}, {96, 0}, {108, 0}, {120, 0}, {132, 0}, {144, 0}, {156, 0}, {168, 0}, {180, 0},{192, 0},{203, 0},{213, 0}, - {0,13}, {12,13}, {24,13}, {36,13}, {48,13}, {60,13}, {72,13}, {84,13}, {96,13}, {108,13}, {120,13}, {132,13}, {144,13}, {162,13}, {180,13},{192,13},{203,13},{213,13},{224,13}, - {2,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {90,26}, {102,26},{114,26}, {126,26}, {138,26}, {150,26}, {164,32}, {180,26},{192,26},{203,26},{213,26},{224,32}, - {4,39}, {22,39}, {34,39}, {46,39}, {58,39}, {70,39}, {82,39}, {94,39}, {106,39},{118,39}, {130,39}, {142,39}, {154,39}, {180,39},{192,39},{203,39},{213,39}, - {1,51}, {14,51}, {28,51}, {40,51}, {52,51}, {64,51}, {76,51}, {88,51}, {100,51},{112,51}, {124,51}, {136,51}, {148,51}, {168,51}, {192,51},{203,51},{213,51},{224,57}, - {1,64}, {16,64}, {30,64}, {78,64}, {120,64}, {132,64}, {144,64}, {156,64}, {168,64}, {180,64},{197,64}, {213,64}, - }, - { - // RGB Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - } -}; -#endif diff --git a/keyboards/keychron/k17_max/iso_encoder/rgb/rules.mk b/keyboards/keychron/k17_max/iso_encoder/rgb/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/k17_max/iso_encoder/rgb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/k17_max/iso_encoder/white/config.h b/keyboards/keychron/k17_max/iso_encoder/white/config.h deleted file mode 100644 index dc3a4fce7a..0000000000 --- a/keyboards/keychron/k17_max/iso_encoder/white/config.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2024 @ 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 - -#ifdef LED_MATRIX_ENABLE -/* LED Matrix driver configuration */ -# define LED_MATRIX_LED_COUNT 104 -# define DRIVER_COUNT 1 -# define DRIVER_CS_PINS \ - { B9 } - -/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in snled27351.h) */ -# define SNLED27351_PHASE_CHANNEL MSKPHASE_9CHANNEL -/* Set LED driver current */ -# define SNLED27351_CURRENT_TUNE \ - { 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A } - -/* Set to infinit, which is use in USB mode by default */ -# define LED_MATRIX_TIMEOUT LED_MATRIX_TIMEOUT_INFINITE -/* Allow shutdown of led driver to save power */ -# define LED_MATRIX_DRIVER_SHUTDOWN_ENABLE -/* Turn off backlight on low brightness to save power */ -# define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 - -/* Indications */ -# define DIM_CAPS_LOCK -# define CAPS_LOCK_INDEX 54 -# define DIM_NUM_LOCK -# define NUM_LOCK_INDEX 33 -# define LOW_BAT_IND_INDEX \ - { 93 } -# define BT_HOST_LED_MATRIX_LIST \ - { 19, 20, 21 } -# define P2P4G_HOST_LED_MATRIX_LIST \ - { 22 } -# define BAT_LEVEL_LED_LIST \ - { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 } - -# define LED_MATRIX_KEYPRESSES -#endif diff --git a/keyboards/keychron/k17_max/iso_encoder/white/info.json b/keyboards/keychron/k17_max/iso_encoder/white/info.json deleted file mode 100644 index edf2b77f24..0000000000 --- a/keyboards/keychron/k17_max/iso_encoder/white/info.json +++ /dev/null @@ -1,155 +0,0 @@ -{ - "usb": { - "pid": "0x0A04", - "device_version": "1.0.0" - }, - "features": { - "led_matrix": true - }, - "indicators": { - "caps_lock": "A13", - "num_lock": "B10", - "on_state": 1 - }, - "matrix_pins": { - "cols": ["C6", "C7", "C8", "A14", "A15", "C10", "C11", "C13", "C14", "C15", "C0", "C1", "C2", "C3", "A0", "A1", "A2", "A3"], - "rows": ["C12", "D2", "B3", "B4", "B5", "B6"] - }, - "layouts":{ - "LAYOUT_105_iso": { - "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":[0,4], "x":4, "y":0}, - {"matrix":[0,5], "x":5, "y":0}, - {"matrix":[0,6], "x":6, "y":0}, - {"matrix":[0,7], "x":7, "y":0}, - {"matrix":[0,8], "x":8, "y":0}, - {"matrix":[0,9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, - {"matrix":[0,15], "x":16.5, "y":0}, - {"matrix":[0,16], "x":17.5, "y":0}, - {"matrix":[0,17], "x":18.5, "y":0}, - {"matrix":[5,4], "x":19.5, "y":0}, - - {"matrix":[1,0], "x":0, "y":1.25}, - {"matrix":[1,1], "x":1, "y":1.25}, - {"matrix":[1,2], "x":2, "y":1.25}, - {"matrix":[1,3], "x":3, "y":1.25}, - {"matrix":[1,4], "x":4, "y":1.25}, - {"matrix":[1,5], "x":5, "y":1.25}, - {"matrix":[1,6], "x":6, "y":1.25}, - {"matrix":[1,7], "x":7, "y":1.25}, - {"matrix":[1,8], "x":8, "y":1.25}, - {"matrix":[1,9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.5, "y":1.25}, - {"matrix":[1,16], "x":17.5, "y":1.25}, - {"matrix":[1,17], "x":18.5, "y":1.25}, - {"matrix":[5,5], "x":19.5, "y":1.25}, - - {"matrix":[2,0], "x":0, "y":2.25, "w":1.5}, - {"matrix":[2,1], "x":1.5, "y":2.25}, - {"matrix":[2,2], "x":2.5, "y":2.25}, - {"matrix":[2,3], "x":3.5, "y":2.25}, - {"matrix":[2,4], "x":4.5, "y":2.25}, - {"matrix":[2,5], "x":5.5, "y":2.25}, - {"matrix":[2,6], "x":6.5, "y":2.25}, - {"matrix":[2,7], "x":7.5, "y":2.25}, - {"matrix":[2,8], "x":8.5, "y":2.25}, - {"matrix":[2,9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.5, "y":2.25}, - {"matrix":[2,16], "x":17.5, "y":2.25}, - {"matrix":[2,17], "x":18.5, "y":2.25}, - {"matrix":[5,7], "x":19.5, "y":2.25, "h":2}, - - {"matrix":[3,0], "x":0, "y":3.25, "w":1.75}, - {"matrix":[3,1], "x":1.75, "y":3.25}, - {"matrix":[3,2], "x":2.75, "y":3.25}, - {"matrix":[3,3], "x":3.75, "y":3.25}, - {"matrix":[3,4], "x":4.75, "y":3.25}, - {"matrix":[3,5], "x":5.75, "y":3.25}, - {"matrix":[3,6], "x":6.75, "y":3.25}, - {"matrix":[3,7], "x":7.75, "y":3.25}, - {"matrix":[3,8], "x":8.75, "y":3.25}, - {"matrix":[3,9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,14], "x":15.25, "y":3.25}, - {"matrix":[3,15], "x":16.5, "y":3.25}, - {"matrix":[3,16], "x":17.5, "y":3.25}, - {"matrix":[3,17], "x":18.5, "y":3.25}, - - {"matrix":[4,0], "x":0, "y":4.25, "w":1.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}, - {"matrix":[4,5], "x":5.25, "y":4.25}, - {"matrix":[4,6], "x":6.25, "y":4.25}, - {"matrix":[4,7], "x":7.25, "y":4.25}, - {"matrix":[4,8], "x":8.25, "y":4.25}, - {"matrix":[4,9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[4,13], "x":14.25, "y":4.25}, - {"matrix":[4,14], "x":13, "y":0}, - {"matrix":[4,15], "x":16.5, "y":4.25}, - {"matrix":[4,16], "x":17.5, "y":4.25}, - {"matrix":[4,17], "x":18.5, "y":4.25}, - {"matrix":[5,8], "x":19.5, "y":4.25, "h":2}, - - {"matrix":[5,0], "x":0, "y":5.25, "w":1.25}, - {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25}, - {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25}, - {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,16], "x":16.5, "y":5.25, "w":2}, - {"matrix":[5,13], "x":13.25, "y":5.25}, - {"matrix":[5,14], "x":14.25, "y":5.25}, - {"matrix":[5,15], "x":15.25, "y":5.25}, - {"matrix":[5,17], "x":18.5, "y":5.25} - ] - } - }, - "led_matrix": { - "driver": "snled27351_spi", - "sleep": true, - "animations": { - "none": true, - "solid": true, - "breathing": true, - "band_pinwheel": true, - "band_spiral": true, - "cycle_left_right": true, - "cycle_up_down": true, - "cycle_out_in": true, - "dual_beacon": true, - "solid_reactive_simple": true, - "solid_reactive_multiwide": true, - "solid_reactive_multinexus": true, - "solid_splash": true, - "wave_left_right": true, - "wave_up_down": true - } - } -} diff --git a/keyboards/keychron/k17_max/iso_encoder/white/keymaps/default/keymap.c b/keyboards/keychron/k17_max/iso_encoder/white/keymaps/default/keymap.c deleted file mode 100644 index 238e801504..0000000000 --- a/keyboards/keychron/k17_max/iso_encoder/white/keymaps/default/keymap.c +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright 2024 @ 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{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN, -}; - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_105_iso( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, KC_DEL, KC_F13, KC_F14, KC_F15, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_SNAP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - - [MAC_FN] = LAYOUT_105_iso( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, BL_TOGG, _______, _______, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - - [WIN_BASE] = LAYOUT_105_iso( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, BL_STEP, KC_DEL, _______, _______, _______, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PSCR, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - - [WIN_FN] = LAYOUT_105_iso( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_TOGG, _______, _______, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN] = {ENCODER_CCW_CW(BL_DOWN, BL_UP)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_FN] = {ENCODER_CCW_CW(BL_DOWN, BL_UP)}, -}; -#endif - -// clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/k17_max/iso_encoder/white/keymaps/via/keymap.c b/keyboards/keychron/k17_max/iso_encoder/white/keymaps/via/keymap.c deleted file mode 100644 index 238e801504..0000000000 --- a/keyboards/keychron/k17_max/iso_encoder/white/keymaps/via/keymap.c +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright 2024 @ 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{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN, -}; - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_105_iso( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, KC_DEL, KC_F13, KC_F14, KC_F15, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_SNAP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - - [MAC_FN] = LAYOUT_105_iso( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, BL_TOGG, _______, _______, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - - [WIN_BASE] = LAYOUT_105_iso( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, BL_STEP, KC_DEL, _______, _______, _______, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PSCR, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - - [WIN_FN] = LAYOUT_105_iso( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_TOGG, _______, _______, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN] = {ENCODER_CCW_CW(BL_DOWN, BL_UP)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_FN] = {ENCODER_CCW_CW(BL_DOWN, BL_UP)}, -}; -#endif - -// clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/k17_max/iso_encoder/white/keymaps/via/rules.mk b/keyboards/keychron/k17_max/iso_encoder/white/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/keychron/k17_max/iso_encoder/white/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/keychron/k17_max/iso_encoder/white/rules.mk b/keyboards/keychron/k17_max/iso_encoder/white/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/k17_max/iso_encoder/white/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/k17_max/iso_encoder/white/white.c b/keyboards/keychron/k17_max/iso_encoder/white/white.c deleted file mode 100644 index c7ab28cfaf..0000000000 --- a/keyboards/keychron/k17_max/iso_encoder/white/white.c +++ /dev/null @@ -1,169 +0,0 @@ -/* Copyright 2024 @ 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" - -// clang-format off -#ifdef LED_MATRIX_ENABLE -const snled27351_led_t g_snled27351_leds[LED_MATRIX_LED_COUNT] = { -/* Refer to SNLED27351 manual for these locations - * driver - * | LED address - * | | */ - {0, F_1}, - {0, F_2}, - {0, F_3}, - {0, F_4}, - {0, F_5}, - {0, F_6}, - {0, F_7}, - {0, F_8}, - {0, F_9}, - {0, F_10}, - {0, F_11}, - {0, F_12}, - {0, F_13}, - {0, F_15}, - {0, F_16}, - {0, A_8}, - {0, A_9}, - {0, A_10}, - - {0, E_1}, - {0, E_2}, - {0, E_3}, - {0, E_4}, - {0, E_5}, - {0, E_6}, - {0, E_7}, - {0, E_8}, - {0, E_9}, - {0, E_10}, - {0, E_11}, - {0, E_12}, - {0, E_13}, - {0, E_15}, - {0, E_16}, - {0, H_7}, - {0, H_8}, - {0, H_9}, - - {0, D_1}, - {0, D_2}, - {0, D_3}, - {0, D_4}, - {0, D_5}, - {0, D_6}, - {0, D_7}, - {0, D_8}, - {0, D_9}, - {0, D_10}, - {0, D_11}, - {0, D_12}, - {0, D_13}, - {0, D_15}, - {0, D_16}, - {0, H_12}, - {0, H_13}, - {0, H_14}, - - {0, C_1}, - {0, C_2}, - {0, C_3}, - {0, C_4}, - {0, C_5}, - {0, C_6}, - {0, C_7}, - {0, C_8}, - {0, C_9}, - {0, C_10}, - {0, C_11}, - {0, C_12}, - {0, C_14}, - {0, C_16}, - {0, G_7}, - {0, G_8}, - {0, G_9}, - - {0, B_1}, - {0, B_2}, - {0, B_3}, - {0, B_4}, - {0, B_5}, - {0, B_6}, - {0, B_7}, - {0, B_8}, - {0, B_9}, - {0, B_10}, - {0, B_11}, - {0, B_12}, - {0, B_13}, - {0, B_15}, - {0, F_14}, - {0, G_10}, - {0, G_11}, - {0, G_12}, - - {0, A_1}, - {0, A_2}, - {0, A_3}, - {0, H_10}, - {0, A_7}, - {0, H_15}, - {0, G_13}, - {0, A_11}, - {0, A_12}, - {0, A_13}, - {0, A_15}, - {0, A_16}, - {0, G_14}, - {0, A_14}, - {0, G_16}, - -}; - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to LED Index - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 }, - { 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35 }, - { 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53 }, - { 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, __, 66, 67, 68, 69, 70 }, - { 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88 }, - { 89, 90, 91, __, __, 92, 93, 94, 95, __, 96, 97, 98, 99,100,101,102,103 }, - }, - { - // LED Index to Physical Position - {0, 0}, {12, 0}, {24, 0}, {36, 0}, {48, 0}, {60, 0}, {72, 0}, {84, 0}, {96, 0}, {108, 0}, {120, 0}, {132, 0}, {144, 0}, {168, 0}, {180, 0}, {192, 0},{203, 0},{213,0}, - {0,13}, {12,13}, {24,13}, {36,13}, {48,13}, {60,13}, {72,13}, {84,13}, {96,13}, {108,13}, {120,13}, {132,13}, {144,13}, {162,13}, {180,13}, {192,13},{203,13},{213,13}, - {2,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {90,26}, {102,26},{114,26}, {126,26}, {138,26}, {150,26}, {164,32}, {180,26}, {192,26},{203,26},{213,26}, - {4,39}, {22,39}, {34,39}, {46,39}, {58,39}, {70,39}, {82,39}, {94,39}, {106,39},{118,39}, {130,39}, {142,39}, {154,39}, {180,39}, {192,39},{203,39},{213,39}, - {1,51}, {14,51}, {28,51}, {40,51}, {52,51}, {64,51}, {76,51}, {88,51}, {100,51},{112,51}, {124,51}, {136,51}, {148,51}, {168,51}, {156, 0}, {192,51},{203,51},{213,51}, - {1,64}, {16,64}, {30,64}, {224,13},{78,64}, {224,32},{224,57}, {120,64}, {132,64}, {144,64}, {168,64}, {180,64}, {197,64},{156,64},{213,64}, - }, - { - // LED Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - } -}; -#endif diff --git a/keyboards/keychron/k17_max/jis_encoder/rgb/config.h b/keyboards/keychron/k17_max/jis_encoder/rgb/config.h deleted file mode 100644 index 01f588cced..0000000000 --- a/keyboards/keychron/k17_max/jis_encoder/rgb/config.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2024 @ 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 - -#ifdef RGB_MATRIX_ENABLE -/* RGB Matrix driver configuration */ -# define RGB_MATRIX_LED_COUNT 107 -# define DRIVER_COUNT 2 -# define DRIVER_CS_PINS \ - { B8, B9 } - -/* Scan phase of led driver set as MSKPHASE_12CHANNEL(defined as 0x03 in snled27351.h) */ -# define SNLED27351_PHASE_CHANNEL MSKPHASE_12CHANNEL -/* Set LED driver current */ -# define SNLED27351_CURRENT_TUNE \ - { 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14 } - -/* Set to infinit, which is use in USB mode by default */ -# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE -/* Allow shutdown of led driver to save power */ -# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE -/* Turn off backlight on low brightness to save power */ -# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 - -/* Indications */ -# define CAPS_LOCK_INDEX 58 -# define NUM_LOCK_INDEX 35 -# define LOW_BAT_IND_INDEX \ - { 97 } -# define BT_HOST_LED_MATRIX_LIST \ - { 20, 21, 22 } -# define P2P4G_HOST_LED_MATRIX_LIST \ - { 23 } -# define BAT_LEVEL_LED_LIST \ - { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 } - -# define RGB_MATRIX_KEYPRESSES -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS - -#endif diff --git a/keyboards/keychron/k17_max/jis_encoder/rgb/info.json b/keyboards/keychron/k17_max/jis_encoder/rgb/info.json deleted file mode 100644 index 769db545ed..0000000000 --- a/keyboards/keychron/k17_max/jis_encoder/rgb/info.json +++ /dev/null @@ -1,159 +0,0 @@ -{ - "usb": { - "pid": "0x0A02", - "device_version": "1.0.0" - }, - "features": { - "rgb_matrix": true - }, - "matrix_pins": { - "cols": ["C6", "C7", "A13", "A14", "A15", "C10", "C11", "C13", "C14", "C15", "C0", "C1", "C2", "C3", "A0", "A1", "A2", "A3", "C5", "B10"], - "rows": ["C12", "D2", "B3", "B4", "B5", "B6"] - }, - "layouts":{ - "LAYOUT_108_jis": { - "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":[0,4], "x":4, "y":0}, - {"matrix":[0,5], "x":5, "y":0}, - {"matrix":[0,6], "x":6, "y":0}, - {"matrix":[0,7], "x":7, "y":0}, - {"matrix":[0,8], "x":8, "y":0}, - {"matrix":[0,9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0}, - {"matrix":[0,14], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, - {"matrix":[0,16], "x":16.5, "y":0}, - {"matrix":[0,17], "x":17.5, "y":0}, - {"matrix":[0,18], "x":18.5, "y":0}, - {"matrix":[0,19], "x":19.5, "y":0}, - - {"matrix":[1,0], "x":0, "y":1.25}, - {"matrix":[1,1], "x":1, "y":1.25}, - {"matrix":[1,2], "x":2, "y":1.25}, - {"matrix":[1,3], "x":3, "y":1.25}, - {"matrix":[1,4], "x":4, "y":1.25}, - {"matrix":[1,5], "x":5, "y":1.25}, - {"matrix":[1,6], "x":6, "y":1.25}, - {"matrix":[1,7], "x":7, "y":1.25}, - {"matrix":[1,8], "x":8, "y":1.25}, - {"matrix":[1,9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25}, - {"matrix":[1,14], "x":14, "y":1.25}, - {"matrix":[1,15], "x":15.25, "y":1.25}, - {"matrix":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[1,18], "x":18.5, "y":1.25}, - {"matrix":[1,19], "x":19.5, "y":1.25}, - - {"matrix":[2,0], "x":0, "y":2.25, "w":1.5}, - {"matrix":[2,1], "x":1.5, "y":2.25}, - {"matrix":[2,2], "x":2.5, "y":2.25}, - {"matrix":[2,3], "x":3.5, "y":2.25}, - {"matrix":[2,4], "x":4.5, "y":2.25}, - {"matrix":[2,5], "x":5.5, "y":2.25}, - {"matrix":[2,6], "x":6.5, "y":2.25}, - {"matrix":[2,7], "x":7.5, "y":2.25}, - {"matrix":[2,8], "x":8.5, "y":2.25}, - {"matrix":[2,9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,15], "x":15.25, "y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.5, "y":2.25}, - {"matrix":[2,18], "x":18.5, "y":2.25}, - {"matrix":[2,19], "x":19.5, "y":2.25, "h":2}, - - {"matrix":[3,0], "x":0, "y":3.25, "w":1.75}, - {"matrix":[3,1], "x":1.75, "y":3.25}, - {"matrix":[3,2], "x":2.75, "y":3.25}, - {"matrix":[3,3], "x":3.75, "y":3.25}, - {"matrix":[3,4], "x":4.75, "y":3.25}, - {"matrix":[3,5], "x":5.75, "y":3.25}, - {"matrix":[3,6], "x":6.75, "y":3.25}, - {"matrix":[3,7], "x":7.75, "y":3.25}, - {"matrix":[3,8], "x":8.75, "y":3.25}, - {"matrix":[3,9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,14], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.25, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[3,18], "x":18.5, "y":3.25}, - - {"matrix":[4,0], "x":0, "y":4.25, "w":2.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}, - {"matrix":[4,5], "x":5.25, "y":4.25}, - {"matrix":[4,6], "x":6.25, "y":4.25}, - {"matrix":[4,7], "x":7.25, "y":4.25}, - {"matrix":[4,8], "x":8.25, "y":4.25}, - {"matrix":[4,9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,12], "x":12.25, "y":4.25}, - {"matrix":[4,14], "x":13.25, "y":4.25, "w":1.75}, - {"matrix":[4,15], "x":15.25, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "y":4.25}, - {"matrix":[4,18], "x":18.5, "y":4.25}, - {"matrix":[4,19], "x":19.5, "y":4.25, "h":2}, - - {"matrix":[5,0], "x":0, "y":5.25, "w":1.25}, - {"matrix":[5,1], "x":1.25, "y":5.25}, - {"matrix":[5,2], "x":2.25, "y":5.25, "w":1.25}, - {"matrix":[5,3], "x":3.5, "y":5.25}, - {"matrix":[5,6], "x":4.5, "y":5.25, "w":5}, - {"matrix":[5,9], "x":9.5, "y":5.25}, - {"matrix":[5,10], "x":10.5, "y":5.25}, - {"matrix":[5,11], "x":11.5, "y":5.25,"w":1.25}, - {"matrix":[5,12], "x":12.75, "y":5.25,"w":1.25}, - {"matrix":[5,13], "x":14.25, "y":5.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[5,16], "x":17.5, "y":5.25}, - {"matrix":[5,18], "x":18.5, "y":5.25} - ] - } - }, - "rgb_matrix": { - "driver": "snled27351_spi", - "sleep": true, - "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 - } - } -} diff --git a/keyboards/keychron/k17_max/jis_encoder/rgb/keymaps/default/keymap.c b/keyboards/keychron/k17_max/jis_encoder/rgb/keymaps/default/keymap.c deleted file mode 100644 index 2eb0eb1ba2..0000000000 --- a/keyboards/keychron/k17_max/jis_encoder/rgb/keymaps/default/keymap.c +++ /dev/null @@ -1,74 +0,0 @@ -/* Copyright 2024 @ 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{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN, -}; - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_108_jis( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, RGB_MOD, KC_DEL, KC_F13, KC_F14, KC_F15, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, KC_LNG1, KC_RCMMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [MAC_FN] = LAYOUT_108_jis( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, _______, _______, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [WIN_BASE] = LAYOUT_108_jis( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, RGB_MOD, KC_DEL, _______, _______, _______, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LWIN, KC_LALT, KC_INT5, KC_SPC, KC_INT4, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [WIN_FN] = LAYOUT_108_jis( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, _______, _______, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, -}; -#endif - -// clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/k17_max/jis_encoder/rgb/keymaps/via/keymap.c b/keyboards/keychron/k17_max/jis_encoder/rgb/keymaps/via/keymap.c deleted file mode 100644 index 2eb0eb1ba2..0000000000 --- a/keyboards/keychron/k17_max/jis_encoder/rgb/keymaps/via/keymap.c +++ /dev/null @@ -1,74 +0,0 @@ -/* Copyright 2024 @ 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{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN, -}; - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_108_jis( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, RGB_MOD, KC_DEL, KC_F13, KC_F14, KC_F15, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, KC_LNG1, KC_RCMMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [MAC_FN] = LAYOUT_108_jis( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, _______, _______, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [WIN_BASE] = LAYOUT_108_jis( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, RGB_MOD, KC_DEL, _______, _______, _______, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LWIN, KC_LALT, KC_INT5, KC_SPC, KC_INT4, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [WIN_FN] = LAYOUT_108_jis( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, _______, _______, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, -}; -#endif - -// clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/k17_max/jis_encoder/rgb/keymaps/via/rules.mk b/keyboards/keychron/k17_max/jis_encoder/rgb/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/keychron/k17_max/jis_encoder/rgb/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/keychron/k17_max/jis_encoder/rgb/rgb.c b/keyboards/keychron/k17_max/jis_encoder/rgb/rgb.c deleted file mode 100644 index f7bf898dfe..0000000000 --- a/keyboards/keychron/k17_max/jis_encoder/rgb/rgb.c +++ /dev/null @@ -1,174 +0,0 @@ -/* Copyright 2024 @ 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" - -// clang-format off -#ifdef RGB_MATRIX_ENABLE -const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { -/* Refer to SNLED27351 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ - {0, G_1, I_1, H_1}, - {0, G_2, I_2, H_2}, - {0, G_3, I_3, H_3}, - {0, G_4, I_4, H_4}, - {0, G_5, I_5, H_5}, - {0, G_6, I_6, H_6}, - {0, G_7, I_7, H_7}, - {0, G_8, I_8, H_8}, - {0, G_9, I_9, H_9}, - {0, G_10, I_10, H_10}, - {0, G_11, I_11, H_11}, - {0, G_12, I_12, H_12}, - {0, G_13, I_13, H_13}, - {0, G_14, I_14, H_14}, - {0, G_15, I_15, H_15}, - {0, G_16, I_16, H_16}, - {1, D_8, F_8, E_8}, - {1, D_9, F_9, E_9}, - {0, J_16, L_16, K_16}, - - {0, D_1, F_1, E_1}, - {0, D_2, F_2, E_2}, - {0, D_3, F_3, E_3}, - {0, D_4, F_4, E_4}, - {0, D_5, F_5, E_5}, - {0, D_6, F_6, E_6}, - {0, D_7, F_7, E_7}, - {0, D_8, F_8, E_8}, - {0, D_9, F_9, E_9}, - {0, D_10, F_10, E_10}, - {0, D_11, F_11, E_11}, - {0, D_12, F_12, E_12}, - {0, D_13, F_13, E_13}, - {0, D_14, F_14, E_14}, - {0, D_15, F_15, E_15}, - {0, D_16, F_16, E_16}, - {0, J_7, L_7, K_7}, - {0, J_8, L_8, K_8}, - {0, J_9, L_9, K_9}, - {0, J_10, L_10, K_10}, - - {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, 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_15, A_15, B_15}, - {0, C_16, A_16, B_16}, - {0, J_12, L_12, K_12}, - {0, J_13, L_13, K_13}, - {0, J_14, L_14, K_14}, - {0, J_15, L_15, K_15}, - - {1, G_1, I_1, H_1}, - {1, G_2, I_2, H_2}, - {1, G_3, I_3, H_3}, - {1, G_4, I_4, H_4}, - {1, G_5, I_5, H_5}, - {1, G_6, I_6, H_6}, - {1, G_7, I_7, H_7}, - {1, G_8, I_8, H_8}, - {1, G_9, I_9, H_9}, - {1, G_10, I_10, H_10}, - {1, G_11, I_11, H_11}, - {1, G_12, I_12, H_12}, - {1, G_14, I_14, H_14}, - {1, G_16, I_16, H_16}, - {1, J_7, L_7, K_7}, - {1, J_8, L_8, K_8}, - {1, J_9, L_9, K_9}, - - {1, A_1, C_1, B_1}, - {1, A_3, C_3, B_3}, - {1, A_4, C_4, B_4}, - {1, A_5, C_5, B_5}, - {1, A_6, C_6, B_6}, - {1, A_7, C_7, B_7}, - {1, A_8, C_8, B_8}, - {1, A_9, C_9, B_9}, - {1, A_10, C_10, B_10}, - {1, A_11, C_11, B_11}, - {1, A_12, C_12, B_12}, - {1, A_13, C_13, B_13}, - {1, A_15, C_15, B_15}, - {1, A_16, C_16, B_16}, - {1, J_10, L_10, K_10}, - {1, J_11, L_11, K_11}, - {1, J_12, L_12, K_12}, - {1, J_13, L_13, K_13}, - - {1, D_1, F_1, E_1}, - {1, D_2, F_2, E_2}, - {1, D_3, F_3, E_3}, - {1, D_4, F_4, E_4}, - {1, D_7, F_7, E_7}, - {1, D_10, F_10, E_10}, - {1, D_11, F_11, E_11}, - {1, D_12, F_12, E_12}, - {1, D_13, F_13, E_13}, - {1, D_14, F_14, E_14}, - {1, D_15, F_15, E_15}, - {1, D_16, F_16, E_16}, - {1, J_14, L_14, K_14}, - {1, J_16, L_16, K_16} -}; - - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to RGB Index - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, __ }, - { 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38 }, - { 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, __, 52, 53, 54, 55, 56, 57 }, - { 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, __, 70, __, 71, 72, 73, 74, __ }, - { 75, __, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, __, 87, 88, 89, 90, 91, 92 }, - { 93, 94, 95, 96, __, __, 97, __, __, 98, 99,100,101,102,103,104,105, __,106, __ }, - }, - { - // RGB Index to Physical Position - {0, 0}, {12, 0}, {24, 0}, {36, 0}, {48, 0}, {60, 0}, {72, 0}, {84, 0}, {96, 0}, {108, 0}, {120, 0}, {132, 0}, {144, 0}, {156, 0}, {168, 0}, {180, 0},{192, 0},{203, 0},{213, 0}, - {0,13}, {12,13}, {24,13}, {36,13}, {48,13}, {60,13}, {72,13}, {84,13}, {96,13}, {108,13}, {120,13}, {132,13}, {144,13}, {156,13}, {168,13}, {180,13},{192,13},{203,13},{213,13},{224,13}, - {2,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {90,26}, {102,26},{114,26}, {126,26}, {138,26}, {150,26}, {168,32}, {180,26},{192,26},{203,26},{213,26},{224,32}, - {4,39}, {22,39}, {34,39}, {46,39}, {58,39}, {70,39}, {82,39}, {94,39}, {106,39},{118,39}, {130,39}, {142,39}, {154,39}, {180,39},{192,39},{203,39},{213,39}, - {7,51}, {28,51}, {40,51}, {52,51}, {64,51}, {76,51}, {88,51}, {100,51},{112,51}, {124,51}, {136,51}, {148,51}, {168,51}, {180,51},{192,51},{203,51},{213,51},{224,57}, - {1,64}, {15,64}, {30,64}, {42,64}, {78,64}, {114,64}, {126,64}, {140,64}, {154,64}, {168,64}, {180,64},{192,64},{202,64},{213,64}, - }, - { - // RGB Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - } -}; -#endif diff --git a/keyboards/keychron/k17_max/jis_encoder/rgb/rules.mk b/keyboards/keychron/k17_max/jis_encoder/rgb/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/k17_max/jis_encoder/rgb/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/k17_max/jis_encoder/white/config.h b/keyboards/keychron/k17_max/jis_encoder/white/config.h deleted file mode 100644 index 29af4cab4b..0000000000 --- a/keyboards/keychron/k17_max/jis_encoder/white/config.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2024 @ 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 - -#ifdef LED_MATRIX_ENABLE -/* LED Matrix driver configuration */ -# define LED_MATRIX_LED_COUNT 107 -# define DRIVER_COUNT 1 -# define DRIVER_CS_PINS \ - { B9 } - -/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in snled27351.h) */ -# define SNLED27351_PHASE_CHANNEL MSKPHASE_9CHANNEL -/* Set LED driver current */ -# define SNLED27351_CURRENT_TUNE \ - { 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A } - -/* Set to infinit, which is use in USB mode by default */ -# define LED_MATRIX_TIMEOUT LED_MATRIX_TIMEOUT_INFINITE -/* Allow shutdown of led driver to save power */ -# define LED_MATRIX_DRIVER_SHUTDOWN_ENABLE -/* Turn off backlight on low brightness to save power */ -# define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 - -/* Indications */ -# define DIM_CAPS_LOCK -# define CAPS_LOCK_INDEX 56 -# define DIM_NUM_LOCK -# define NUM_LOCK_INDEX 35 -# define LOW_BAT_IND_INDEX \ - { 95 } -# define BT_HOST_LED_MATRIX_LIST \ - { 20, 21, 22 } -# define P2P4G_HOST_LED_MATRIX_LIST \ - { 23 } -# define BAT_LEVEL_LED_LIST \ - { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 } - -# define LED_MATRIX_KEYPRESSES -#endif diff --git a/keyboards/keychron/k17_max/jis_encoder/white/info.json b/keyboards/keychron/k17_max/jis_encoder/white/info.json deleted file mode 100644 index eb339d33e3..0000000000 --- a/keyboards/keychron/k17_max/jis_encoder/white/info.json +++ /dev/null @@ -1,158 +0,0 @@ -{ - "usb": { - "pid": "0x0A05", - "device_version": "1.0.0" - }, - "features": { - "led_matrix": true - }, - "indicators": { - "caps_lock": "C8", - "num_lock": "B10", - "on_state": 1 - }, - "matrix_pins": { - "cols": ["C6", "C7", "A13", "A14", "A15", "C10", "C11", "C13", "C14", "C15", "C0", "C1", "C2", "C3", "A0", "A1", "A2", "A3", "C5"], - "rows": ["C12", "D2", "B3", "B4", "B5", "B6"] - }, - "layouts":{ - "LAYOUT_108_jis": { - "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":[0,4], "x":4, "y":0}, - {"matrix":[0,5], "x":5, "y":0}, - {"matrix":[0,6], "x":6, "y":0}, - {"matrix":[0,7], "x":7, "y":0}, - {"matrix":[0,8], "x":8, "y":0}, - {"matrix":[0,9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0}, - {"matrix":[0,14], "x":14,"y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, - {"matrix":[0,16], "x":16.5, "y":0}, - {"matrix":[0,17], "x":17.5, "y":0}, - {"matrix":[0,18], "x":18.5, "y":0}, - - {"matrix":[1,0], "x":0, "y":1.25}, - {"matrix":[1,1], "x":1, "y":1.25}, - {"matrix":[1,2], "x":2, "y":1.25}, - {"matrix":[1,3], "x":3, "y":1.25}, - {"matrix":[1,4], "x":4, "y":1.25}, - {"matrix":[1,5], "x":5, "y":1.25}, - {"matrix":[1,6], "x":6, "y":1.25}, - {"matrix":[1,7], "x":7, "y":1.25}, - {"matrix":[1,8], "x":8, "y":1.25}, - {"matrix":[1,9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25}, - {"matrix":[1,14], "x":14, "y":1.25}, - {"matrix":[1,15], "x":15.25, "y":1.25}, - {"matrix":[1,16], "x":16.5, "y":1.25}, - {"matrix":[1,17], "x":17.5, "y":1.25}, - {"matrix":[1,18], "x":18.5, "y":1.25}, - - {"matrix":[2,0], "x":0, "y":2.25, "w":1.5}, - {"matrix":[2,1], "x":1.5, "y":2.25}, - {"matrix":[2,2], "x":2.5, "y":2.25}, - {"matrix":[2,3], "x":3.5, "y":2.25}, - {"matrix":[2,4], "x":4.5, "y":2.25}, - {"matrix":[2,5], "x":5.5, "y":2.25}, - {"matrix":[2,6], "x":6.5, "y":2.25}, - {"matrix":[2,7], "x":7.5, "y":2.25}, - {"matrix":[2,8], "x":8.5, "y":2.25}, - {"matrix":[2,9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,15], "x":15.25,"y":2.25}, - {"matrix":[2,16], "x":16.5, "y":2.25}, - {"matrix":[2,17], "x":17.5, "y":2.25}, - {"matrix":[2,18], "x":18.5, "y":2.25}, - - {"matrix":[3,0], "x":0, "y":3.25, "w":1.75}, - {"matrix":[3,1], "x":1.75, "y":3.25}, - {"matrix":[3,2], "x":2.75, "y":3.25}, - {"matrix":[3,3], "x":3.75, "y":3.25}, - {"matrix":[3,4], "x":4.75, "y":3.25}, - {"matrix":[3,5], "x":5.75, "y":3.25}, - {"matrix":[3,6], "x":6.75, "y":3.25}, - {"matrix":[3,7], "x":7.75, "y":3.25}, - {"matrix":[3,8], "x":8.75, "y":3.25}, - {"matrix":[3,9], "x":9.75, "y":3.25}, - {"matrix":[3,10], "x":10.75, "y":3.25}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,14], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,15], "x":15.25, "y":3.25}, - {"matrix":[3,16], "x":16.5, "y":3.25}, - {"matrix":[3,17], "x":17.5, "y":3.25}, - {"matrix":[3,18], "x":18.5, "y":3.25}, - - {"matrix":[4,0], "x":0, "y":4.25, "w":2.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}, - {"matrix":[4,5], "x":5.25, "y":4.25}, - {"matrix":[4,6], "x":6.25, "y":4.25}, - {"matrix":[4,7], "x":7.25, "y":4.25}, - {"matrix":[4,8], "x":8.25, "y":4.25}, - {"matrix":[4,9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25,"y":4.25}, - {"matrix":[4,11], "x":11.25,"y":4.25}, - {"matrix":[4,12], "x":12.25,"y":4.25}, - {"matrix":[4,14], "x":13.25,"y":4.25, "w":1.75}, - {"matrix":[4,15], "x":15.25, "y":4.25}, - {"matrix":[4,16], "x":16.5, "y":4.25}, - {"matrix":[4,17], "x":17.5, "y":4.25}, - {"matrix":[4,18], "x":18.5, "y":4.25}, - - {"matrix":[5,0], "x":0, "y":5.25, "w":1.25}, - {"matrix":[5,1], "x":1.25,"y":5.25}, - {"matrix":[5,2], "x":2.25, "y":5.25, "w":1.25}, - {"matrix":[5,3], "x":3.5, "y":5.25}, - {"matrix":[5,4], "x":19.5, "y":0}, - {"matrix":[5,5], "x":19.5, "y":1.25}, - {"matrix":[5,6], "x":4.5, "y":5.25, "w":5}, - {"matrix":[5,7], "x":19.5, "y":2.25, "h":2}, - {"matrix":[5,8], "x":19.5, "y":4.25, "h":2}, - {"matrix":[5,9], "x":9.5, "y":5.25}, - {"matrix":[5,10], "x":10.5, "y":5.25}, - {"matrix":[5,11], "x":11.5, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":12.75, "y":5.25,"w":1.25}, - {"matrix":[5,13], "x":14.25, "y":5.25}, - {"matrix":[5,14], "x":15.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[5,16], "x":17.5, "y":5.25}, - {"matrix":[5,18], "x":18.5, "y":5.25} - ] - } - }, - "led_matrix": { - "driver": "snled27351_spi", - "sleep": true, - "animations": { - "none": true, - "solid": true, - "breathing": true, - "band_pinwheel": true, - "band_spiral": true, - "cycle_left_right": true, - "cycle_up_down": true, - "cycle_out_in": true, - "dual_beacon": true, - "solid_reactive_simple": true, - "solid_reactive_multiwide": true, - "solid_reactive_multinexus": true, - "solid_splash": true, - "wave_left_right": true, - "wave_up_down": true - } - } -} diff --git a/keyboards/keychron/k17_max/jis_encoder/white/keymaps/default/keymap.c b/keyboards/keychron/k17_max/jis_encoder/white/keymaps/default/keymap.c deleted file mode 100644 index b644e5fa15..0000000000 --- a/keyboards/keychron/k17_max/jis_encoder/white/keymaps/default/keymap.c +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright 2024 @ 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{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN, -}; - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_108_jis( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, BL_STEP, KC_DEL, KC_F13, KC_F14, KC_F15, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_MUTE, KC_PMNS, KC_SPC, KC_PPLS, KC_PENT, KC_LNG1, KC_RCMMD, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT), - - [MAC_FN] = LAYOUT_108_jis( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, BL_TOGG, _______, _______, _______, _______, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - - [WIN_BASE] = LAYOUT_108_jis( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, BL_STEP, KC_DEL, _______, _______, _______, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, - KC_LCTL, KC_LWIN, KC_LALT, KC_INT5, KC_MUTE, KC_PMNS, KC_SPC, KC_PPLS, KC_PENT, KC_INT4, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - - [WIN_FN] = LAYOUT_108_jis( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, BL_TOGG, _______, _______, _______, _______, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN] = {ENCODER_CCW_CW(BL_DOWN, BL_UP)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_FN] = {ENCODER_CCW_CW(BL_DOWN, BL_UP)}, -}; -#endif - -// clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/k17_max/jis_encoder/white/keymaps/via/keymap.c b/keyboards/keychron/k17_max/jis_encoder/white/keymaps/via/keymap.c deleted file mode 100644 index b644e5fa15..0000000000 --- a/keyboards/keychron/k17_max/jis_encoder/white/keymaps/via/keymap.c +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright 2024 @ 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{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN, -}; - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_108_jis( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, BL_STEP, KC_DEL, KC_F13, KC_F14, KC_F15, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_MUTE, KC_PMNS, KC_SPC, KC_PPLS, KC_PENT, KC_LNG1, KC_RCMMD, MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT), - - [MAC_FN] = LAYOUT_108_jis( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, BL_TOGG, _______, _______, _______, _______, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - - [WIN_BASE] = LAYOUT_108_jis( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, BL_STEP, KC_DEL, _______, _______, _______, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, KC_P7, KC_P8, KC_P9, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, KC_P4, KC_P5, KC_P6, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, - KC_LCTL, KC_LWIN, KC_LALT, KC_INT5, KC_MUTE, KC_PMNS, KC_SPC, KC_PPLS, KC_PENT, KC_INT4, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - - [WIN_FN] = LAYOUT_108_jis( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, BL_TOGG, _______, _______, _______, _______, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN] = {ENCODER_CCW_CW(BL_DOWN, BL_UP)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_FN] = {ENCODER_CCW_CW(BL_DOWN, BL_UP)}, -}; -#endif - -// clang-format on -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/k17_max/jis_encoder/white/keymaps/via/rules.mk b/keyboards/keychron/k17_max/jis_encoder/white/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/keychron/k17_max/jis_encoder/white/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/keychron/k17_max/jis_encoder/white/rules.mk b/keyboards/keychron/k17_max/jis_encoder/white/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keychron/k17_max/jis_encoder/white/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/keychron/k17_max/jis_encoder/white/white.c b/keyboards/keychron/k17_max/jis_encoder/white/white.c deleted file mode 100644 index a9667c5477..0000000000 --- a/keyboards/keychron/k17_max/jis_encoder/white/white.c +++ /dev/null @@ -1,172 +0,0 @@ -/* Copyright 2024 @ 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" - -// clang-format off -#ifdef LED_MATRIX_ENABLE -const snled27351_led_t g_snled27351_leds[LED_MATRIX_LED_COUNT] = { -/* Refer to SNLED27351 manual for these locations - * driver - * | LED address - * | | */ - {0, F_1}, - {0, F_2}, - {0, F_3}, - {0, F_4}, - {0, F_5}, - {0, F_6}, - {0, F_7}, - {0, F_8}, - {0, F_9}, - {0, F_10}, - {0, F_11}, - {0, F_12}, - {0, F_13}, - {0, F_14}, - {0, F_15}, - {0, F_16}, - {0, A_6}, - {0, A_8}, - {0, A_9}, - - {0, E_1}, - {0, E_2}, - {0, E_3}, - {0, E_4}, - {0, E_5}, - {0, E_6}, - {0, E_7}, - {0, E_8}, - {0, E_9}, - {0, E_10}, - {0, E_11}, - {0, E_12}, - {0, E_13}, - {0, E_14}, - {0, E_15}, - {0, E_16}, - {0, H_7}, - {0, H_8}, - {0, H_9}, - - {0, D_1}, - {0, D_2}, - {0, D_3}, - {0, D_4}, - {0, D_5}, - {0, D_6}, - {0, D_7}, - {0, D_8}, - {0, D_9}, - {0, D_10}, - {0, D_11}, - {0, D_12}, - {0, D_13}, - {0, D_15}, - {0, D_16}, - {0, H_12}, - {0, H_13}, - {0, H_14}, - - {0, C_1}, - {0, C_2}, - {0, C_3}, - {0, C_4}, - {0, C_5}, - {0, C_6}, - {0, C_7}, - {0, C_8}, - {0, C_9}, - {0, C_10}, - {0, C_11}, - {0, C_12}, - {0, C_14}, - {0, C_16}, - {0, G_7}, - {0, G_8}, - {0, G_9}, - - {0, B_1}, - {0, B_3}, - {0, B_4}, - {0, B_5}, - {0, B_6}, - {0, B_7}, - {0, B_8}, - {0, B_9}, - {0, B_10}, - {0, B_11}, - {0, B_12}, - {0, B_13}, - {0, B_15}, - {0, B_16}, - {0, G_10}, - {0, G_11}, - {0, G_12}, - - {0, A_1}, - {0, A_2}, - {0, A_3}, - {0, A_4}, - {0, H_10}, - {0, A_7}, - {0, H_15}, - {0, G_13}, - {0, A_10}, - {0, A_11}, - {0, A_12}, - {0, A_13}, - {0, A_14}, - {0, A_15}, - {0, A_16}, - {0, G_14}, - {0, G_16}, -}; - - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to LED Index - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 }, - { 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37 }, - { 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, __, 51, 52, 53, 54, 55 }, - { 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, __, 68, __, 69, 70, 71, 72 }, - { 73, __, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, __, 85, 86, 87, 88, 89 }, - { 90, 91, 92, 93, __, 94, 95, 96, 97, 98, 99,100,101,102,103,104,105, __,106 }, - }, - { - // LED Index to Physical Position - {0, 0}, {12, 0}, {24, 0}, {36, 0}, {48, 0}, {60, 0}, {72, 0}, {84, 0}, {96, 0}, {108, 0}, {120, 0}, {132, 0}, {144, 0}, {156, 0}, {168, 0}, {180, 0}, {192, 0},{203, 0},{213,0}, - {0,13}, {12,13}, {24,13}, {36,13}, {48,13}, {60,13}, {72,13}, {84,13}, {96,13}, {108,13}, {120,13}, {132,13}, {144,13}, {156, 13},{168,13}, {180,13}, {192,13},{203,13},{213,13}, - {2,26}, {18,26}, {30,26}, {42,26}, {54,26}, {66,26}, {78,26}, {90,26}, {102,26},{114,26}, {126,26}, {138,26}, {150,26}, {168,32}, {180,26}, {192,26},{203,26},{213,26}, - {4,39}, {22,39}, {34,39}, {46,39}, {58,39}, {70,39}, {82,39}, {94,39}, {106,39},{118,39}, {130,39}, {142,39}, {154,39}, {180,39}, {192,39},{203,39},{213,39}, - {8,51}, {28,51}, {40,51}, {52,51}, {64,51}, {76,51}, {88,51}, {100,51},{112,51}, {124,51}, {136,51}, {148,51}, {168,51}, {180,51}, {192,51},{203,51},{213,51}, - {1,64}, {15,64}, {30,64}, {42,64}, {224,13},{78,64}, {224,32},{224,57},{114,64}, {126,64}, {140,64}, {154,64}, {168,64}, {180,64}, {192,64},{203,64},{213,64}, - }, - { - // LED Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 - } -}; -#endif diff --git a/keyboards/keychron/k17_max/k17_max.c b/keyboards/keychron/k17_max/k17_max.c deleted file mode 100644 index 6ce92125cc..0000000000 --- a/keyboards/keychron/k17_max/k17_max.c +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright 2024 @ 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" -#include "keychron_task.h" -#include "keychron_common.h" -#ifdef FACTORY_TEST_ENABLE -# include "factory_test.h" -#endif -#ifdef LK_WIRELESS_ENABLE -# include "lkbt51.h" -# include "wireless.h" -#endif - -bool dip_switch_update_kb(uint8_t index, bool active) { - if (index == 0) { - default_layer_set(1UL << (active ? 0 : 2)); - } - dip_switch_update_user(index, active); - - return true; -} - -void keyboard_post_init_kb(void) { -#ifdef LK_WIRELESS_ENABLE - palSetLineMode(P2P4_MODE_SELECT_PIN, PAL_MODE_INPUT); - palSetLineMode(BT_MODE_SELECT_PIN, PAL_MODE_INPUT); - - lkbt51_init(false); - wireless_init(); -#endif - -#ifdef ENCODER_ENABLE - encoder_cb_init(); -#endif - - keyboard_post_init_user(); -} - -#ifdef LK_WIRELESS_ENABLE -bool lpm_is_kb_idle(void) { - return !factory_reset_indicating(); -} -#endif diff --git a/keyboards/keychron/k17_max/mcuconf.h b/keyboards/keychron/k17_max/mcuconf.h deleted file mode 100644 index 89294ee64b..0000000000 --- a/keyboards/keychron/k17_max/mcuconf.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2024 @ 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 - -#include_next - -#undef STM32_HSECLK -#define STM32_HSECLK 16000000 - -#undef STM32_PLLM_VALUE -#define STM32_PLLM_VALUE 8 - -#undef STM32_PLLN_VALUE -#define STM32_PLLN_VALUE 96 - -#undef STM32_PLLP_VALUE -#define STM32_PLLP_VALUE 4 - -#undef STM32_PLLQ_VALUE -#define STM32_PLLQ_VALUE 4 - -#undef STM32_SPI_USE_SPI1 -#define STM32_SPI_USE_SPI1 TRUE diff --git a/keyboards/keychron/k17_max/readme.md b/keyboards/keychron/k17_max/readme.md deleted file mode 100644 index 8459dcc84f..0000000000 --- a/keyboards/keychron/k17_max/readme.md +++ /dev/null @@ -1,35 +0,0 @@ -# Keychron K17 Max - -![Keychron K17 Max](https://cdn.shopify.com/s/files/1/0059/0630/1017/files/K17-Max-3.jpg?v=1720250313) - -A customizable 96% low profile keyboard. - -* Keyboard Maintainer: [Keychron](https://github.com/keychron) -* Hardware Supported: Keychron K17 Max -* Hardware Availability: [Keychron K17 Max QMK/VIA Wireless Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-k17-max-qmk-via-wireless-custom-mechanical-keyboard) - -Make example for this keyboard (after setting up your build environment): - - make keychron/k17_max/ansi/rgb:default - make keychron/k17_max/ansi/white:default - - make keychron/k17_max/iso/rgb:default - make keychron/k17_max/iso/white:default - - make keychron/k17_max/jis/rgb:default - make keychron/k17_max/jis/white:default - -Flashing example for this keyboard: - - make keychron/k17_max/ansi/rgb:default:flash - make keychron/k17_max/ansi/white:default:flash - - make keychron/k17_max/iso/rgb:default:flash - make keychron/k17_max/iso/white:default:flash - - make keychron/k17_max/jis/rgb:default:flash - make keychron/k17_max/jis/white:default:flash - -**Reset Key**: Disconnect the USB cable, toggle mode switch to "Cable", hold down the *Esc* key or reset button underneath space bar, then connect the USB cable. - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/keychron/k17_max/rules.mk b/keyboards/keychron/k17_max/rules.mk deleted file mode 100644 index 4eaf6820bc..0000000000 --- a/keyboards/keychron/k17_max/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -include keyboards/keychron/common/wireless/wireless.mk -include keyboards/keychron/common/keychron_common.mk - -VPATH += $(TOP_DIR)/keyboards/keychron diff --git a/keyboards/keychron/k17_max/via_json/k17_max_ansi_knob_rgb.json b/keyboards/keychron/k17_max/via_json/k17_max_ansi_knob_rgb.json deleted file mode 100644 index 04758609c2..0000000000 --- a/keyboards/keychron/k17_max/via_json/k17_max_ansi_knob_rgb.json +++ /dev/null @@ -1,335 +0,0 @@ -{ - "name": "Keychron K17 Max ANSI Knob RGB", - "vendorId": "0x3434", - "productId": "0x0A00", - "keycodes": ["qmk_lighting"], - "menus": [ - { - "label": "Lighting", - "content": [ - { - "label": "Backlight", - "content": [ - { - "label": "Brightness", - "type": "range", - "options": [0, 255], - "content": ["id_qmk_rgb_matrix_brightness", 3, 1] - }, - { - "label": "Effect", - "type": "dropdown", - "content": ["id_qmk_rgb_matrix_effect", 3, 2], - "options": [ - ["None", 0], - ["Solid Color", 1], - ["Breathing", 2], - ["Band Spiral Val", 3], - ["Cycle All", 4], - ["Cycle Left Right", 5], - ["Cycle Up Down", 6], - ["Rainbow Moving Chevron", 7], - ["Cycle Out In", 8], - ["Cycle Out In Dual", 9], - ["Cycle Pinwheel", 10], - ["Cycle Spiral", 11], - ["Dual Beacon", 12], - ["Rainbow Beacon", 13], - ["Jellybean Raindrops", 14], - ["Pixel Rain", 15], - ["Typing Heatmap", 16], - ["Digital Rain", 17], - ["Reactive Simple", 18], - ["Reactive Multiwide", 19], - ["Reactive Multinexus", 20], - ["Splash", 21], - ["Solid Splash", 22] - ] - }, - { - "showIf": "{id_qmk_rgb_matrix_effect} > 1", - "label": "Effect Speed", - "type": "range", - "options": [0, 255], - "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] - }, - { - "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ", - "label": "Color", - "type": "color", - "content": ["id_qmk_rgb_matrix_color", 3, 4] - } - ] - } - ] - } - ], - "customKeycodes": [ - {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"}, - {"name": "Misson Control", "title": "Misson Control in Mac", "shortName": "MCtl"}, - {"name": "Lanuch Pad", "title": "Lanuch Pad in Windows", "shortName": "LPad"}, - {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"}, - {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"}, - {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, - {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, - {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"}, - {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} - ], - "matrix": {"rows": 6, "cols": 20}, - "layouts": { - "keymap": [ - [ - { - "c": "#777777" - }, - "0,0\nESC", - { - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - { - "c": "#aaaaaa" - }, - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - { - "c": "#cccccc" - }, - "0,10", - "0,11", - "0,12", - { - "c": "#aaaaaa" - }, - "0,13", - "0,14", - { - "x": 0.25 - }, - "0,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "0,16", - "0,17", - "0,18", - { - "c": "#aaaaaa" - }, - "0,19\n\n\n\n\n\n\n\n\ne0" - ], - [ - { - "y": 0.25 - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "c": "#aaaaaa", - "w": 2 - }, - "1,14", - { - "x": 0.25 - }, - "1,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "1,16", - "1,17", - "1,18", - "1,19" - ], - [ - { - "c": "#aaaaaa", - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "2,14", - { - "x": 0.25 - }, - "2,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "2,16", - "2,17", - "2,18", - { - "h": 2 - }, - "2,19" - ], - [ - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - { - "c": "#777777", - "w": 2.25 - }, - "3,13", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "3,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "3,16", - "3,17", - "3,18" - ], - [ - { - "c": "#aaaaaa", - "w": 2.25 - }, - "4,0", - { - "c": "#cccccc" - }, - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "4,12", - { - "x": 0.25, - "c": "#cccccc" - }, - "4,14", - { - "x": 1.25 - }, - "4,16", - "4,17", - "4,18", - { - "h": 2 - }, - "4,19" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "5,0", - { - "w": 1.25 - }, - "5,1", - { - "w": 1.25 - }, - "5,2", - { - "c": "#cccccc", - "w": 6.25 - }, - "5,6", - { - "c": "#aaaaaa" - }, - "5,10", - "5,11", - "5,12", - { - "x": 0.25, - "c": "#cccccc" - }, - "5,13", - "5,14", - "5,15", - { - "x": 0.25, - "c": "#cccccc", - "w": 2 - }, - "5,16", - "5,18" - ] - ] - } -} diff --git a/keyboards/keychron/k17_max/via_json/k17_max_ansi_knob_white.json b/keyboards/keychron/k17_max/via_json/k17_max_ansi_knob_white.json deleted file mode 100644 index 53a2998a78..0000000000 --- a/keyboards/keychron/k17_max/via_json/k17_max_ansi_knob_white.json +++ /dev/null @@ -1,274 +0,0 @@ -{ - "name": "Keychron K17 Max ANSI Knob White", - "vendorId": "0x3434", - "productId": "0x0A03", - "keycodes": ["qmk_lighting"], - "customKeycodes": [ - {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"}, - {"name": "Misson Control", "title": "Misson Control in Mac", "shortName": "MCtl"}, - {"name": "Lanuch Pad", "title": "Lanuch Pad in Windows", "shortName": "LPad"}, - {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"}, - {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"}, - {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, - {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, - {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"}, - {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} - ], - "matrix": {"rows": 6, "cols": 20}, - "layouts": { - "keymap": [ - [ - { - "c": "#777777" - }, - "0,0\nESC", - { - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - { - "c": "#aaaaaa" - }, - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - { - "c": "#cccccc" - }, - "0,10", - "0,11", - "0,12", - { - "c": "#aaaaaa" - }, - "0,13", - "0,14", - { - "x": 0.25 - }, - "0,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "0,16", - "0,17", - "0,18", - { - "c": "#aaaaaa" - }, - "0,19\n\n\n\n\n\n\n\n\ne0" - ], - [ - { - "y": 0.25 - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "c": "#aaaaaa", - "w": 2 - }, - "1,14", - { - "x": 0.25 - }, - "1,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "1,16", - "1,17", - "1,18", - "1,19" - ], - [ - { - "c": "#aaaaaa", - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "c": "#aaaaaa", - "w": 1.5 - }, - "2,14", - { - "x": 0.25 - }, - "2,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "2,16", - "2,17", - "2,18", - { - "h": 2 - }, - "2,19" - ], - [ - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - { - "c": "#777777", - "w": 2.25 - }, - "3,13", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "3,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "3,16", - "3,17", - "3,18" - ], - [ - { - "c": "#aaaaaa", - "w": 2.25 - }, - "4,0", - { - "c": "#cccccc" - }, - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "4,12", - { - "x": 0.25, - "c": "#cccccc" - }, - "4,14", - { - "x": 1.25 - }, - "4,16", - "4,17", - "4,18", - { - "h": 2 - }, - "4,19" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "5,0", - { - "w": 1.25 - }, - "5,1", - { - "w": 1.25 - }, - "5,2", - { - "c": "#cccccc", - "w": 6.25 - }, - "5,6", - { - "c": "#aaaaaa" - }, - "5,10", - "5,11", - "5,12", - { - "x": 0.25, - "c": "#cccccc" - }, - "5,13", - "5,14", - "5,15", - { - "x": 0.25, - "c": "#cccccc", - "w": 2 - }, - "5,16", - "5,18" - ] - ] - } -} \ No newline at end of file diff --git a/keyboards/keychron/k17_max/via_json/k17_max_iso_knob_rgb.json b/keyboards/keychron/k17_max/via_json/k17_max_iso_knob_rgb.json deleted file mode 100644 index 4800d071b7..0000000000 --- a/keyboards/keychron/k17_max/via_json/k17_max_iso_knob_rgb.json +++ /dev/null @@ -1,337 +0,0 @@ -{ - "name": "Keychron K17 Max ISO Knob RGB", - "vendorId": "0x3434", - "productId": "0x0A01", - "keycodes": ["qmk_lighting"], - "menus": [ - { - "label": "Lighting", - "content": [ - { - "label": "Backlight", - "content": [ - { - "label": "Brightness", - "type": "range", - "options": [0, 255], - "content": ["id_qmk_rgb_matrix_brightness", 3, 1] - }, - { - "label": "Effect", - "type": "dropdown", - "content": ["id_qmk_rgb_matrix_effect", 3, 2], - "options": [ - ["None", 0], - ["Solid Color", 1], - ["Breathing", 2], - ["Band Spiral Val", 3], - ["Cycle All", 4], - ["Cycle Left Right", 5], - ["Cycle Up Down", 6], - ["Rainbow Moving Chevron", 7], - ["Cycle Out In", 8], - ["Cycle Out In Dual", 9], - ["Cycle Pinwheel", 10], - ["Cycle Spiral", 11], - ["Dual Beacon", 12], - ["Rainbow Beacon", 13], - ["Jellybean Raindrops", 14], - ["Pixel Rain", 15], - ["Typing Heatmap", 16], - ["Digital Rain", 17], - ["Reactive Simple", 18], - ["Reactive Multiwide", 19], - ["Reactive Multinexus", 20], - ["Splash", 21], - ["Solid Splash", 22] - ] - }, - { - "showIf": "{id_qmk_rgb_matrix_effect} > 1", - "label": "Effect Speed", - "type": "range", - "options": [0, 255], - "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] - }, - { - "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ", - "label": "Color", - "type": "color", - "content": ["id_qmk_rgb_matrix_color", 3, 4] - } - ] - } - ] - } - ], - "customKeycodes": [ - {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"}, - {"name": "Misson Control", "title": "Misson Control in Mac", "shortName": "MCtl"}, - {"name": "Lanuch Pad", "title": "Lanuch Pad in Windows", "shortName": "LPad"}, - {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"}, - {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"}, - {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, - {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, - {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"}, - {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} - ], - "matrix": {"rows": 6, "cols": 20}, - "layouts": { - "keymap": [ - [ - { - "c": "#777777" - }, - "0,0\nESC", - { - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - { - "c": "#aaaaaa" - }, - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - { - "c": "#cccccc" - }, - "0,10", - "0,11", - "0,12", - { - "c": "#aaaaaa" - }, - "0,13", - "0,14", - { - "x": 0.25 - }, - "0,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "0,16", - "0,17", - "0,18", - { - "c": "#aaaaaa" - }, - "0,19\n\n\n\n\n\n\n\n\ne0" - ], - [ - { - "y": 0.25 - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "c": "#aaaaaa", - "w": 2 - }, - "1,14", - { - "x": 0.25 - }, - "1,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "1,16", - "1,17", - "1,18", - "1,19" - ], - [ - { - "c": "#aaaaaa", - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "x": 0.25, - "c": "#aaaaaa", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "2,14", - { - "x": 0.25 - }, - "2,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "2,16", - "2,17", - "2,18", - { - "h": 2 - }, - "2,19" - ], - [ - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - "3,13", - { - "x": 1.5, - "c": "#aaaaaa" - }, - "3,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "3,16", - "3,17", - "3,18" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,0", - { - "c": "#cccccc" - }, - "4,1", - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "4,12", - { - "x": 0.25, - "c": "#cccccc" - }, - "4,14", - { - "x": 1.25 - }, - "4,16", - "4,17", - "4,18", - { - "h": 2 - }, - "4,19" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "5,0", - { - "w": 1.25 - }, - "5,1", - { - "w": 1.25 - }, - "5,2", - { - "c": "#cccccc", - "w": 6.25 - }, - "5,6", - { - "c": "#aaaaaa" - }, - "5,10", - "5,11", - "5,12", - { - "x": 0.25, - "c": "#cccccc" - }, - "5,13", - "5,14", - "5,15", - { - "x": 0.25, - "c": "#cccccc", - "w": 2 - }, - "5,16", - "5,18" - ] - ] - } -} diff --git a/keyboards/keychron/k17_max/via_json/k17_max_iso_knob_white.json b/keyboards/keychron/k17_max/via_json/k17_max_iso_knob_white.json deleted file mode 100644 index 541fc55e37..0000000000 --- a/keyboards/keychron/k17_max/via_json/k17_max_iso_knob_white.json +++ /dev/null @@ -1,276 +0,0 @@ -{ - "name": "Keychron K17 Max ISO Knob White", - "vendorId": "0x3434", - "productId": "0x0A04", - "keycodes": ["qmk_lighting"], - "customKeycodes": [ - {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"}, - {"name": "Misson Control", "title": "Misson Control in Mac", "shortName": "MCtl"}, - {"name": "Lanuch Pad", "title": "Lanuch Pad in Windows", "shortName": "LPad"}, - {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"}, - {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"}, - {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, - {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, - {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"}, - {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} - ], - "matrix": {"rows": 6, "cols": 18}, - "layouts": { - "keymap": [ - [ - { - "c": "#777777" - }, - "0,0\nESC", - { - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - { - "c": "#aaaaaa" - }, - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - { - "c": "#cccccc" - }, - "0,10", - "0,11", - "0,12", - { - "c": "#aaaaaa" - }, - "4,14", - "0,13", - { - "x": 0.25 - }, - "0,14", - { - "x": 0.25, - "c": "#cccccc" - }, - "0,15", - "0,16", - "0,17", - { - "c": "#aaaaaa" - }, - "5,4\n\n\n\n\n\n\n\n\ne0" - ], - [ - { - "y": 0.25 - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - { - "c": "#aaaaaa", - "w": 2 - }, - "1,13", - { - "x": 0.25 - }, - "1,14", - { - "x": 0.25, - "c": "#cccccc" - }, - "1,15", - "1,16", - "1,17", - "5,5" - ], - [ - { - "c": "#aaaaaa", - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "x": 0.25, - "c": "#aaaaaa", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "2,13", - { - "x": 0.25 - }, - "2,14", - { - "x": 0.25, - "c": "#cccccc" - }, - "2,15", - "2,16", - "2,17", - { - "h": 2 - }, - "5,7" - ], - [ - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - "3,13", - { - "x": 1.5, - "c": "#aaaaaa" - }, - "3,14", - { - "x": 0.25, - "c": "#cccccc" - }, - "3,15", - "3,16", - "3,17" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "4,0", - { - "c": "#cccccc" - }, - "4,1", - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "4,12", - { - "x": 0.25, - "c": "#cccccc" - }, - "4,13", - { - "x": 1.25 - }, - "4,15", - "4,16", - "4,17", - { - "h": 2 - }, - "5,8" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "5,0", - { - "w": 1.25 - }, - "5,1", - { - "w": 1.25 - }, - "5,2", - { - "c": "#cccccc", - "w": 6.25 - }, - "5,6", - { - "c": "#aaaaaa" - }, - "5,10", - "5,11", - "5,12", - { - "x": 0.25, - "c": "#cccccc" - }, - "5,16", - "5,13", - "5,14", - { - "x": 0.25, - "c": "#cccccc", - "w": 2 - }, - "5,15", - "5,17" - ] - ] - } -} \ No newline at end of file diff --git a/keyboards/keychron/k17_max/via_json/k17_max_jis_knob_rgb.json b/keyboards/keychron/k17_max/via_json/k17_max_jis_knob_rgb.json deleted file mode 100644 index ae5640655b..0000000000 --- a/keyboards/keychron/k17_max/via_json/k17_max_jis_knob_rgb.json +++ /dev/null @@ -1,339 +0,0 @@ -{ - "name": "Keychron K17 Max JIS Knob RGB", - "vendorId": "0x3434", - "productId": "0x0A02", - "keycodes": ["qmk_lighting"], - "menus": [ - { - "label": "Lighting", - "content": [ - { - "label": "Backlight", - "content": [ - { - "label": "Brightness", - "type": "range", - "options": [0, 255], - "content": ["id_qmk_rgb_matrix_brightness", 3, 1] - }, - { - "label": "Effect", - "type": "dropdown", - "content": ["id_qmk_rgb_matrix_effect", 3, 2], - "options": [ - ["None", 0], - ["Solid Color", 1], - ["Breathing", 2], - ["Band Spiral Val", 3], - ["Cycle All", 4], - ["Cycle Left Right", 5], - ["Cycle Up Down", 6], - ["Rainbow Moving Chevron", 7], - ["Cycle Out In", 8], - ["Cycle Out In Dual", 9], - ["Cycle Pinwheel", 10], - ["Cycle Spiral", 11], - ["Dual Beacon", 12], - ["Rainbow Beacon", 13], - ["Jellybean Raindrops", 14], - ["Pixel Rain", 15], - ["Typing Heatmap", 16], - ["Digital Rain", 17], - ["Reactive Simple", 18], - ["Reactive Multiwide", 19], - ["Reactive Multinexus", 20], - ["Splash", 21], - ["Solid Splash", 22] - ] - }, - { - "showIf": "{id_qmk_rgb_matrix_effect} > 1", - "label": "Effect Speed", - "type": "range", - "options": [0, 255], - "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] - }, - { - "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ", - "label": "Color", - "type": "color", - "content": ["id_qmk_rgb_matrix_color", 3, 4] - } - ] - } - ] - } - ], - "customKeycodes": [ - {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"}, - {"name": "Misson Control", "title": "Misson Control in Mac", "shortName": "MCtl"}, - {"name": "Lanuch Pad", "title": "Lanuch Pad in Windows", "shortName": "LPad"}, - {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"}, - {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"}, - {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, - {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, - {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"}, - {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} - ], - "matrix": {"rows": 6, "cols": 20}, - "layouts": { - "keymap": [ - [ - { - "c": "#777777" - }, - "0,0\nESC", - { - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - { - "c": "#aaaaaa" - }, - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - { - "c": "#cccccc" - }, - "0,10", - "0,11", - "0,12", - { - "c": "#aaaaaa" - }, - "0,13", - "0,14", - { - "x": 0.25 - }, - "0,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "0,16", - "0,17", - "0,18", - { - "c": "#aaaaaa" - }, - "0,19\n\n\n\n\n\n\n\n\ne0" - ], - [ - { - "y": 0.25 - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - "1,13", - "1,14", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "1,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "1,16", - "1,17", - "1,18", - "1,19" - ], - [ - { - "c": "#aaaaaa", - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "x": 0.25, - "c": "#aaaaaa", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "2,14", - { - "x": 0.25 - }, - "2,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "2,16", - "2,17", - "2,18", - { - "h": 2 - }, - "2,19" - ], - [ - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - "3,13", - { - "x": 1.5, - "c": "#aaaaaa" - }, - "3,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "3,16", - "3,17", - "3,18" - ], - [ - { - "c": "#aaaaaa", - "w": 2.25 - }, - "4,0", - { - "c": "#cccccc" - }, - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - "4,12", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "4,14", - { - "x": 0.25, - "c": "#cccccc" - }, - "4,15", - { - "x": 0.25 - }, - "4,16", - "4,17", - "4,18", - { - "h": 2 - }, - "4,19" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "5,0", - "5,1", - { - "w": 1.25 - }, - "5,2", - "5,3", - { - "c": "#cccccc", - "w": 5 - }, - "5,6", - { - "c": "#aaaaaa" - }, - "5,9", - "5,10", - { - "w": 1.25 - }, - "5,11", - { - "w": 1.25 - }, - "5,12", - { - "x": 0.25, - "c": "#cccccc" - }, - "5,13", - "5,14", - "5,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "5,16", - "5,18" - ] - ] - } -} diff --git a/keyboards/keychron/k17_max/via_json/k17_max_jis_knob_white.json b/keyboards/keychron/k17_max/via_json/k17_max_jis_knob_white.json deleted file mode 100644 index 25f90bab92..0000000000 --- a/keyboards/keychron/k17_max/via_json/k17_max_jis_knob_white.json +++ /dev/null @@ -1,277 +0,0 @@ -{ - "name": "Keychron K17 Max JIS Knob White", - "vendorId": "0x3434", - "productId": "0x0A05", - "keycodes": ["qmk_lighting"], - "customKeycodes": [ - {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"}, - {"name": "Misson Control", "title": "Misson Control in Mac", "shortName": "MCtl"}, - {"name": "Lanuch Pad", "title": "Lanuch Pad in Windows", "shortName": "LPad"}, - {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"}, - {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"}, - {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, - {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, - {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"}, - {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} - ], - "matrix": {"rows": 6, "cols": 19}, - "layouts": { - "keymap": [ - [ - { - "c": "#777777" - }, - "0,0\nESC", - { - "c": "#cccccc" - }, - "0,1", - "0,2", - "0,3", - "0,4", - { - "c": "#aaaaaa" - }, - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - { - "c": "#cccccc" - }, - "0,10", - "0,11", - "0,12", - { - "c": "#aaaaaa" - }, - "0,13", - "0,14", - { - "x": 0.25 - }, - "0,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "0,16", - "0,17", - "0,18", - { - "c": "#aaaaaa" - }, - "5,4\n\n\n\n\n\n\n\n\ne0" - ], - [ - { - "y": 0.25 - }, - "1,0", - { - "c": "#cccccc" - }, - "1,1", - "1,2", - "1,3", - "1,4", - "1,5", - "1,6", - "1,7", - "1,8", - "1,9", - "1,10", - "1,11", - "1,12", - "1,13", - "1,14", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "1,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "1,16", - "1,17", - "1,18", - "5,5" - ], - [ - { - "c": "#aaaaaa", - "w": 1.5 - }, - "2,0", - { - "c": "#cccccc" - }, - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11", - "2,12", - { - "x": 0.25, - "c": "#aaaaaa", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "2,14", - { - "x": 0.25 - }, - "2,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "2,16", - "2,17", - "2,18", - { - "h": 2 - }, - "5,7" - ], - [ - { - "c": "#aaaaaa", - "w": 1.75 - }, - "3,0", - { - "c": "#cccccc" - }, - "3,1", - "3,2", - "3,3", - "3,4", - "3,5", - "3,6", - "3,7", - "3,8", - "3,9", - "3,10", - "3,11", - "3,13", - { - "x": 1.5, - "c": "#aaaaaa" - }, - "3,15", - { - "x": 0.25, - "c": "#cccccc" - }, - "3,16", - "3,17", - "3,18" - ], - [ - { - "c": "#aaaaaa", - "w": 2.25 - }, - "4,0", - { - "c": "#cccccc" - }, - "4,2", - "4,3", - "4,4", - "4,5", - "4,6", - "4,7", - "4,8", - "4,9", - "4,10", - "4,11", - "4,12", - { - "c": "#aaaaaa", - "w": 1.75 - }, - "4,14", - { - "x": 0.25, - "c": "#cccccc" - }, - "4,15", - { - "x": 0.25 - }, - "4,16", - "4,17", - "4,18", - { - "h": 2 - }, - "5,8" - ], - [ - { - "c": "#aaaaaa", - "w": 1.25 - }, - "5,0", - "5,1", - { - "w": 1.25 - }, - "5,2", - "5,3", - { - "c": "#cccccc", - "w": 5 - }, - "5,6", - { - "c": "#aaaaaa" - }, - "5,9", - "5,10", - { - "w": 1.25 - }, - "5,11", - { - "w": 1.25 - }, - "5,12", - { - "x": 0.25, - "c": "#cccccc" - }, - "5,13", - "5,14", - "5,15", - { - "x": 0.25 - }, - "5,16", - "5,18" - ] - ] - } -} \ No newline at end of file diff --git a/keyboards/keychron/k2_pro/info.json b/keyboards/keychron/k2_pro/info.json index dc2b89d07c..573e36d4ef 100644 --- a/keyboards/keychron/k2_pro/info.json +++ b/keyboards/keychron/k2_pro/info.json @@ -169,6 +169,7 @@ {"matrix":[2,10], "x":10.5, "y":2}, {"matrix":[2,11], "x":11.5, "y":2}, {"matrix":[2,12], "x":12.5, "y":2}, + {"matrix":[2,13], "x":13.5, "y":2, "w":1.5}, {"matrix":[2,15], "x":15, "y":2}, {"matrix":[3, 0], "x":0, "y":3, "w":1.75}, @@ -183,8 +184,7 @@ {"matrix":[3, 9], "x":9.75, "y":3}, {"matrix":[3,10], "x":10.75, "y":3}, {"matrix":[3,11], "x":11.75, "y":3}, - {"matrix":[3,13], "x":12.75, "y":3}, - {"matrix":[2,13], "x":13.75, "y":2, "w":1.25, "h": 2}, + {"matrix":[3,13], "x":12.75, "y":3, "w":2.25}, {"matrix":[3,15], "x":15, "y":3}, {"matrix":[4, 0], "x":0, "y":4, "w":1.25}, diff --git a/keyboards/keychron/k2_pro/iso/rgb/keymaps/default/keymap.c b/keyboards/keychron/k2_pro/iso/rgb/keymaps/default/keymap.c index 6d2141aec5..b217e1b693 100644 --- a/keyboards/keychron/k2_pro/iso/rgb/keymaps/default/keymap.c +++ b/keyboards/keychron/k2_pro/iso/rgb/keymaps/default/keymap.c @@ -28,32 +28,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_iso_85( KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, RGB_MOD, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_iso_85( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, RGB_TOG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BAT_LVL, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [WIN_BASE] = LAYOUT_iso_85( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, RGB_MOD, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_iso_85( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + KC_TRNS, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, RGB_TOG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BAT_LVL, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/keychron/k2_pro/iso/rgb/keymaps/via/keymap.c b/keyboards/keychron/k2_pro/iso/rgb/keymaps/via/keymap.c index 6d2141aec5..b217e1b693 100644 --- a/keyboards/keychron/k2_pro/iso/rgb/keymaps/via/keymap.c +++ b/keyboards/keychron/k2_pro/iso/rgb/keymaps/via/keymap.c @@ -28,32 +28,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_iso_85( KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, RGB_MOD, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_iso_85( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, RGB_TOG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BAT_LVL, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [WIN_BASE] = LAYOUT_iso_85( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, RGB_MOD, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_iso_85( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + KC_TRNS, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, RGB_TOG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BAT_LVL, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/keychron/k2_pro/iso/white/keymaps/default/keymap.c b/keyboards/keychron/k2_pro/iso/white/keymaps/default/keymap.c index c1844be11f..55cd5ac7c3 100644 --- a/keyboards/keychron/k2_pro/iso/white/keymaps/default/keymap.c +++ b/keyboards/keychron/k2_pro/iso/white/keymaps/default/keymap.c @@ -28,32 +28,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_iso_85( KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, BL_STEP, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_iso_85( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, BL_TOGG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + BL_TOGG, BL_STEP, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BAT_LVL, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [WIN_BASE] = LAYOUT_iso_85( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, BL_STEP, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_iso_85( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + KC_TRNS, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, BL_TOGG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + BL_TOGG, BL_STEP, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BAT_LVL, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/keychron/k2_pro/iso/white/keymaps/via/keymap.c b/keyboards/keychron/k2_pro/iso/white/keymaps/via/keymap.c index c1844be11f..55cd5ac7c3 100644 --- a/keyboards/keychron/k2_pro/iso/white/keymaps/via/keymap.c +++ b/keyboards/keychron/k2_pro/iso/white/keymaps/via/keymap.c @@ -28,32 +28,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_iso_85( KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, BL_STEP, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN] = LAYOUT_iso_85( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, BL_TOGG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + BL_TOGG, BL_STEP, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BAT_LVL, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [WIN_BASE] = LAYOUT_iso_85( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, BL_STEP, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [WIN_FN] = LAYOUT_iso_85( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + KC_TRNS, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, BL_TOGG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + BL_TOGG, BL_STEP, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BAT_LVL, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/keychron/k4_pro/via_json/k4_pro_ansi_rgb.json b/keyboards/keychron/k4_pro/via_json/k4_pro_ansi_rgb.json index 359eccb90c..00a14f7f22 100644 --- a/keyboards/keychron/k4_pro/via_json/k4_pro_ansi_rgb.json +++ b/keyboards/keychron/k4_pro/via_json/k4_pro_ansi_rgb.json @@ -114,7 +114,7 @@ "0,13", "0,14", { - "x": 0.5 + "x": 0.5500000000000007 }, "0,15", "0,16", @@ -123,7 +123,7 @@ ], [ { - "y": 0.25 + "y": 0.26 }, "1,0", { @@ -147,7 +147,7 @@ }, "1,13", { - "x": 0.5, + "x": 0.5500000000000007, "c": "#cccccc" }, "1,14", diff --git a/keyboards/keychron/k4_pro/via_json/k4_pro_iso_rgb.json b/keyboards/keychron/k4_pro/via_json/k4_pro_iso_rgb.json index 89e0386619..40329ea987 100644 --- a/keyboards/keychron/k4_pro/via_json/k4_pro_iso_rgb.json +++ b/keyboards/keychron/k4_pro/via_json/k4_pro_iso_rgb.json @@ -177,7 +177,17 @@ "2,11", "2,12", { - "x": 2, + "x": 0.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "3,13", + { + "x": 0.5, "c": "#cccccc" }, "2,14", @@ -211,20 +221,9 @@ { "c": "#aaaaaa" }, - "3,13", - { - "y": -1, - "c": "#777777", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, "2,13", { - "x": 0.5, - "y": 1, + "x": 1.75, "c": "#cccccc" }, "3,14", diff --git a/keyboards/keychron/k4_pro/via_json/k4_pro_iso_white.json b/keyboards/keychron/k4_pro/via_json/k4_pro_iso_white.json index ca2fa4f1de..958992a908 100644 --- a/keyboards/keychron/k4_pro/via_json/k4_pro_iso_white.json +++ b/keyboards/keychron/k4_pro/via_json/k4_pro_iso_white.json @@ -115,6 +115,16 @@ "2,10", "2,11", "2,12", + { + "x": 0.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "3,13", { "x": 0.5, "c": "#cccccc" @@ -150,26 +160,14 @@ { "c": "#aaaaaa" }, - "3,13", - { - "y": -1, - "c": "#777777", - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, "2,13", { - "x": 0.5, - "y": 1, + "x": 1.75, "c": "#cccccc" }, "3,14", "3,15", "3,16" - ], [ { diff --git a/keyboards/keychron/k6_pro/info.json b/keyboards/keychron/k6_pro/info.json index de9392d350..162e40a482 100644 --- a/keyboards/keychron/k6_pro/info.json +++ b/keyboards/keychron/k6_pro/info.json @@ -75,7 +75,7 @@ {"matrix":[2,10], "x":10.75, "y":3}, {"matrix":[2,11], "x":11.75, "y":3}, {"matrix":[2,13], "x":12.75, "y":3, "w":2.25}, - {"matrix":[2,14], "x":15, "y":3}, + {"matrix":[2,14], "x":15, "y":3, "w":2.25}, {"matrix":[3, 0], "x":0, "y":4, "w":2.25}, {"matrix":[3, 2], "x":2.25, "y":4}, @@ -135,6 +135,7 @@ {"matrix":[1,10], "x":10.5, "y":2}, {"matrix":[1,11], "x":11.5, "y":2}, {"matrix":[1,12], "x":12.5, "y":2}, + {"matrix":[1,13], "x":13.5, "y":2, "w":1.5}, {"matrix":[1,14], "x":15, "y":2}, {"matrix":[2, 0], "x":0, "y":3, "w":1.75}, @@ -149,12 +150,11 @@ {"matrix":[2, 9], "x":9.75, "y":3}, {"matrix":[2,10], "x":10.75, "y":3}, {"matrix":[2,11], "x":11.75, "y":3}, - {"matrix":[2,13], "x":12.75, "y":3}, - {"matrix":[1,13], "x":13.75, "y":2, "w":1.25, "h": 2}, - {"matrix":[2,14], "x":15, "y":3}, + {"matrix":[2,13], "x":12.75, "y":3, "w":2.25}, + {"matrix":[2,14], "x":15, "y":3, "w":2.25}, {"matrix":[3, 0], "x":0, "y":4, "w":1.25}, - {"matrix":[3, 1], "x":1.25, "y":4}, + {"matrix":[3, 1], "x":1.25, "y":4}, {"matrix":[3, 2], "x":2.25, "y":4}, {"matrix":[3, 3], "x":3.25, "y":4}, {"matrix":[3, 4], "x":4.25, "y":4}, diff --git a/keyboards/keychron/k6_pro/iso/rgb/keymaps/default/keymap.c b/keyboards/keychron/k6_pro/iso/rgb/keymaps/default/keymap.c index df7b7a2d3e..31f09df02c 100644 --- a/keyboards/keychron/k6_pro/iso/rgb/keymaps/default/keymap.c +++ b/keyboards/keychron/k6_pro/iso/rgb/keymaps/default/keymap.c @@ -28,36 +28,36 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_iso_69( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, RGB_MOD, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_HOME, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), [WIN_BASE] = LAYOUT_iso_69( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, RGB_MOD, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_HOME, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN1] = LAYOUT_iso_69( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, RGB_TOG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [WIN_FN1] = LAYOUT_iso_69( - KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, RGB_TOG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [FN2] = LAYOUT_iso_69( - KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BAT_LVL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; diff --git a/keyboards/keychron/k6_pro/iso/rgb/keymaps/via/keymap.c b/keyboards/keychron/k6_pro/iso/rgb/keymaps/via/keymap.c index df7b7a2d3e..fb0eb27979 100644 --- a/keyboards/keychron/k6_pro/iso/rgb/keymaps/via/keymap.c +++ b/keyboards/keychron/k6_pro/iso/rgb/keymaps/via/keymap.c @@ -28,36 +28,36 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_iso_69( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, RGB_MOD, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_HOME, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), [WIN_BASE] = LAYOUT_iso_69( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, RGB_MOD, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_HOME, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN1] = LAYOUT_iso_69( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, RGB_TOG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [WIN_FN1] = LAYOUT_iso_69( - KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, RGB_TOG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [FN2] = LAYOUT_iso_69( - KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BAT_LVL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; diff --git a/keyboards/keychron/k6_pro/iso/white/keymaps/default/keymap.c b/keyboards/keychron/k6_pro/iso/white/keymaps/default/keymap.c index 6afa70ecf9..6602efe57d 100644 --- a/keyboards/keychron/k6_pro/iso/white/keymaps/default/keymap.c +++ b/keyboards/keychron/k6_pro/iso/white/keymaps/default/keymap.c @@ -28,36 +28,36 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_iso_69( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, BL_STEP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_HOME, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), [WIN_BASE] = LAYOUT_iso_69( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, BL_STEP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_HOME, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,MO(WIN_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN1] = LAYOUT_iso_69( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, BL_TOGG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + BL_TOGG, BL_STEP, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [WIN_FN1] = LAYOUT_iso_69( - KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, BL_TOGG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + BL_TOGG, BL_STEP, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [FN2] = LAYOUT_iso_69( - KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BAT_LVL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; diff --git a/keyboards/keychron/k6_pro/iso/white/keymaps/via/keymap.c b/keyboards/keychron/k6_pro/iso/white/keymaps/via/keymap.c index 6afa70ecf9..735ed80cae 100644 --- a/keyboards/keychron/k6_pro/iso/white/keymaps/via/keymap.c +++ b/keyboards/keychron/k6_pro/iso/white/keymaps/via/keymap.c @@ -28,36 +28,36 @@ enum layers{ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_iso_69( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, BL_STEP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_HOME, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), [WIN_BASE] = LAYOUT_iso_69( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, BL_STEP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_HOME, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT,MO(WIN_FN1),MO(FN2), KC_LEFT, KC_DOWN, KC_RGHT), [MAC_FN1] = LAYOUT_iso_69( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, BL_TOGG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + BL_TOGG, BL_STEP, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [WIN_FN1] = LAYOUT_iso_69( - KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, BL_TOGG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, BL_TOGG, + KC_TRNS, BT_HST1, BT_HST2, BT_HST3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + BL_TOGG, BL_STEP, BL_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [FN2] = LAYOUT_iso_69( - KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BAT_LVL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; diff --git a/keyboards/keychron/k6_pro/via_json/k6_pro_iso_rgb.json b/keyboards/keychron/k6_pro/via_json/k6_pro_iso_rgb.json index f0b78c088f..db235863f6 100644 --- a/keyboards/keychron/k6_pro/via_json/k6_pro_iso_rgb.json +++ b/keyboards/keychron/k6_pro/via_json/k6_pro_iso_rgb.json @@ -103,10 +103,12 @@ "0,11", "0,12", { - "w":2.00, - "c": "#aaaaaa" + "w":2.00 }, "0,13", + { + "c": "#cccccc" + }, "0,14" ], [ @@ -141,7 +143,7 @@ }, "1,13", { - "c": "#aaaaaa" + "c": "#cccccc" }, "1,14" ], @@ -168,7 +170,7 @@ "2,13", { "x": 1.25, - "c": "#aaaaaa" + "c": "#cccccc" }, "2,14" ], @@ -202,7 +204,7 @@ }, "3,13", { - "c": "#aaaaaa" + "c": "#cccccc" }, "3,14" ], @@ -229,6 +231,9 @@ "c": "#aaaaaa" }, "4,9", + { + "c": "#cccccc" + }, "4,10", "4,11", { diff --git a/keyboards/keychron/k6_pro/via_json/k6_pro_iso_white.json b/keyboards/keychron/k6_pro/via_json/k6_pro_iso_white.json index b449e969dc..1af043f1f7 100644 --- a/keyboards/keychron/k6_pro/via_json/k6_pro_iso_white.json +++ b/keyboards/keychron/k6_pro/via_json/k6_pro_iso_white.json @@ -42,10 +42,12 @@ "0,11", "0,12", { - "w":2.00, - "c": "#aaaaaa" + "w":2.00 }, "0,13", + { + "c": "#cccccc" + }, "0,14" ], [ @@ -80,7 +82,7 @@ }, "1,13", { - "c": "#aaaaaa" + "c": "#cccccc" }, "1,14" ], @@ -107,7 +109,7 @@ "2,13", { "x": 1.25, - "c": "#aaaaaa" + "c": "#cccccc" }, "2,14" ], @@ -141,7 +143,7 @@ }, "3,13", { - "c": "#aaaaaa" + "c": "#cccccc" }, "3,14" ], @@ -168,6 +170,9 @@ "c": "#aaaaaa" }, "4,9", + { + "c": "#cccccc" + }, "4,10", "4,11", { diff --git a/keyboards/keychron/q6_max/ansi_encoder/config.h b/keyboards/keychron/q6_max/ansi_encoder/config.h index 067f433ba1..7806a09ba0 100644 --- a/keyboards/keychron/q6_max/ansi_encoder/config.h +++ b/keyboards/keychron/q6_max/ansi_encoder/config.h @@ -20,8 +20,15 @@ /* RGB Matrix driver configuration */ # define DRIVER_COUNT 2 # define RGB_MATRIX_LED_COUNT 108 + +# define SPI_SCK_PIN A5 +# define SPI_MISO_PIN A6 +# define SPI_MOSI_PIN A7 + # define DRIVER_CS_PINS \ { B8, B9 } +# define SNLED23751_SPI_DIVISOR 16 +# define SPI_DRIVER SPID1 /* Set LED driver current */ # define SNLED27351_CURRENT_TUNE \ @@ -29,6 +36,7 @@ /* Set to infinit, which is use in USB mode by default */ # define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE + /* Allow shutdown of led driver to save power */ # define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE /* Turn off backlight on low brightness to save power */ diff --git a/keyboards/keychron/q6_max/config.h b/keyboards/keychron/q6_max/config.h index 16bf57e34d..cfe6bff545 100644 --- a/keyboards/keychron/q6_max/config.h +++ b/keyboards/keychron/q6_max/config.h @@ -20,19 +20,6 @@ #define ENCODER_DEFAULT_POS 0x3 #define ENCODER_MAP_KEY_DELAY 2 -#if defined(RGB_MATRIX_ENABLE) || defined(LK_WIRELESS_ENABLE) -/* SPI configuration */ -# define SPI_DRIVER SPID1 -# define SPI_SCK_PIN A5 -# define SPI_MISO_PIN A6 -# define SPI_MOSI_PIN A7 -#endif - -#if defined(RGB_MATRIX_ENABLE) -# define LED_DRIVER_SHUTDOWN_PIN B7 -# define SNLED23751_SPI_DIVISOR 16 -#endif - #ifdef LK_WIRELESS_ENABLE /* Hardware configuration */ # define P2P4_MODE_SELECT_PIN A10 @@ -55,17 +42,23 @@ # if defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE) +# define LED_DRIVER_SHUTDOWN_PIN B7 + # define BT_HOST_LED_MATRIX_LIST \ { 20, 21, 22 } + # define P2P4G_HOST_LED_MATRIX_LIST \ { 23 } + # define BAT_LEVEL_LED_LIST \ { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 } /* Backlit disable timeout when keyboard is disconnected(unit: second) */ # define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40 + /* Backlit disable timeout when keyboard is connected(unit: second) */ # define CONNECTED_BACKLIGHT_DISABLE_TIMEOUT 600 + /* Reinit LED driver on tranport changed */ # define REINIT_LED_DRIVER 1 diff --git a/keyboards/keychron/q6_max/iso_encoder/config.h b/keyboards/keychron/q6_max/iso_encoder/config.h index aaf6b02634..38db19f4dc 100644 --- a/keyboards/keychron/q6_max/iso_encoder/config.h +++ b/keyboards/keychron/q6_max/iso_encoder/config.h @@ -20,8 +20,15 @@ /* RGB Matrix driver configuration */ # define DRIVER_COUNT 2 # define RGB_MATRIX_LED_COUNT 109 + +# define SPI_SCK_PIN A5 +# define SPI_MISO_PIN A6 +# define SPI_MOSI_PIN A7 + # define DRIVER_CS_PINS \ { B8, B9 } +# define SNLED23751_SPI_DIVISOR 16 +# define SPI_DRIVER SPID1 /* Set LED driver current */ # define SNLED27351_CURRENT_TUNE \ diff --git a/keyboards/keychron/v1_max/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v1_max/ansi_encoder/ansi_encoder.c index 128b784e04..6f62a01dba 100644 --- a/keyboards/keychron/v1_max/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/v1_max/ansi_encoder/ansi_encoder.c @@ -21,11 +21,11 @@ #ifdef RGB_MATRIX_ENABLE const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to SNLED27351 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ {0, G_1, I_1, H_1}, {0, G_2, I_2, H_2}, {0, G_3, I_3, H_3}, diff --git a/keyboards/keychron/v1_max/ansi_encoder/config.h b/keyboards/keychron/v1_max/ansi_encoder/config.h index 38c3b2ffba..869c74a719 100644 --- a/keyboards/keychron/v1_max/ansi_encoder/config.h +++ b/keyboards/keychron/v1_max/ansi_encoder/config.h @@ -18,19 +18,28 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix driver configuration */ -# define RGB_MATRIX_LED_COUNT 81 # define DRIVER_COUNT 2 +# define RGB_MATRIX_LED_COUNT 81 + +# define SPI_SCK_PIN A5 +# define SPI_MISO_PIN A6 +# define SPI_MOSI_PIN A7 + # define DRIVER_CS_PINS \ { B8, B9 } +# define SNLED23751_SPI_DIVISOR 16 +# define SPI_DRIVER SPID1 /* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in snled27351.h) */ -# define SNLED27351_PHASE_CHANNEL MSKPHASE_9CHANNEL +# define PHASE_CHANNEL MSKPHASE_9CHANNEL + /* Set LED driver current */ # define SNLED27351_CURRENT_TUNE \ { 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C } /* Set to infinit, which is use in USB mode by default */ # define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE + /* Allow shutdown of led driver to save power */ # define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE /* Turn off backlight on low brightness to save power */ diff --git a/keyboards/keychron/v1_max/config.h b/keyboards/keychron/v1_max/config.h index d50eddd85a..6c55a40889 100644 --- a/keyboards/keychron/v1_max/config.h +++ b/keyboards/keychron/v1_max/config.h @@ -1,4 +1,4 @@ -/* Copyright 2023 ~ 2024 @ Keychron (https://www.keychron.com) +/* 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 @@ -20,19 +20,6 @@ #define ENCODER_DEFAULT_POS 0x3 #define ENCODER_MAP_KEY_DELAY 2 -#if defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE) || defined(LK_WIRELESS_ENABLE) -/* SPI configuration */ -# define SPI_DRIVER SPID1 -# define SPI_SCK_PIN A5 -# define SPI_MISO_PIN A6 -# define SPI_MOSI_PIN A7 -#endif - -#if defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE) -# define LED_DRIVER_SHUTDOWN_PIN B7 -# define SNLED23751_SPI_DIVISOR 16 -#endif - #ifdef LK_WIRELESS_ENABLE /* Hardware configuration */ # define P2P4_MODE_SELECT_PIN A10 @@ -55,6 +42,8 @@ # if defined(RGB_MATRIX_ENABLE) +# define LED_DRIVER_SHUTDOWN_PIN B7 + /* Backlit disable timeout when keyboard is disconnected(unit: second) */ # define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40 @@ -71,6 +60,12 @@ /* Enable bluetooth NKRO */ # define WIRELESS_NKRO_ENABLE + +/* Raw hid command for factory test and bluetooth DFU */ +# define RAW_HID_CMD 0xAA ... 0xAB +#else +/* Raw hid command for factory test */ +# define RAW_HID_CMD 0xAB #endif /* Factory test keys */ diff --git a/keyboards/keychron/v1_max/iso_encoder/config.h b/keyboards/keychron/v1_max/iso_encoder/config.h index acc95cb24b..30d79fbe3b 100644 --- a/keyboards/keychron/v1_max/iso_encoder/config.h +++ b/keyboards/keychron/v1_max/iso_encoder/config.h @@ -18,19 +18,28 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix driver configuration */ -# define RGB_MATRIX_LED_COUNT 82 # define DRIVER_COUNT 2 +# define RGB_MATRIX_LED_COUNT 82 + +# define SPI_SCK_PIN A5 +# define SPI_MISO_PIN A6 +# define SPI_MOSI_PIN A7 + # define DRIVER_CS_PINS \ { B8, B9 } +# define SNLED23751_SPI_DIVISOR 16 +# define SPI_DRIVER SPID1 /* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in snled27351.h) */ -# define SNLED27351_PHASE_CHANNEL MSKPHASE_9CHANNEL +# define PHASE_CHANNEL MSKPHASE_9CHANNEL + /* Set LED driver current */ # define SNLED27351_CURRENT_TUNE \ { 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C } /* Set to infinit, which is use in USB mode by default */ # define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE + /* Allow shutdown of led driver to save power */ # define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE /* Turn off backlight on low brightness to save power */ diff --git a/keyboards/keychron/v1_max/iso_encoder/info.json b/keyboards/keychron/v1_max/iso_encoder/info.json index 575c491bd2..9f865c65d1 100644 --- a/keyboards/keychron/v1_max/iso_encoder/info.json +++ b/keyboards/keychron/v1_max/iso_encoder/info.json @@ -1,7 +1,7 @@ { "usb": { "pid": "0x0914", - "device_version": "1.0.2" + "device_version": "1.0.0" }, "features": { "encoder": true, diff --git a/keyboards/keychron/v1_max/iso_encoder/iso_encoder.c b/keyboards/keychron/v1_max/iso_encoder/iso_encoder.c index 9e48b1424b..d3de9c4fb2 100644 --- a/keyboards/keychron/v1_max/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/v1_max/iso_encoder/iso_encoder.c @@ -21,11 +21,11 @@ #ifdef RGB_MATRIX_ENABLE const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to SNLED27351 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ {0, G_1, I_1, H_1}, {0, G_2, I_2, H_2}, {0, G_3, I_3, H_3}, @@ -130,7 +130,7 @@ led_config_t g_led_config = { { // LED Index to Physical Position {0, 0}, {18, 0}, {33, 0}, {48, 0}, {62, 0}, {81, 0}, {95, 0}, {110, 0}, {125, 0}, {143, 0}, {157, 0}, {172, 0}, {187, 0}, {205, 0}, - {0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {117,15}, {132,15}, {146,15}, {161,15}, {176,15}, {203,15}, {224,15}, + {0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {117,15}, {132,15}, {146,15}, {161,15}, {176,15}, {198,15}, {224,15}, {4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {139,26}, {154,26}, {168,26}, {183,26}, {224,26}, {6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {128,38}, {143,38}, {158,38}, {172,38}, {187,38}, {203,32}, {224,38}, {2,49}, {18,49}, {33,49}, {48,49}, {62,49}, {77,49}, {92,49}, {106,49}, {121,49}, {136,49}, {150,49}, {165,49}, {185,49}, {209,52}, diff --git a/keyboards/keychron/v1_max/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/v1_max/iso_encoder/keymaps/via/keymap.c index 3453026166..ad492f872a 100644 --- a/keyboards/keychron/v1_max/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v1_max/iso_encoder/keymaps/via/keymap.c @@ -56,6 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + }; // clang-format on diff --git a/keyboards/keychron/v1_max/jis_encoder/config.h b/keyboards/keychron/v1_max/jis_encoder/config.h deleted file mode 100644 index dd41e94906..0000000000 --- a/keyboards/keychron/v1_max/jis_encoder/config.h +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright 2024 @ 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 - -#ifdef RGB_MATRIX_ENABLE -/* RGB Matrix driver configuration */ -# define RGB_MATRIX_LED_COUNT 85 -# define DRIVER_COUNT 2 -# define DRIVER_CS_PINS \ - { B8, B9 } - -/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in snled27351.h) */ -# define SNLED27351_PHASE_CHANNEL MSKPHASE_9CHANNEL -/* Set LED driver current */ -# define SNLED27351_CURRENT_TUNE \ - { 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C } - -/* Set to infinit, which is use in USB mode by default */ -# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE -/* Allow shutdown of led driver to save power */ -# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE -/* Turn off backlight on low brightness to save power */ -# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32 - -/* Indicator */ -# define BT_HOST_LED_MATRIX_LIST \ - { 15, 16, 17 } - -# define P2P4G_HOST_LED_MATRIX_LIST \ - { 18 } - -# define BAT_LEVEL_LED_LIST \ - { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 } - -# define CAPS_LOCK_INDEX 44 -# define LOW_BAT_IND_INDEX \ - { 77 } - -# define RGB_MATRIX_KEYPRESSES -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS - -#endif diff --git a/keyboards/keychron/v1_max/jis_encoder/info.json b/keyboards/keychron/v1_max/jis_encoder/info.json deleted file mode 100644 index e6c29b2636..0000000000 --- a/keyboards/keychron/v1_max/jis_encoder/info.json +++ /dev/null @@ -1,115 +0,0 @@ -{ - "usb": { - "pid": "0x0915", - "device_version": "1.0.0" - }, - "features": { - "encoder": true, - "encoder_map": true - }, - "encoder": { - "rotary": [ - { - "pin_a": "B15", - "pin_b": "B14" - } - ] - }, - "layouts": { - "LAYOUT_jis_86": { - "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": [0, 5], "x": 5.5, "y": 0}, - {"matrix": [0, 6], "x": 6.5, "y": 0}, - {"matrix": [0, 7], "x": 7.5, "y": 0}, - {"matrix": [0, 8], "x": 8.5, "y": 0}, - {"matrix": [0, 9], "x": 9.75, "y": 0}, - {"matrix": [0, 10], "x": 10.75, "y": 0}, - {"matrix": [0, 11], "x": 11.75, "y": 0}, - {"matrix": [0, 12], "x": 12.75, "y": 0}, - {"matrix": [0, 13], "x": 14, "y": 0}, - {"matrix": [0,15], "x":15.25, "y":0}, - - {"matrix": [1, 0], "x": 0, "y": 1.25}, - {"matrix": [1, 1], "x": 1, "y": 1.25}, - {"matrix": [1, 2], "x": 2, "y": 1.25}, - {"matrix": [1, 3], "x": 3, "y": 1.25}, - {"matrix": [1, 4], "x": 4, "y": 1.25}, - {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"matrix": [1, 6], "x": 6, "y": 1.25}, - {"matrix": [1, 7], "x": 7, "y": 1.25}, - {"matrix": [1, 8], "x": 8, "y": 1.25}, - {"matrix": [1, 9], "x": 9, "y": 1.25}, - {"matrix": [1, 10], "x": 10, "y": 1.25}, - {"matrix": [1, 11], "x": 11, "y": 1.25}, - {"matrix": [1, 12], "x": 12, "y": 1.25}, - {"matrix": [1, 13], "x": 13, "y": 1.25}, - {"matrix": [1, 14], "x": 14, "y": 1.25}, - {"matrix": [1, 15], "x": 15.25, "y": 1.25}, - - {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, - {"matrix": [2, 1], "x": 1.5, "y": 2.25}, - {"matrix": [2, 2], "x": 2.5, "y": 2.25}, - {"matrix": [2, 3], "x": 3.5, "y": 2.25}, - {"matrix": [2, 4], "x": 4.5, "y": 2.25}, - {"matrix": [2, 5], "x": 5.5, "y": 2.25}, - {"matrix": [2, 6], "x": 6.5, "y": 2.25}, - {"matrix": [2, 7], "x": 7.5, "y": 2.25}, - {"matrix": [2, 8], "x": 8.5, "y": 2.25}, - {"matrix": [2, 9], "x": 9.5, "y": 2.25}, - {"matrix": [2, 10], "x": 10.5, "y": 2.25}, - {"matrix": [2, 11], "x": 11.5, "y": 2.25}, - {"matrix": [2, 12], "x": 12.5, "y": 2.25}, - {"matrix": [2, 15], "x": 15.25, "y":2.25}, - - {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, - {"matrix": [3, 1], "x": 1.75, "y": 3.25}, - {"matrix": [3, 2], "x": 2.75, "y": 3.25}, - {"matrix": [3, 3], "x": 3.75, "y": 3.25}, - {"matrix": [3, 4], "x": 4.75, "y": 3.25}, - {"matrix": [3, 5], "x": 5.75, "y": 3.25}, - {"matrix": [3, 6], "x": 6.75, "y": 3.25}, - {"matrix": [3, 7], "x": 7.75, "y": 3.25}, - {"matrix": [3, 8], "x": 8.75, "y": 3.25}, - {"matrix": [3, 9], "x": 9.75, "y": 3.25}, - {"matrix": [3, 10], "x": 10.75, "y": 3.25}, - {"matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"matrix": [3, 12], "x": 12.75, "y": 3.25}, - {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, - {"matrix": [3, 15], "x": 15.25, "y": 3.25}, - - {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.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}, - {"matrix": [4, 5], "x": 5.25, "y": 4.25}, - {"matrix": [4, 6], "x": 6.25, "y": 4.25}, - {"matrix": [4, 7], "x": 7.25, "y": 4.25}, - {"matrix": [4, 8], "x": 8.25, "y": 4.25}, - {"matrix": [4, 9], "x": 9.25, "y": 4.25}, - {"matrix": [4, 10], "x": 10.25, "y": 4.25}, - {"matrix": [4, 11], "x": 11.25, "y": 4.25}, - {"matrix": [4, 12], "x": 12.25, "y": 4.25}, - {"matrix": [4, 13], "x": 13.25, "y": 4.25}, - {"matrix": [4, 14], "x": 14.25, "y": 4.5}, - - {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, - {"matrix": [5, 1], "x": 1.25, "y": 5.25}, - {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25}, - {"matrix": [5, 3], "x": 3.5, "y": 5.25}, - {"matrix": [5, 6], "x": 4.5, "y": 5.25, "w": 4.5}, - {"matrix": [5, 9], "x": 9, "y": 5.25}, - {"matrix": [5, 10], "x": 10, "y": 5.25}, - {"matrix": [5, 11], "x": 11, "y": 5.25}, - {"matrix": [5, 12], "x": 12, "y": 5.25}, - {"matrix": [5, 13], "x": 13.25, "y": 5.5}, - {"matrix": [5, 14], "x": 14.25, "y": 5.5}, - {"matrix": [5, 15], "x": 15.25, "y": 5.5} - ] - } - } -} diff --git a/keyboards/keychron/v1_max/jis_encoder/jis_encoder.c b/keyboards/keychron/v1_max/jis_encoder/jis_encoder.c deleted file mode 100644 index dcfdb316e8..0000000000 --- a/keyboards/keychron/v1_max/jis_encoder/jis_encoder.c +++ /dev/null @@ -1,152 +0,0 @@ -/* Copyright 2024 @ 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/>. - */ - -#include "quantum.h" - -// clang-format off - -#ifdef RGB_MATRIX_ENABLE -const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { -/* Refer to SNLED27351 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ - {0, G_1, I_1, H_1}, - {0, G_2, I_2, H_2}, - {0, G_3, I_3, H_3}, - {0, G_4, I_4, H_4}, - {0, G_5, I_5, H_5}, - {0, G_6, I_6, H_6}, - {0, G_7, I_7, H_7}, - {0, G_8, I_8, H_8}, - {0, G_9, I_9, H_9}, - {0, G_10, I_10, H_10}, - {0, G_11, I_11, H_11}, - {0, G_12, I_12, H_12}, - {0, G_13, I_13, H_13}, - {0, G_14, I_14, H_14}, - - {0, A_1, C_1, B_1}, - {0, A_2, C_2, B_2}, - {0, A_3, C_3, B_3}, - {0, A_4, C_4, B_4}, - {0, A_5, C_5, B_5}, - {0, A_6, C_6, B_6}, - {0, A_7, C_7, B_7}, - {0, A_8, C_8, B_8}, - {0, A_9, C_9, B_9}, - {0, A_10, C_10, B_10}, - {0, A_11, C_11, B_11}, - {0, A_12, C_12, B_12}, - {0, A_13, C_13, B_13}, - {0, A_14, C_14, B_14}, - {0, A_15, C_15, B_15}, - {0, A_16, C_16, B_16}, - - {0, D_1, F_1, E_1}, - {0, D_2, F_2, E_2}, - {0, D_3, F_3, E_3}, - {0, D_4, F_4, E_4}, - {0, D_5, F_5, E_5}, - {0, D_6, F_6, E_6}, - {0, D_7, F_7, E_7}, - {0, D_8, F_8, E_8}, - {0, D_9, F_9, E_9}, - {0, D_10, F_10, E_10}, - {0, D_11, F_11, E_11}, - {0, D_12, F_12, E_12}, - {0, D_13, F_13, E_13}, - {0, D_16, F_16, E_16}, - - {1, A_16, C_16, B_16}, - {1, A_15, C_15, B_15}, - {1, A_14, C_14, B_14}, - {1, A_13, C_13, B_13}, - {1, A_12, C_12, B_12}, - {1, A_11, C_11, B_11}, - {1, A_10, C_10, B_10}, - {1, A_9, C_9, B_9}, - {1, A_8, C_8, B_8}, - {1, A_7, C_7, B_7}, - {1, A_6, C_6, B_6}, - {1, A_5, C_5, B_5}, - {1, A_4, C_4, B_4}, - {1, A_3, C_3, B_3}, - {1, A_1, C_1, B_1}, - - {1, G_16, I_16, H_16}, - {1, G_14, I_14, H_14}, - {1, G_13, I_13, H_13}, - {1, G_12, I_12, H_12}, - {1, G_11, I_11, H_11}, - {1, G_10, I_10, H_10}, - {1, G_9, I_9, H_9}, - {1, G_8, I_8, H_8}, - {1, G_7, I_7, H_7}, - {1, G_6, I_6, H_6}, - {1, G_5, I_5, H_5}, - {1, G_4, I_4, H_4}, - {1, G_3, I_3, H_3}, - {1, G_2, I_2, H_2}, - - {1, D_16, F_16, E_16}, - {1, D_15, F_15, E_15}, - {1, D_14, F_14, E_14}, - {1, D_13, F_13, E_13}, - {1, D_10, F_10, E_10}, - {1, D_7, F_7, E_7}, - {1, D_6, F_6, E_6}, - {1, D_5, F_5, E_5}, - {1, D_4, F_4, E_4}, - {1, D_3, F_3, E_3}, - {1, D_2, F_2, E_2}, - {1, D_1, F_1, E_1} -}; - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to LED Index - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, __, __ }, - { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, - { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, __, __, 43 }, - { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, __, 58 }, - { 59, __, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, __ }, - { 73, 74, 75, 76, __, __, 77, __, __, 78, 79, 80, 81, 82, 83, 84 } - }, - { - // LED Index to Physical Position - {0, 0}, {15, 0}, {27, 0}, {41, 0}, {55, 0}, {75, 0}, {89, 0}, {103, 0}, {117, 0}, {131, 0}, {145, 0}, {159, 0}, {173, 0}, {188, 0}, - {0,14}, {14,14}, {26,14}, {40,14}, {54,14}, {68,14}, {82,14}, {96, 14}, {110, 14}, {124, 14}, {138, 14}, {152, 14}, {166, 14}, {180, 14}, {192,14}, {224, 14}, - {7,26}, {18,26}, {33,26}, {47,26}, {61,26}, {75,26}, {89,26}, {103, 26}, {117, 26}, {131, 26}, {145, 26}, {159, 26}, {173, 26}, {224, 26}, - {8,37}, {20,37}, {34,37}, {48,37}, {62,37}, {76,37}, {90,37}, {104, 37}, {118, 37}, {132, 37}, {146, 37}, {160, 37}, {174, 37}, {186, 32}, {224, 37}, - {8,50}, {26,50}, {40,50}, {54,50}, {68,50}, {82,50}, {96, 50}, {110, 50}, {124, 50}, {138, 50}, {152, 50}, {166, 50}, {180, 50}, {188, 50}, - {1,62}, {15,62}, {27,62}, {40,62}, {90,62}, {123, 62}, {137, 62}, {151, 62}, {165, 62}, {174, 62}, {188, 62}, {224, 62} - }, - { - // RGB LED Index to Flag - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 - }, -}; -#endif diff --git a/keyboards/keychron/v1_max/jis_encoder/keymaps/default/keymap.c b/keyboards/keychron/v1_max/jis_encoder/keymaps/default/keymap.c deleted file mode 100644 index f28f36c413..0000000000 --- a/keyboards/keychron/v1_max/jis_encoder/keymaps/default/keymap.c +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright 2024 @ 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 { - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN, -}; -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_jis_86( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, KC_LNG1, KC_RCMMD,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [MAC_FN] = LAYOUT_jis_86( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), - - [WIN_BASE] = LAYOUT_jis_86( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_INT4, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [WIN_FN] = LAYOUT_jis_86( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) - -}; - -// clang-format on -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, -}; -#endif // ENCODER_MAP_ENABLE - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/v1_max/jis_encoder/keymaps/via/keymap.c b/keyboards/keychron/v1_max/jis_encoder/keymaps/via/keymap.c deleted file mode 100644 index f28f36c413..0000000000 --- a/keyboards/keychron/v1_max/jis_encoder/keymaps/via/keymap.c +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright 2024 @ 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 { - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN, -}; -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_jis_86( - KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, KC_LNG1, KC_RCMMD,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [MAC_FN] = LAYOUT_jis_86( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), - - [WIN_BASE] = LAYOUT_jis_86( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_INT3, KC_BSPC, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_INT4, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [WIN_FN] = LAYOUT_jis_86( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) - -}; - -// clang-format on -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [MAC_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_FN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, -}; -#endif // ENCODER_MAP_ENABLE - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_record_keychron_common(keycode, record)) { - return false; - } - return true; -} diff --git a/keyboards/keychron/v1_max/jis_encoder/keymaps/via/rules.mk b/keyboards/keychron/v1_max/jis_encoder/keymaps/via/rules.mk deleted file mode 100644 index 1e5b99807c..0000000000 --- a/keyboards/keychron/v1_max/jis_encoder/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/keychron/v1_max/jis_encoder/rules.mk b/keyboards/keychron/v1_max/jis_encoder/rules.mk deleted file mode 100644 index 7ff128fa69..0000000000 --- a/keyboards/keychron/v1_max/jis_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file diff --git a/keyboards/keychron/v1_max/via_json/v1_max_jis_encoder.json b/keyboards/keychron/v1_max/via_json/v1_max_jis_encoder.json deleted file mode 100644 index bb27ab9fe4..0000000000 --- a/keyboards/keychron/v1_max/via_json/v1_max_jis_encoder.json +++ /dev/null @@ -1,281 +0,0 @@ -{ - "name": "Keychron V1 Max JIS Knob", - "vendorId": "0x3434", - "productId": "0x0915", - "keycodes": ["qmk_lighting"], - "menus": [ - { - "label": "Lighting", - "content": [ - { - "label": "Backlight", - "content": [ - { - "label": "Brightness", - "type": "range", - "options": [0, 255], - "content": ["id_qmk_rgb_matrix_brightness", 3, 1] - }, - { - "label": "Effect", - "type": "dropdown", - "content": ["id_qmk_rgb_matrix_effect", 3, 2], - "options": [ - ["None", 0], - ["Solid Color", 1], - ["Breathing", 2], - ["Band Spiral Val", 3], - ["Cycle All", 4], - ["Cycle Left Right", 5], - ["Cycle Up Down", 6], - ["Rainbow Moving Chevron", 7], - ["Cycle Out In", 8], - ["Cycle Out In Dual", 9], - ["Cycle Pinwheel", 10], - ["Cycle Spiral", 11], - ["Dual Beacon", 12], - ["Rainbow Beacon", 13], - ["Jellybean Raindrops", 14], - ["Pixel Rain", 15], - ["Typing Heatmap", 16], - ["Digital Rain", 17], - ["Reactive Simple", 18], - ["Reactive Multiwide", 19], - ["Reactive Multinexus", 20], - ["Splash", 21], - ["Solid Splash", 22] - ] - }, - { - "showIf": "{id_qmk_rgb_matrix_effect} > 1", - "label": "Effect Speed", - "type": "range", - "options": [0, 255], - "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] - }, - { - "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ", - "label": "Color", - "type": "color", - "content": ["id_qmk_rgb_matrix_color", 3, 4] - } - ] - } - ] - } - ], - "customKeycodes": [ - {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, - {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"}, - {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"}, - {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"}, - {"name": "Misson Control", "title": "Misson Control in Mac", "shortName": "MCtl"}, - {"name": "Lanuch Pad", "title": "Lanuch Pad in Windows", "shortName": "LPad"}, - {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"}, - {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"}, - {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"}, - {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"}, - {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, - {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"}, - {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, - {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, - {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"}, - {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} - ], - "matrix": {"rows": 6, "cols" : 16}, - "layouts": { - "keymap": [ - [ - { - "c": "#777777" - }, - "0, 0", - { - "x": 0.25, - "c": "#cccccc" - }, - "0, 1", - "0, 2", - "0, 3", - "0, 4", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "0, 5", - "0, 6", - "0, 7", - "0, 8", - { - "x": 0.25, - "c": "#cccccc" - }, - "0, 9", - "0, 10", - "0, 11", - "0, 12", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "0, 13", - { - "x": 0.25 - }, - "0, 15\n\n\n\n\n\n\n\n\ne0" - ], - [ - { - "y": 0.25 - }, - "1, 0", - "1, 1", - "1, 2", - "1, 3", - "1, 4", - "1, 5", - "1, 6", - "1, 7", - "1, 8", - "1, 9", - "1, 10", - "1, 11", - "1, 12", - "1, 13", - "1, 14", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "1, 15" - ], - [ - { - "w": 1.5, - "c": "#aaaaaa" - }, - "2, 0", - { - "c": "#cccccc" - }, - "2, 1", - "2, 2", - "2, 3", - "2, 4", - "2, 5", - "2, 6", - "2, 7", - "2, 8", - "2, 9", - "2, 10", - "2, 11", - "2, 12", - { - "x": 0.25, - "w": 1.25, - "h": 2, - "x2": -0.25, - "w2": 1.5, - "h2": 1, - "c": "#777777" - }, - "3, 13", - { - "x": 0.25, - "c": "#aaaaaa" - }, - "2, 15" - ], - [ - { - "w": 1.75, - "c": "#aaaaaa" - }, - "3, 0", - { - "c": "#cccccc" - }, - "3, 1", - "3, 2", - "3, 3", - "3, 4", - "3, 5", - "3, 6", - "3, 7", - "3, 8", - "3, 9", - "3, 10", - "3, 11", - "3, 12", - { - "x": 1.5, - "c": "#aaaaaa" - }, - "3, 15" - ], - [ - { - "w": 2.25, - "c": "#aaaaaa" - }, - "4, 0", - { - "c": "#cccccc" - }, - "4, 2", - "4, 3", - "4, 4", - "4, 5", - "4, 6", - "4, 7", - "4, 8", - "4, 9", - "4, 10", - "4, 11", - "4, 12", - { - "c": "#aaaaaa" - }, - "4, 13", - { - "c":"#cccccc" - }, - "4, 14" - ], - [ - { - "w": 1.25, - "c": "#aaaaaa" - }, - "5, 0", - "5, 1", - { - "w": 1.25 - }, - "5, 2", - "5, 3", - { - "w": 4.5, - "c": "#cccccc" - }, - "5, 6", - { - "c": "#aaaaaa" - }, - "5, 9", - "5, 10", - { - "w":1.25 - }, - "5, 11", - "5, 12", - { - "c":"#cccccc" - }, - "5, 13", - "5, 14", - "5, 15" - ] - ] - } -} diff --git a/keyboards/lemokey/l3/iso/config.h b/keyboards/lemokey/l3/iso/config.h index f5ae2f46e6..d2a9ed3788 100644 --- a/keyboards/lemokey/l3/iso/config.h +++ b/keyboards/lemokey/l3/iso/config.h @@ -16,8 +16,6 @@ #pragma once -#define VIA_FIRMWARE_VERSION 0x00000001 - #ifdef RGB_MATRIX_ENABLE /* RGB Matrix driver configuration */ # define DRIVER_1_LED_COUNT 47 @@ -25,7 +23,7 @@ # define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT) /* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in snled27351.h) */ -# define SNLED27351_PHASE_CHANNEL MSKPHASE_9CHANNEL +# define PHASE_CHANNEL MSKPHASE_9CHANNEL /* Set LED driver current */ # define SNLED27351_CURRENT_TUNE \ { 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24 } diff --git a/keyboards/lemokey/l3/iso/info.json b/keyboards/lemokey/l3/iso/info.json index 1347795f9f..a4103919ab 100644 --- a/keyboards/lemokey/l3/iso/info.json +++ b/keyboards/lemokey/l3/iso/info.json @@ -58,6 +58,7 @@ {"matrix":[2,11], "x":11.75, "y":2.25}, {"matrix":[2,12], "x":12.75, "y":2.25}, {"matrix":[2,13], "x":13.75, "y":2.25}, + {"matrix":[2,14], "x":14.75, "y":2.25, "w":1.5}, {"matrix":[2,15], "x":16.5, "y":2.25}, {"matrix":[2,16], "x":17.5, "y":2.25}, {"matrix":[2,17], "x":18.5, "y":2.25}, @@ -76,8 +77,7 @@ {"matrix":[3,10], "x":11, "y":3.25}, {"matrix":[3,11], "x":12, "y":3.25}, {"matrix":[3,12], "x":13, "y":3.25}, - {"matrix":[3,14], "x":14, "y":3.25}, - {"matrix":[2,14], "x":15, "y":2.25, "w":1.25, "h": 2}, + {"matrix":[3,14], "x":14, "y":3.25, "w":2.25}, {"matrix":[4,0], "x":0, "y":4}, diff --git a/keyboards/lemokey/l3/via_json/l3_ansi.json b/keyboards/lemokey/l3/via_json/l3_ansi.json index 8118b1f378..06ffe67af5 100644 --- a/keyboards/lemokey/l3/via_json/l3_ansi.json +++ b/keyboards/lemokey/l3/via_json/l3_ansi.json @@ -2,7 +2,6 @@ "name": "Lemokey L3", "vendorId": "0x362D", "productId": "0x0130", - "firmwareVersion": 1, "keycodes": ["qmk_lighting"], "menus": [ { diff --git a/keyboards/lemokey/l3/via_json/l3_iso.json b/keyboards/lemokey/l3/via_json/l3_iso.json index 3f10e2c16f..59f5433f64 100644 --- a/keyboards/lemokey/l3/via_json/l3_iso.json +++ b/keyboards/lemokey/l3/via_json/l3_iso.json @@ -2,7 +2,6 @@ "name": "Lemokey L3", "vendorId": "0x362D", "productId": "0x0131", - "firmwareVersion": 1, "keycodes": ["qmk_lighting"], "menus": [ {