From 747353348ecda25fd50ab47b802d1428f307fd1b Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Wed, 13 Sep 2023 15:42:01 +0800 Subject: Added K10_Pro and K15_Pro --- keyboards/keychron/bluetooth/bluetooth.c | 10 +- keyboards/keychron/common/common.mk | 4 + keyboards/keychron/common/matrix.c | 218 ++++++++++++ keyboards/keychron/k10_pro/ansi/rgb/config.h | 3 +- keyboards/keychron/k10_pro/ansi/rgb/info.json | 119 ++++++- .../k10_pro/ansi/rgb/keymaps/default/keymap.c | 13 +- .../keychron/k10_pro/ansi/rgb/keymaps/via/keymap.c | 14 +- keyboards/keychron/k10_pro/ansi/white/config.h | 2 + keyboards/keychron/k10_pro/ansi/white/info.json | 117 +++++- .../k10_pro/ansi/white/keymaps/default/keymap.c | 4 +- .../k10_pro/ansi/white/keymaps/via/keymap.c | 14 +- keyboards/keychron/k10_pro/ansi/white/white.c | 29 -- keyboards/keychron/k10_pro/config.h | 7 + keyboards/keychron/k10_pro/info.json | 125 ++++++- keyboards/keychron/k10_pro/iso/rgb/config.h | 3 +- keyboards/keychron/k10_pro/iso/rgb/info.json | 119 ++++++- .../keychron/k10_pro/iso/rgb/keymaps/via/keymap.c | 6 +- keyboards/keychron/k10_pro/iso/rgb/rgb.c | 32 -- keyboards/keychron/k10_pro/iso/white/config.h | 5 +- keyboards/keychron/k10_pro/iso/white/info.json | 118 +++++- .../k10_pro/iso/white/keymaps/default/keymap.c | 14 +- .../k10_pro/iso/white/keymaps/via/keymap.c | 16 +- keyboards/keychron/k10_pro/iso/white/white.c | 32 -- keyboards/keychron/k10_pro/jis/rgb/config.h | 53 +++ keyboards/keychron/k10_pro/jis/rgb/info.json | 154 ++++++++ .../k10_pro/jis/rgb/keymaps/default/keymap.c | 59 +++ .../keychron/k10_pro/jis/rgb/keymaps/via/keymap.c | 59 +++ .../keychron/k10_pro/jis/rgb/keymaps/via/rules.mk | 1 + keyboards/keychron/k10_pro/jis/rgb/rgb.c | 146 ++++++++ keyboards/keychron/k10_pro/jis/rgb/rules.mk | 1 + keyboards/keychron/k10_pro/jis/white/config.h | 52 +++ keyboards/keychron/k10_pro/jis/white/info.json | 149 ++++++++ .../k10_pro/jis/white/keymaps/default/keymap.c | 59 +++ .../k10_pro/jis/white/keymaps/via/keymap.c | 59 +++ .../k10_pro/jis/white/keymaps/via/rules.mk | 1 + keyboards/keychron/k10_pro/jis/white/rules.mk | 1 + keyboards/keychron/k10_pro/jis/white/white.c | 144 ++++++++ keyboards/keychron/k10_pro/k10_pro.c | 45 ++- keyboards/keychron/k10_pro/k10_pro.h | 4 +- keyboards/keychron/k10_pro/matrix.c | 170 --------- keyboards/keychron/k10_pro/readme.md | 10 + keyboards/keychron/k10_pro/rules.mk | 5 +- .../k10_pro/via_json/k10_pro_ansi_rgb.json | 4 +- .../k10_pro/via_json/k10_pro_ansi_white.json | 4 +- .../keychron/k10_pro/via_json/k10_pro_iso_rgb.json | 350 ++++++++++++++++++ .../k10_pro/via_json/k10_pro_iso_white.json | 289 +++++++++++++++ .../keychron/k10_pro/via_json/k10_pro_jis_rgb.json | 351 ++++++++++++++++++ .../k10_pro/via_json/k10_pro_jis_white.json | 290 +++++++++++++++ .../keychron/k15_pro/ansi_encoder/rgb/config.h | 56 +++ .../keychron/k15_pro/ansi_encoder/rgb/info.json | 131 +++++++ .../ansi_encoder/rgb/keymaps/default/keymap.c | 68 ++++ .../ansi_encoder/rgb/keymaps/default/rules.mk | 1 + .../k15_pro/ansi_encoder/rgb/keymaps/via/keymap.c | 68 ++++ .../k15_pro/ansi_encoder/rgb/keymaps/via/rules.mk | 2 + keyboards/keychron/k15_pro/ansi_encoder/rgb/rgb.c | 123 +++++++ .../keychron/k15_pro/ansi_encoder/rgb/rules.mk | 1 + .../keychron/k15_pro/ansi_encoder/white/config.h | 51 +++ .../keychron/k15_pro/ansi_encoder/white/info.json | 126 +++++++ .../ansi_encoder/white/keymaps/default/keymap.c | 68 ++++ .../ansi_encoder/white/keymaps/default/rules.mk | 1 + .../ansi_encoder/white/keymaps/via/keymap.c | 68 ++++ .../ansi_encoder/white/keymaps/via/rules.mk | 2 + .../keychron/k15_pro/ansi_encoder/white/rules.mk | 1 + .../keychron/k15_pro/ansi_encoder/white/white.c | 121 +++++++ keyboards/keychron/k15_pro/config.h | 86 +++++ keyboards/keychron/k15_pro/halconf.h | 29 ++ keyboards/keychron/k15_pro/info.json | 140 ++++++++ keyboards/keychron/k15_pro/k15_pro.c | 342 ++++++++++++++++++ keyboards/keychron/k15_pro/k15_pro.h | 57 +++ keyboards/keychron/k15_pro/mcuconf.h | 39 ++ keyboards/keychron/k15_pro/readme.md | 23 ++ keyboards/keychron/k15_pro/rules.mk | 6 + .../k15_pro/via_json/k15_pro_ansi_encoder_rgb.json | 396 +++++++++++++++++++++ .../via_json/k15_pro_ansi_encoder_white.json | 335 +++++++++++++++++ 74 files changed, 5491 insertions(+), 334 deletions(-) create mode 100755 keyboards/keychron/common/common.mk create mode 100755 keyboards/keychron/common/matrix.c create mode 100755 keyboards/keychron/k10_pro/jis/rgb/config.h create mode 100755 keyboards/keychron/k10_pro/jis/rgb/info.json create mode 100755 keyboards/keychron/k10_pro/jis/rgb/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k10_pro/jis/rgb/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k10_pro/jis/rgb/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k10_pro/jis/rgb/rgb.c create mode 100755 keyboards/keychron/k10_pro/jis/rgb/rules.mk create mode 100755 keyboards/keychron/k10_pro/jis/white/config.h create mode 100755 keyboards/keychron/k10_pro/jis/white/info.json create mode 100755 keyboards/keychron/k10_pro/jis/white/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k10_pro/jis/white/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k10_pro/jis/white/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k10_pro/jis/white/rules.mk create mode 100755 keyboards/keychron/k10_pro/jis/white/white.c delete mode 100644 keyboards/keychron/k10_pro/matrix.c create mode 100755 keyboards/keychron/k10_pro/via_json/k10_pro_iso_rgb.json create mode 100755 keyboards/keychron/k10_pro/via_json/k10_pro_iso_white.json create mode 100755 keyboards/keychron/k10_pro/via_json/k10_pro_jis_rgb.json create mode 100755 keyboards/keychron/k10_pro/via_json/k10_pro_jis_white.json create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/rgb/config.h create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/rgb/info.json create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/rgb/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/rgb/keymaps/default/rules.mk create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/rgb/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/rgb/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/rgb/rgb.c create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/rgb/rules.mk create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/white/config.h create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/white/info.json create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/white/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/white/keymaps/default/rules.mk create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/white/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/white/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/white/rules.mk create mode 100755 keyboards/keychron/k15_pro/ansi_encoder/white/white.c create mode 100755 keyboards/keychron/k15_pro/config.h create mode 100755 keyboards/keychron/k15_pro/halconf.h create mode 100755 keyboards/keychron/k15_pro/info.json create mode 100755 keyboards/keychron/k15_pro/k15_pro.c create mode 100755 keyboards/keychron/k15_pro/k15_pro.h create mode 100755 keyboards/keychron/k15_pro/mcuconf.h create mode 100755 keyboards/keychron/k15_pro/readme.md create mode 100755 keyboards/keychron/k15_pro/rules.mk create mode 100755 keyboards/keychron/k15_pro/via_json/k15_pro_ansi_encoder_rgb.json create mode 100755 keyboards/keychron/k15_pro/via_json/k15_pro_ansi_encoder_white.json diff --git a/keyboards/keychron/bluetooth/bluetooth.c b/keyboards/keychron/bluetooth/bluetooth.c index 481099af67..e87b435db4 100644 --- a/keyboards/keychron/bluetooth/bluetooth.c +++ b/keyboards/keychron/bluetooth/bluetooth.c @@ -291,6 +291,14 @@ uint8_t bluetooth_keyboard_leds(void) { extern keymap_config_t keymap_config; void bluetooth_send_keyboard(report_keyboard_t *report) { + if (battery_is_critical_low()) { + report_keyboard_t empty_report; + memset(&empty_report, 0, sizeof(empty_report)); + if (memcmp(keyboard_report, &empty_report, sizeof(report_keyboard_t)) != 0) { + return; + } + } + if (bt_state == BLUETOOTH_PARING && !pincodeEntry) return; if (bt_state == BLUETOOTH_CONNECTED || (bt_state == BLUETOOTH_PARING && pincodeEntry)) { @@ -395,7 +403,7 @@ void bluetooth_low_battery_shutdown(void) { indicator_battery_low_backlit_enable(false); #endif clear_keyboard(); - send_keyboard_report(); + wait_ms(50); bluetooth_disconnect(); } diff --git a/keyboards/keychron/common/common.mk b/keyboards/keychron/common/common.mk new file mode 100755 index 0000000000..d7610bce69 --- /dev/null +++ b/keyboards/keychron/common/common.mk @@ -0,0 +1,4 @@ +COMMON_DIR = common +SRC += $(COMMON_DIR)/matrix.c + +VPATH += $(TOP_DIR)/keyboards/keychron/$(COMMON_DIR) diff --git a/keyboards/keychron/common/matrix.c b/keyboards/keychron/common/matrix.c new file mode 100755 index 0000000000..8fe7588118 --- /dev/null +++ b/keyboards/keychron/common/matrix.c @@ -0,0 +1,218 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "quantum.h" + +#ifndef HC595_STCP +# define HC595_STCP B0 +#endif +#ifndef HC595_SHCP +# define HC595_SHCP A1 +#endif +#ifndef HC595_DS +# define HC595_DS A7 +#endif + +#ifndef HC595_START_INDEX +# define HC595_START_INDEX 0 +#endif +#ifndef HC595_END_INDEX +# define HC595_END_INDEX 15 +#endif +#ifndef HC595_OFFSET_INDEX +# define HC595_OFFSET_INDEX 0 +#endif + +#if defined(HC595_START_INDEX) && defined(HC595_END_INDEX) +# if ((HC595_END_INDEX - HC595_START_INDEX + 1) > 16) +# define SIZE_T uint32_t +# define UNSELECT_ALL_COL 0xFFFFFFFF +# define SELECT_ALL_COL 0x00000000 +# elif ((HC595_END_INDEX - HC595_START_INDEX + 1) > 8) +# define SIZE_T uint16_t +# define UNSELECT_ALL_COL 0xFFFF +# define SELECT_ALL_COL 0x0000 +# else +# define SIZE_T uint8_t +# define UNSELECT_ALL_COL 0xFF +# define SELECT_ALL_COL 0x00 +# endif +#endif + +pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; +pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; + +static inline uint8_t readMatrixPin(pin_t pin) { + if (pin != NO_PIN) { + return readPin(pin); + } else { + return 1; + } +} + +static inline void setPinOutput_writeLow(pin_t pin) { + setPinOutput(pin); + writePinLow(pin); +} + +static inline void setPinOutput_writeHigh(pin_t pin) { + setPinOutput(pin); + writePinHigh(pin); +} + +static inline void HC595_delay(uint16_t n) { + while (n-- > 0) { + asm volatile("nop" ::: "memory"); + } +} + +static void HC595_output(SIZE_T data, bool bit_flag) { + uint8_t n = 1; + + ATOMIC_BLOCK_FORCEON { + for (uint8_t i = 0; i < (HC595_END_INDEX - HC595_START_INDEX + 1); i++) { + if (data & 0x1) { + writePinHigh(HC595_DS); + } else { + writePinLow(HC595_DS); + } + writePinHigh(HC595_SHCP); + HC595_delay(n); + writePinLow(HC595_SHCP); + HC595_delay(n); + if (bit_flag) { + break; + } else { + data = data >> 1; + } + } + writePinHigh(HC595_STCP); + HC595_delay(n); + writePinLow(HC595_STCP); + HC595_delay(n); + } +} + +static void select_col(uint8_t col) { + if (col < HC595_START_INDEX || col > HC595_END_INDEX) { + setPinOutput_writeLow(col_pins[col]); + } else { + if (col == HC595_START_INDEX) { + HC595_output(0x00, true); + if (col < HC595_OFFSET_INDEX) { + HC595_output(0x01, true); + } + } + } +} + +static void unselect_col(uint8_t col) { + if (col < HC595_START_INDEX || col > HC595_END_INDEX) { +#ifdef MATRIX_UNSELECT_DRIVE_HIGH + setPinOutput_writeHigh(col_pins[col]); +#else + setPinInputHigh(col_pins[col]); +#endif + } else { + HC595_output(0x01, true); + } +} + +static void unselect_cols(void) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + if (col < HC595_START_INDEX || col > HC595_END_INDEX) { +#ifdef MATRIX_UNSELECT_DRIVE_HIGH + setPinOutput_writeHigh(col_pins[col]); +#else + setPinInputHigh(col_pins[col]); +#endif + } else { + if (col == HC595_START_INDEX) { + HC595_output(UNSELECT_ALL_COL, false); + } + break; + } + } +} + +void select_all_cols(void) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + if (col < HC595_START_INDEX || col > HC595_END_INDEX) { + setPinOutput_writeLow(col_pins[col]); + } else { + if (col == HC595_START_INDEX) { + HC595_output(SELECT_ALL_COL, false); + } + break; + } + } +} + +static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) { + // Select col + select_col(current_col); // select col + HC595_delay(200); + + // For each row... + for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { + // Check row pin state + if (readMatrixPin(row_pins[row_index]) == 0) { + // Pin LO, set col bit + current_matrix[row_index] |= row_shifter; + } else { + // Pin HI, clear col bit + current_matrix[row_index] &= ~row_shifter; + } + } + + // Unselect col + unselect_col(current_col); + HC595_delay(200); // wait for all Row signals to go HIGH +} + +void matrix_init_custom(void) { + setPinOutput(HC595_DS); + setPinOutput(HC595_STCP); + setPinOutput(HC595_SHCP); + + for (uint8_t x = 0; x < MATRIX_ROWS; x++) { + if (row_pins[x] != NO_PIN) { + setPinInputHigh(row_pins[x]); + } + } + + unselect_cols(); +} + +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + matrix_row_t curr_matrix[MATRIX_ROWS] = {0}; + + // Set col, read rows + matrix_row_t row_shifter = MATRIX_ROW_SHIFTER; + for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++, row_shifter <<= 1) { + matrix_read_rows_on_col(curr_matrix, current_col, row_shifter); + } + + bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0; + if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix)); + + return changed; +} + +void suspend_wakeup_init_kb(void) { + // code will run on keyboard wakeup + clear_keyboard(); +} diff --git a/keyboards/keychron/k10_pro/ansi/rgb/config.h b/keyboards/keychron/k10_pro/ansi/rgb/config.h index 703644657a..90cfcccf96 100644 --- a/keyboards/keychron/k10_pro/ansi/rgb/config.h +++ b/keyboards/keychron/k10_pro/ansi/rgb/config.h @@ -19,9 +19,10 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix driver configuration */ # define DRIVER_COUNT 2 - # define DRIVER_ADDR_1 0b1110111 # define DRIVER_ADDR_2 0b1110100 + +/* RGB Matrix configuration */ # define RGB_MATRIX_LED_COUNT 108 /* Set to infinit, which is use in USB mode by default */ diff --git a/keyboards/keychron/k10_pro/ansi/rgb/info.json b/keyboards/keychron/k10_pro/ansi/rgb/info.json index ad52f9670c..3923a9ce58 100644 --- a/keyboards/keychron/k10_pro/ansi/rgb/info.json +++ b/keyboards/keychron/k10_pro/ansi/rgb/info.json @@ -30,6 +30,121 @@ "solid_reactive_multinexus": true, "splash": true, "solid_splash": true - } + }, + "layout": [ + {"matrix":[0,0], "flags":1, "x":0, "y":0}, + {"matrix":[0,1], "flags":1, "x":20, "y":0}, + {"matrix":[0,2], "flags":1, "x":31, "y":0}, + {"matrix":[0,3], "flags":1, "x":42, "y":0}, + {"matrix":[0,4], "flags":1, "x":52, "y":0}, + {"matrix":[0,5], "flags":1, "x":67, "y":0}, + {"matrix":[0,6], "flags":1, "x":78, "y":0}, + {"matrix":[0,7], "flags":1, "x":88, "y":0}, + {"matrix":[0,8], "flags":1, "x":98, "y":0}, + {"matrix":[0,9], "flags":1, "x":114, "y":0}, + {"matrix":[0,10], "flags":1, "x":125, "y":0}, + {"matrix":[0,11], "flags":1, "x":135, "y":0}, + {"matrix":[0,12], "flags":1, "x":145, "y":0}, + {"matrix":[0,14], "flags":1, "x":158, "y":0}, + {"matrix":[0,15], "flags":1, "x":169, "y":0}, + {"matrix":[0,16], "flags":1, "x":179, "y":0}, + {"matrix":[0,17], "flags":4, "x":192, "y":0}, + {"matrix":[0,18], "flags":4, "x":203, "y":0}, + {"matrix":[0,19], "flags":4, "x":213, "y":0}, + {"matrix":[0,20], "flags":4, "x":224, "y":0}, + + {"matrix":[1,0], "flags":1, "x":0, "y":15}, + {"matrix":[1,1], "flags":8, "x":10, "y":15}, + {"matrix":[1,2], "flags":8, "x":20, "y":15}, + {"matrix":[1,3], "flags":8, "x":31, "y":15}, + {"matrix":[1,4], "flags":4, "x":41, "y":15}, + {"matrix":[1,5], "flags":4, "x":52, "y":15}, + {"matrix":[1,6], "flags":4, "x":62, "y":15}, + {"matrix":[1,7], "flags":4, "x":72, "y":15}, + {"matrix":[1,8], "flags":4, "x":83, "y":15}, + {"matrix":[1,9], "flags":4, "x":93, "y":15}, + {"matrix":[1,10], "flags":4, "x":104, "y":15}, + {"matrix":[1,11], "flags":4, "x":114, "y":15}, + {"matrix":[1,12], "flags":4, "x":124, "y":15}, + {"matrix":[1,13], "flags":1, "x":140, "y":15}, + {"matrix":[1,14], "flags":1, "x":158, "y":15}, + {"matrix":[1,15], "flags":1, "x":169, "y":15}, + {"matrix":[1,16], "flags":1, "x":180, "y":15}, + {"matrix":[1,17], "flags":8, "x":192, "y":15}, + {"matrix":[1,18], "flags":4, "x":203, "y":15}, + {"matrix":[1,19], "flags":4, "x":213, "y":15}, + {"matrix":[1,20], "flags":4, "x":224, "y":15}, + + {"matrix":[2,0], "flags":1, "x":2, "y":28}, + {"matrix":[2,1], "flags":4, "x":15, "y":28}, + {"matrix":[2,2], "flags":4, "x":26, "y":28}, + {"matrix":[2,3], "flags":4, "x":36, "y":28}, + {"matrix":[2,4], "flags":4, "x":46, "y":28}, + {"matrix":[2,5], "flags":4, "x":57, "y":28}, + {"matrix":[2,6], "flags":4, "x":67, "y":28}, + {"matrix":[2,7], "flags":4, "x":78, "y":28}, + {"matrix":[2,8], "flags":4, "x":88, "y":28}, + {"matrix":[2,9], "flags":4, "x":98, "y":28}, + {"matrix":[2,10], "flags":4, "x":109, "y":28}, + {"matrix":[2,11], "flags":4, "x":119, "y":28}, + {"matrix":[2,12], "flags":4, "x":130, "y":28}, + {"matrix":[2,13], "flags":1, "x":143, "y":28}, + {"matrix":[2,14], "flags":1, "x":158, "y":28}, + {"matrix":[2,15], "flags":1, "x":169, "y":28}, + {"matrix":[2,16], "flags":1, "x":179, "y":28}, + {"matrix":[2,17], "flags":4, "x":192, "y":28}, + {"matrix":[2,18], "flags":4, "x":203, "y":28}, + {"matrix":[2,19], "flags":4, "x":213, "y":28}, + {"matrix":[2,20], "flags":4, "x":224, "y":28}, + + {"matrix":[3,0], "flags":8, "x":3, "y":39}, + {"matrix":[3,1], "flags":4, "x":18, "y":39}, + {"matrix":[3,2], "flags":4, "x":28, "y":39}, + {"matrix":[3,3], "flags":4, "x":39, "y":39}, + {"matrix":[3,4], "flags":4, "x":49, "y":39}, + {"matrix":[3,5], "flags":4, "x":59, "y":39}, + {"matrix":[3,6], "flags":4, "x":70, "y":39}, + {"matrix":[3,7], "flags":4, "x":80, "y":39}, + {"matrix":[3,8], "flags":4, "x":91, "y":39}, + {"matrix":[3,9], "flags":4, "x":101, "y":39}, + {"matrix":[3,10], "flags":4, "x":111, "y":39}, + {"matrix":[3,11], "flags":4, "x":122, "y":39}, + {"matrix":[3,13], "flags":4, "x":139, "y":39}, + {"matrix":[3,17], "flags":4, "x":192, "y":39}, + {"matrix":[3,18], "flags":4, "x":203, "y":39}, + {"matrix":[3,19], "flags":4, "x":213, "y":39}, + + {"matrix":[4,0], "flags":1, "x":6, "y":52}, + {"matrix":[4,2], "flags":4, "x":23, "y":52}, + {"matrix":[4,3], "flags":4, "x":33, "y":52}, + {"matrix":[4,4], "flags":4, "x":44, "y":52}, + {"matrix":[4,5], "flags":4, "x":54, "y":52}, + {"matrix":[4,6], "flags":4, "x":65, "y":52}, + {"matrix":[4,7], "flags":4, "x":75, "y":52}, + {"matrix":[4,8], "flags":4, "x":85, "y":52}, + {"matrix":[4,9], "flags":4, "x":96, "y":52}, + {"matrix":[4,10], "flags":4, "x":106, "y":52}, + {"matrix":[4,11], "flags":4, "x":117, "y":52}, + {"matrix":[4,13], "flags":1, "x":136, "y":52}, + {"matrix":[4,15], "flags":1, "x":169, "y":52}, + {"matrix":[4,17], "flags":4, "x":192, "y":52}, + {"matrix":[4,18], "flags":4, "x":203, "y":52}, + {"matrix":[4,19], "flags":4, "x":213, "y":52}, + {"matrix":[4,20], "flags":4, "x":224, "y":58}, + + {"matrix":[5,0], "flags":1, "x":1, "y":64}, + {"matrix":[5,1], "flags":1, "x":14, "y":64}, + {"matrix":[5,2], "flags":1, "x":27, "y":64}, + {"matrix":[5,6], "flags":4, "x":66, "y":64}, + {"matrix":[5,10], "flags":1, "x":105, "y":64}, + {"matrix":[5,11], "flags":1, "x":118, "y":64}, + {"matrix":[5,12], "flags":1, "x":131, "y":64}, + {"matrix":[5,13], "flags":1, "x":144, "y":64}, + {"matrix":[5,14], "flags":1, "x":158, "y":64}, + {"matrix":[5,15], "flags":1, "x":169, "y":64}, + {"matrix":[5,16], "flags":1, "x":179, "y":64}, + {"matrix":[5,17], "flags":4, "x":197, "y":64}, + {"matrix":[5,19], "flags":4, "x":213, "y":64} + ] } -} +} \ No newline at end of file diff --git a/keyboards/keychron/k10_pro/ansi/rgb/keymaps/default/keymap.c b/keyboards/keychron/k10_pro/ansi/rgb/keymaps/default/keymap.c index d54f54594b..170a7690a3 100644 --- a/keyboards/keychron/k10_pro/ansi/rgb/keymaps/default/keymap.c +++ b/keyboards/keychron/k10_pro/ansi/rgb/keymaps/default/keymap.c @@ -16,14 +16,14 @@ #include QMK_KEYBOARD_H -// clang-format off -enum layers{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN +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_ansi_108( 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_SIRI, RGB_MOD, KC_F13, KC_F14, KC_F15, KC_F16, @@ -54,4 +54,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; - diff --git a/keyboards/keychron/k10_pro/ansi/rgb/keymaps/via/keymap.c b/keyboards/keychron/k10_pro/ansi/rgb/keymaps/via/keymap.c index d54f54594b..6eddf66e6a 100644 --- a/keyboards/keychron/k10_pro/ansi/rgb/keymaps/via/keymap.c +++ b/keyboards/keychron/k10_pro/ansi/rgb/keymaps/via/keymap.c @@ -16,17 +16,17 @@ #include QMK_KEYBOARD_H -// clang-format off -enum layers{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN +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_ansi_108( - 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_SIRI, RGB_MOD, KC_F13, KC_F14, KC_F15, KC_F16, + KC_ESC, KC_BRID, KC_BRIU, KC_MICT, KC_LAPA, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, RGB_MOD, KC_F13, KC_F14, KC_F15, KC_F16, 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_INS, KC_HOME, 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_DEL, KC_END, 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_P4, KC_P5, KC_P6, diff --git a/keyboards/keychron/k10_pro/ansi/white/config.h b/keyboards/keychron/k10_pro/ansi/white/config.h index 22ed7ea697..1ebccb2e77 100644 --- a/keyboards/keychron/k10_pro/ansi/white/config.h +++ b/keyboards/keychron/k10_pro/ansi/white/config.h @@ -20,6 +20,8 @@ /* LED matrix driver configuration */ # define DRIVER_COUNT 1 # define DRIVER_ADDR_1 0b1110100 + +/* LED matrix configuration */ # define LED_MATRIX_LED_COUNT 108 /* Set to infinit, which is use in USB mode by default */ diff --git a/keyboards/keychron/k10_pro/ansi/white/info.json b/keyboards/keychron/k10_pro/ansi/white/info.json index 13928a7773..5d64a62705 100644 --- a/keyboards/keychron/k10_pro/ansi/white/info.json +++ b/keyboards/keychron/k10_pro/ansi/white/info.json @@ -25,6 +25,121 @@ "wave_left_right": true, "wave_up_down": true, "effect_max": true - } + }, + "layout": [ + {"matrix":[0,0], "flags":1, "x":0, "y":0}, + {"matrix":[0,1], "flags":1, "x":20, "y":0}, + {"matrix":[0,2], "flags":1, "x":31, "y":0}, + {"matrix":[0,3], "flags":1, "x":42, "y":0}, + {"matrix":[0,4], "flags":1, "x":52, "y":0}, + {"matrix":[0,5], "flags":1, "x":67, "y":0}, + {"matrix":[0,6], "flags":1, "x":78, "y":0}, + {"matrix":[0,7], "flags":1, "x":88, "y":0}, + {"matrix":[0,8], "flags":1, "x":98, "y":0}, + {"matrix":[0,9], "flags":1, "x":114, "y":0}, + {"matrix":[0,10], "flags":1, "x":125, "y":0}, + {"matrix":[0,11], "flags":1, "x":135, "y":0}, + {"matrix":[0,12], "flags":1, "x":145, "y":0}, + {"matrix":[0,14], "flags":1, "x":158, "y":0}, + {"matrix":[0,15], "flags":1, "x":169, "y":0}, + {"matrix":[0,16], "flags":1, "x":179, "y":0}, + {"matrix":[0,17], "flags":4, "x":192, "y":0}, + {"matrix":[0,18], "flags":4, "x":203, "y":0}, + {"matrix":[0,19], "flags":4, "x":213, "y":0}, + {"matrix":[0,20], "flags":4, "x":224, "y":0}, + + {"matrix":[1,0], "flags":1, "x":0, "y":15}, + {"matrix":[1,1], "flags":8, "x":10, "y":15}, + {"matrix":[1,2], "flags":8, "x":20, "y":15}, + {"matrix":[1,3], "flags":8, "x":31, "y":15}, + {"matrix":[1,4], "flags":4, "x":41, "y":15}, + {"matrix":[1,5], "flags":4, "x":52, "y":15}, + {"matrix":[1,6], "flags":4, "x":62, "y":15}, + {"matrix":[1,7], "flags":4, "x":72, "y":15}, + {"matrix":[1,8], "flags":4, "x":83, "y":15}, + {"matrix":[1,9], "flags":4, "x":93, "y":15}, + {"matrix":[1,10], "flags":4, "x":104, "y":15}, + {"matrix":[1,11], "flags":4, "x":114, "y":15}, + {"matrix":[1,12], "flags":4, "x":124, "y":15}, + {"matrix":[1,13], "flags":1, "x":140, "y":15}, + {"matrix":[1,14], "flags":1, "x":158, "y":15}, + {"matrix":[1,15], "flags":1, "x":169, "y":15}, + {"matrix":[1,16], "flags":1, "x":180, "y":15}, + {"matrix":[1,17], "flags":8, "x":192, "y":15}, + {"matrix":[1,18], "flags":4, "x":203, "y":15}, + {"matrix":[1,19], "flags":4, "x":213, "y":15}, + {"matrix":[1,20], "flags":4, "x":224, "y":15}, + + {"matrix":[2,0], "flags":1, "x":2, "y":28}, + {"matrix":[2,1], "flags":4, "x":15, "y":28}, + {"matrix":[2,2], "flags":4, "x":26, "y":28}, + {"matrix":[2,3], "flags":4, "x":36, "y":28}, + {"matrix":[2,4], "flags":4, "x":46, "y":28}, + {"matrix":[2,5], "flags":4, "x":57, "y":28}, + {"matrix":[2,6], "flags":4, "x":67, "y":28}, + {"matrix":[2,7], "flags":4, "x":78, "y":28}, + {"matrix":[2,8], "flags":4, "x":88, "y":28}, + {"matrix":[2,9], "flags":4, "x":98, "y":28}, + {"matrix":[2,10], "flags":4, "x":109, "y":28}, + {"matrix":[2,11], "flags":4, "x":119, "y":28}, + {"matrix":[2,12], "flags":4, "x":130, "y":28}, + {"matrix":[2,13], "flags":1, "x":143, "y":28}, + {"matrix":[2,14], "flags":1, "x":158, "y":28}, + {"matrix":[2,15], "flags":1, "x":169, "y":28}, + {"matrix":[2,16], "flags":1, "x":179, "y":28}, + {"matrix":[2,17], "flags":4, "x":192, "y":28}, + {"matrix":[2,18], "flags":4, "x":203, "y":28}, + {"matrix":[2,19], "flags":4, "x":213, "y":28}, + {"matrix":[2,20], "flags":4, "x":224, "y":28}, + + {"matrix":[3,0], "flags":8, "x":3, "y":39}, + {"matrix":[3,1], "flags":4, "x":18, "y":39}, + {"matrix":[3,2], "flags":4, "x":28, "y":39}, + {"matrix":[3,3], "flags":4, "x":39, "y":39}, + {"matrix":[3,4], "flags":4, "x":49, "y":39}, + {"matrix":[3,5], "flags":4, "x":59, "y":39}, + {"matrix":[3,6], "flags":4, "x":70, "y":39}, + {"matrix":[3,7], "flags":4, "x":80, "y":39}, + {"matrix":[3,8], "flags":4, "x":91, "y":39}, + {"matrix":[3,9], "flags":4, "x":101, "y":39}, + {"matrix":[3,10], "flags":4, "x":111, "y":39}, + {"matrix":[3,11], "flags":4, "x":122, "y":39}, + {"matrix":[3,13], "flags":4, "x":139, "y":39}, + {"matrix":[3,17], "flags":4, "x":192, "y":39}, + {"matrix":[3,18], "flags":4, "x":203, "y":39}, + {"matrix":[3,19], "flags":4, "x":213, "y":39}, + + {"matrix":[4,0], "flags":1, "x":6, "y":52}, + {"matrix":[4,2], "flags":4, "x":23, "y":52}, + {"matrix":[4,3], "flags":4, "x":33, "y":52}, + {"matrix":[4,4], "flags":4, "x":44, "y":52}, + {"matrix":[4,5], "flags":4, "x":54, "y":52}, + {"matrix":[4,6], "flags":4, "x":65, "y":52}, + {"matrix":[4,7], "flags":4, "x":75, "y":52}, + {"matrix":[4,8], "flags":4, "x":85, "y":52}, + {"matrix":[4,9], "flags":4, "x":96, "y":52}, + {"matrix":[4,10], "flags":4, "x":106, "y":52}, + {"matrix":[4,11], "flags":4, "x":117, "y":52}, + {"matrix":[4,13], "flags":1, "x":136, "y":52}, + {"matrix":[4,15], "flags":1, "x":169, "y":52}, + {"matrix":[4,17], "flags":4, "x":192, "y":52}, + {"matrix":[4,18], "flags":4, "x":203, "y":52}, + {"matrix":[4,19], "flags":4, "x":213, "y":52}, + {"matrix":[4,20], "flags":4, "x":224, "y":58}, + + {"matrix":[5,0], "flags":1, "x":1, "y":64}, + {"matrix":[5,1], "flags":1, "x":14, "y":64}, + {"matrix":[5,2], "flags":1, "x":27, "y":64}, + {"matrix":[5,6], "flags":4, "x":66, "y":64}, + {"matrix":[5,10], "flags":1, "x":105, "y":64}, + {"matrix":[5,11], "flags":1, "x":118, "y":64}, + {"matrix":[5,12], "flags":1, "x":131, "y":64}, + {"matrix":[5,13], "flags":1, "x":144, "y":64}, + {"matrix":[5,14], "flags":1, "x":158, "y":64}, + {"matrix":[5,15], "flags":1, "x":169, "y":64}, + {"matrix":[5,16], "flags":1, "x":179, "y":64}, + {"matrix":[5,17], "flags":4, "x":197, "y":64}, + {"matrix":[5,19], "flags":4, "x":213, "y":64} + ] } } diff --git a/keyboards/keychron/k10_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/k10_pro/ansi/white/keymaps/default/keymap.c index b53ac8d1b5..d9e854a9c7 100644 --- a/keyboards/keychron/k10_pro/ansi/white/keymaps/default/keymap.c +++ b/keyboards/keychron/k10_pro/ansi/white/keymaps/default/keymap.c @@ -16,14 +16,14 @@ #include QMK_KEYBOARD_H -// clang-format off enum layers{ MAC_BASE, MAC_FN, WIN_BASE, - WIN_FN + WIN_FN, }; +// clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_ansi_108( 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_SIRI, BL_STEP, KC_F13, KC_F14, KC_F15, KC_F16, diff --git a/keyboards/keychron/k10_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/k10_pro/ansi/white/keymaps/via/keymap.c index b53ac8d1b5..5c29bc5fc4 100644 --- a/keyboards/keychron/k10_pro/ansi/white/keymaps/via/keymap.c +++ b/keyboards/keychron/k10_pro/ansi/white/keymaps/via/keymap.c @@ -16,17 +16,17 @@ #include QMK_KEYBOARD_H -// clang-format off -enum layers{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN +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_ansi_108( - 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_SIRI, BL_STEP, KC_F13, KC_F14, KC_F15, KC_F16, + KC_ESC, KC_BRID, KC_BRIU, KC_MICT, KC_LAPA, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, BL_STEP, KC_F13, KC_F14, KC_F15, KC_F16, 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_INS, KC_HOME, 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_DEL, KC_END, 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_P4, KC_P5, KC_P6, diff --git a/keyboards/keychron/k10_pro/ansi/white/white.c b/keyboards/keychron/k10_pro/ansi/white/white.c index ca7c15071e..a7a920de2a 100644 --- a/keyboards/keychron/k10_pro/ansi/white/white.c +++ b/keyboards/keychron/k10_pro/ansi/white/white.c @@ -137,33 +137,4 @@ const ckled2001_led g_ckled2001_leds[LED_MATRIX_LED_COUNT] = { {0, G_11}, {0, G_12}, }; - -led_config_t g_led_config = { - { - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, NO_LED, 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, NO_LED, 74, NO_LED, NO_LED, NO_LED, 75, 76, 77, NO_LED }, - { 78, NO_LED, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, NO_LED, 89, NO_LED, 90, NO_LED, 91, 92, 93, 94 }, - { 95, 96, 97, NO_LED, NO_LED, NO_LED, 98, NO_LED, NO_LED, NO_LED, 99, 100, 101, 102, 103, 104, 105, 106, NO_LED, 107, NO_LED } - }, - { - {0, 0}, {20, 0}, {31, 0}, {41, 0}, {52, 0}, {67, 0}, {78, 0}, {88, 0}, {98, 0}, {114, 0}, {124, 0}, {135, 0}, {145, 0}, {158, 0}, {169, 0}, {179, 0}, {192, 0}, {203, 0}, {213, 0}, {224, 0}, - {0,15}, {10,15}, {20,15}, {31,15}, {41,15}, {52,15}, {62,15}, {72,15}, {83,15}, { 93, 15}, {104, 15}, {114, 15}, {124, 15}, {140, 15}, {158, 15}, {169, 15}, {179, 15}, {192, 15}, {203, 15}, {213, 15}, {224, 15}, - {2,28}, {15,28}, {26,28}, {36,28}, {46,28}, {57,28}, {67,28}, {78,28}, {88,28}, { 98, 28}, {109, 28}, {119, 28}, {130, 28}, {143, 28}, {158, 28}, {169, 28}, {179, 28}, {192, 28}, {203, 28}, {213, 28}, {224, 28}, - {3,39}, {18,39}, {28,39}, {39,39}, {49,39}, {59,39}, {70,39}, {80,39}, {91,39}, {101, 39}, {111, 39}, {122, 39}, {139, 39}, {192, 39}, {203, 39}, {213, 39}, - {6,52}, {23,52}, {33,52}, {44,52}, {54,52}, {65,52}, {75,52}, {85,52}, { 96, 52}, {106, 52}, {117, 52}, {136, 52}, {169, 52}, {192, 52}, {203, 52}, {213, 52}, {224, 52}, - {1,64}, {14,64}, {27,64}, {66,64}, {105, 64}, {118, 64}, {131, 64}, {144, 64}, {158, 64}, {169, 64}, {179, 64}, {197, 64}, {213, 64}, - - }, - { - 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, 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/k10_pro/config.h b/keyboards/keychron/k10_pro/config.h index 9fe5a4aa58..b7f7f9854e 100644 --- a/keyboards/keychron/k10_pro/config.h +++ b/keyboards/keychron/k10_pro/config.h @@ -89,6 +89,13 @@ #define FEE_DENSITY_BYTES FEE_PAGE_SIZE #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047 +/* HC595 driver configuration */ +#define HC595_STCP A0 +#define HC595_SHCP A1 +#define HC595_DS C15 +#define HC595_START_INDEX 1 +#define HC595_END_INDEX 20 + /* Factory test keys */ #define FN_KEY1 MO(1) #define FN_KEY2 MO(3) diff --git a/keyboards/keychron/k10_pro/info.json b/keyboards/keychron/k10_pro/info.json index 8833cd1815..c82cc7f871 100644 --- a/keyboards/keychron/k10_pro/info.json +++ b/keyboards/keychron/k10_pro/info.json @@ -23,7 +23,7 @@ }, "matrix_pins": { "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], - "cols": ["B0", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], + "cols": ["B0", null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], "custom": true, "custom_lite": true }, @@ -262,6 +262,127 @@ {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, {"matrix":[5,19], "x":20.5, "y":5.25} ] + }, + "LAYOUT_112_jis": { + "layout": [ + {"matrix":[0,0], "x":0, "y":0}, + {"matrix":[0,1], "x":2, "y":0}, + {"matrix":[0,2], "x":3, "y":0}, + {"matrix":[0,3], "x":4, "y":0}, + {"matrix":[0,4], "x":5, "y":0}, + {"matrix":[0,5], "x":6.5, "y":0}, + {"matrix":[0,6], "x":7.5, "y":0}, + {"matrix":[0,7], "x":8.5, "y":0}, + {"matrix":[0,8], "x":9.5, "y":0}, + {"matrix":[0,9], "x":11, "y":0}, + {"matrix":[0,10], "x":12, "y":0}, + {"matrix":[0,11], "x":13, "y":0}, + {"matrix":[0,12], "x":14, "y":0}, + {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0,15], "x":16.25, "y":0}, + {"matrix":[0,16], "x":17.25, "y":0}, + {"matrix":[0,17], "x":18.5, "y":0}, + {"matrix":[0,18], "x":19.5, "y":0}, + {"matrix":[0,19], "x":20.5, "y":0}, + {"matrix":[0,20], "x":21.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":[0,13], "x":14, "y":1.25}, + {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1,15], "x":16.25, "y":1.25}, + {"matrix":[1,16], "x":17.25, "y":1.25}, + {"matrix":[1,17], "x":18.5, "y":1.25}, + {"matrix":[1,18], "x":19.5, "y":1.25}, + {"matrix":[1,19], "x":20.5, "y":1.25}, + {"matrix":[1,20], "x":21.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.25, "y":2.25}, + {"matrix":[2,16], "x":17.25, "y":2.25}, + {"matrix":[2,17], "x":18.5, "y":2.25}, + {"matrix":[2,18], "x":19.5, "y":2.25}, + {"matrix":[2,19], "x":20.5, "y":2.25}, + {"matrix":[2,20], "x":21.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,17], "x":18.5, "y":3.25}, + {"matrix":[3,18], "x":19.5, "y":3.25}, + {"matrix":[3,19], "x":20.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,13], "x":13.25, "y":4.25, "w":1.75}, + {"matrix":[4,15], "x":16.25, "y":4.25}, + {"matrix":[4,17], "x":18.5, "y":4.25}, + {"matrix":[4,18], "x":19.5, "y":4.25}, + {"matrix":[4,19], "x":20.5, "y":4.25}, + {"matrix":[4,20], "x":21.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":4.5}, + {"matrix":[5,9], "x":9, "y":5.25, "w":1.25}, + {"matrix":[5,10], "x":10.25, "y":5.25, "w":1.25}, + {"matrix":[5,11], "x":11.5, "y":5.25, "w":1.25}, + {"matrix":[5,12], "x":12.75, "y":5.25}, + {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5,14], "x":15.25, "y":5.25}, + {"matrix":[5,15], "x":16.25, "y":5.25}, + {"matrix":[5,16], "x":17.25, "y":5.25}, + {"matrix":[5,17], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5,19], "x":20.5, "y":5.25} + ] } } -} +} \ No newline at end of file diff --git a/keyboards/keychron/k10_pro/iso/rgb/config.h b/keyboards/keychron/k10_pro/iso/rgb/config.h index da2aa831f6..23aaeba655 100644 --- a/keyboards/keychron/k10_pro/iso/rgb/config.h +++ b/keyboards/keychron/k10_pro/iso/rgb/config.h @@ -19,9 +19,10 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix Driver Configuration */ # define DRIVER_COUNT 2 - # define DRIVER_ADDR_1 0b1110111 # define DRIVER_ADDR_2 0b1110100 + +/* RGB Matrix Configuration */ # define DRIVER_1_LED_TOTAL 60 # define DRIVER_2_LED_TOTAL 49 # define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) diff --git a/keyboards/keychron/k10_pro/iso/rgb/info.json b/keyboards/keychron/k10_pro/iso/rgb/info.json index ecaa60d9c9..51e45a3b37 100644 --- a/keyboards/keychron/k10_pro/iso/rgb/info.json +++ b/keyboards/keychron/k10_pro/iso/rgb/info.json @@ -30,7 +30,122 @@ "solid_reactive_multinexus": true, "splash": true, "solid_splash": true - } + }, + "layout": [ + {"matrix":[0,0], "flags":1, "x":0, "y":0}, + {"matrix":[0,1], "flags":1, "x":21, "y":0}, + {"matrix":[0,2], "flags":1, "x":31, "y":0}, + {"matrix":[0,3], "flags":1, "x":42, "y":0}, + {"matrix":[0,4], "flags":1, "x":52, "y":0}, + {"matrix":[0,5], "flags":1, "x":68, "y":0}, + {"matrix":[0,6], "flags":1, "x":78, "y":0}, + {"matrix":[0,7], "flags":1, "x":88, "y":0}, + {"matrix":[0,8], "flags":1, "x":99, "y":0}, + {"matrix":[0,9], "flags":1, "x":114, "y":0}, + {"matrix":[0,10], "flags":1, "x":125, "y":0}, + {"matrix":[0,11], "flags":1, "x":135, "y":0}, + {"matrix":[0,12], "flags":1, "x":146, "y":0}, + {"matrix":[0,14], "flags":1, "x":159, "y":0}, + {"matrix":[0,15], "flags":1, "x":169, "y":0}, + {"matrix":[0,16], "flags":1, "x":180, "y":0}, + {"matrix":[0,17], "flags":4, "x":193, "y":0}, + {"matrix":[0,18], "flags":4, "x":203, "y":0}, + {"matrix":[0,19], "flags":4, "x":214, "y":0}, + {"matrix":[0,20], "flags":4, "x":224, "y":0}, + + {"matrix":[1,0], "flags":1, "x":0, "y":15}, + {"matrix":[1,1], "flags":8, "x":10, "y":15}, + {"matrix":[1,2], "flags":8, "x":21, "y":15}, + {"matrix":[1,3], "flags":8, "x":31, "y":15}, + {"matrix":[1,4], "flags":4, "x":42, "y":15}, + {"matrix":[1,5], "flags":4, "x":52, "y":15}, + {"matrix":[1,6], "flags":4, "x":62, "y":15}, + {"matrix":[1,7], "flags":4, "x":73, "y":15}, + {"matrix":[1,8], "flags":4, "x":83, "y":15}, + {"matrix":[1,9], "flags":4, "x":94, "y":15}, + {"matrix":[1,10], "flags":4, "x":104, "y":15}, + {"matrix":[1,11], "flags":4, "x":114, "y":15}, + {"matrix":[1,12], "flags":4, "x":125, "y":15}, + {"matrix":[1,13], "flags":1, "x":141, "y":15}, + {"matrix":[1,14], "flags":1, "x":159, "y":15}, + {"matrix":[1,15], "flags":1, "x":169, "y":15}, + {"matrix":[1,16], "flags":1, "x":180, "y":15}, + {"matrix":[1,17], "flags":8, "x":193, "y":15}, + {"matrix":[1,18], "flags":4, "x":203, "y":15}, + {"matrix":[1,19], "flags":4, "x":214, "y":15}, + {"matrix":[1,20], "flags":4, "x":224, "y":15}, + + {"matrix":[2,0], "flags":1, "x":3, "y":27}, + {"matrix":[2,1], "flags":4, "x":16, "y":27}, + {"matrix":[2,2], "flags":4, "x":26, "y":27}, + {"matrix":[2,3], "flags":4, "x":36, "y":27}, + {"matrix":[2,4], "flags":4, "x":47, "y":27}, + {"matrix":[2,5], "flags":4, "x":57, "y":27}, + {"matrix":[2,6], "flags":4, "x":68, "y":27}, + {"matrix":[2,7], "flags":4, "x":78, "y":27}, + {"matrix":[2,8], "flags":4, "x":88, "y":27}, + {"matrix":[2,9], "flags":4, "x":99, "y":27}, + {"matrix":[2,10], "flags":4, "x":109, "y":27}, + {"matrix":[2,11], "flags":4, "x":120, "y":27}, + {"matrix":[2,12], "flags":4, "x":130, "y":27}, + {"matrix":[2,14], "flags":1, "x":159, "y":27}, + {"matrix":[2,15], "flags":1, "x":169, "y":27}, + {"matrix":[2,16], "flags":1, "x":180, "y":27}, + {"matrix":[2,17], "flags":4, "x":193, "y":27}, + {"matrix":[2,18], "flags":4, "x":203, "y":27}, + {"matrix":[2,19], "flags":4, "x":214, "y":27}, + {"matrix":[2,20], "flags":4, "x":224, "y":34}, + + {"matrix":[3,0], "flags":8, "x":4, "y":40}, + {"matrix":[3,1], "flags":4, "x":18, "y":40}, + {"matrix":[3,2], "flags":4, "x":29, "y":40}, + {"matrix":[3,3], "flags":4, "x":39, "y":40}, + {"matrix":[3,4], "flags":4, "x":49, "y":40}, + {"matrix":[3,5], "flags":4, "x":60, "y":40}, + {"matrix":[3,6], "flags":4, "x":70, "y":40}, + {"matrix":[3,7], "flags":4, "x":81, "y":40}, + {"matrix":[3,8], "flags":4, "x":91, "y":40}, + {"matrix":[3,9], "flags":4, "x":101, "y":40}, + {"matrix":[3,10], "flags":4, "x":112, "y":40}, + {"matrix":[3,11], "flags":4, "x":122, "y":40}, + {"matrix":[3,13], "flags":4, "x":133, "y":40}, + {"matrix":[2,13], "flags":1, "x":147, "y":36}, + {"matrix":[3,17], "flags":4, "x":193, "y":40}, + {"matrix":[3,18], "flags":4, "x":203, "y":40}, + {"matrix":[3,19], "flags":4, "x":214, "y":40}, + + {"matrix":[4,0], "flags":1, "x":1, "y":52}, + {"matrix":[4,1], "flags":4, "x":13, "y":52}, + {"matrix":[4,2], "flags":4, "x":23, "y":52}, + {"matrix":[4,3], "flags":4, "x":34, "y":52}, + {"matrix":[4,4], "flags":4, "x":44, "y":52}, + {"matrix":[4,5], "flags":4, "x":55, "y":52}, + {"matrix":[4,6], "flags":4, "x":65, "y":52}, + {"matrix":[4,7], "flags":4, "x":75, "y":52}, + {"matrix":[4,8], "flags":4, "x":86, "y":52}, + {"matrix":[4,9], "flags":4, "x":96, "y":52}, + {"matrix":[4,10], "flags":4, "x":107, "y":52}, + {"matrix":[4,11], "flags":4, "x":117, "y":52}, + {"matrix":[4,13], "flags":1, "x":137, "y":52}, + {"matrix":[4,15], "flags":1, "x":169, "y":52}, + {"matrix":[4,17], "flags":4, "x":193, "y":52}, + {"matrix":[4,18], "flags":4, "x":203, "y":52}, + {"matrix":[4,19], "flags":4, "x":213, "y":52}, + {"matrix":[4,20], "flags":4, "x":224, "y":58}, + + {"matrix":[5,0], "flags":1, "x":1, "y":64}, + {"matrix":[5,1], "flags":1, "x":14, "y":64}, + {"matrix":[5,2], "flags":1, "x":27, "y":64}, + {"matrix":[5,6], "flags":4, "x":66, "y":64}, + {"matrix":[5,10], "flags":1, "x":105, "y":64}, + {"matrix":[5,11], "flags":1, "x":118, "y":64}, + {"matrix":[5,12], "flags":1, "x":131, "y":64}, + {"matrix":[5,13], "flags":1, "x":144, "y":64}, + {"matrix":[5,14], "flags":1, "x":159, "y":64}, + {"matrix":[5,15], "flags":1, "x":169, "y":64}, + {"matrix":[5,16], "flags":1, "x":180, "y":64}, + {"matrix":[5,17], "flags":4, "x":198, "y":64}, + {"matrix":[5,19], "flags":4, "x":214, "y":64} + ] } } - \ No newline at end of file diff --git a/keyboards/keychron/k10_pro/iso/rgb/keymaps/via/keymap.c b/keyboards/keychron/k10_pro/iso/rgb/keymaps/via/keymap.c index e503829f4f..7154ab96e3 100644 --- a/keyboards/keychron/k10_pro/iso/rgb/keymaps/via/keymap.c +++ b/keyboards/keychron/k10_pro/iso/rgb/keymaps/via/keymap.c @@ -16,17 +16,17 @@ #include QMK_KEYBOARD_H -// clang-format off enum layers{ MAC_BASE, MAC_FN, WIN_BASE, - WIN_FN + WIN_FN, }; +// clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_iso_109( - 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_SIRI, RGB_MOD, KC_F13, KC_F14, KC_F15, KC_F16, + KC_ESC, KC_BRID, KC_BRIU, KC_MICT, KC_LAPA, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, RGB_MOD, KC_F13, KC_F14, KC_F15, KC_F16, 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_INS, KC_HOME, 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_DEL, KC_END, 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_P4, KC_P5, KC_P6, diff --git a/keyboards/keychron/k10_pro/iso/rgb/rgb.c b/keyboards/keychron/k10_pro/iso/rgb/rgb.c index f23203fdae..6c9918f4ca 100644 --- a/keyboards/keychron/k10_pro/iso/rgb/rgb.c +++ b/keyboards/keychron/k10_pro/iso/rgb/rgb.c @@ -140,36 +140,4 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { {1, F_11, D_11, E_11}, {1, F_12, D_12, E_12}, }; - -#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, 74, 54, 55, 56, 57, 58, 59, 60 }, - { 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, __, 73, __, __, __, 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, 107, __, 108, __ } - }, - { - // LED Index to Physical Position - {0,0}, {21,0}, {31,0}, {42,0}, {52,0}, {68,0}, {78,0}, {88,0}, {99,0}, {114,0}, {125,0}, {135,0}, {146,0}, {159,0}, {169,0}, {180,0}, {193,0}, {203,0}, {214,0}, {224,0}, - {0,15}, {10,15}, {21,15}, {31,15}, {42,15}, {52,15}, {62,15}, {73,15}, {83,15}, {94,15}, {104,15}, {114,15}, {125,15}, {141,15}, {159,15}, {169,15}, {180,15}, {193,15}, {203,15}, {214,15}, {224,15}, - {3,27}, {16,27}, {26,27}, {36,27}, {47,27}, {57,27}, {68,27}, {78,27}, {88,27}, {99,27}, {109,27}, {120,27}, {130,27}, {159,27}, {169,27}, {180,27}, {193,27}, {203,27}, {214,27}, {224,34}, - {4,40}, {18,40}, {29,40}, {39,40}, {49,40}, {60,40}, {70,40}, {81,40}, {91,40}, {101,40}, {112,40}, {122,40}, {133,40}, {147,36}, {193,40}, {203,40}, {214,40}, - {1,52}, {13,52}, {23,52}, {34,52}, {44,52}, {55,52}, {65,52}, {75,52}, {86,52}, {96,52}, {107,52}, {117,52}, {137,52}, {169,52}, {193,52}, {203,52}, {214,52}, {224,58}, - {1,64}, {14,64}, {27,64}, {66,64}, {105,64}, {118,64}, {131,64}, {144,64}, {159,64}, {169,64}, {180,64}, {198,64}, {214,64}, - }, - { - // RGB LED Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, - 1, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 8, 4, 4, 4, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 4, 4, 4, 4, - 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, - 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 4, 4, - } -}; #endif diff --git a/keyboards/keychron/k10_pro/iso/white/config.h b/keyboards/keychron/k10_pro/iso/white/config.h index 54e97b6fbf..734e422cbd 100644 --- a/keyboards/keychron/k10_pro/iso/white/config.h +++ b/keyboards/keychron/k10_pro/iso/white/config.h @@ -20,8 +20,9 @@ /* LED Matrix Driver Configuration */ # define DRIVER_COUNT 1 # define DRIVER_ADDR_1 0b1110100 -# define DRIVER_1_LED_TOTAL 109 -# define LED_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL + +/* LED Matrix Configuration */ +# define LED_MATRIX_LED_COUNT 109 /* Set to infinit, which is use in USB mode by default */ # define LED_MATRIX_TIMEOUT LED_MATRIX_TIMEOUT_INFINITE diff --git a/keyboards/keychron/k10_pro/iso/white/info.json b/keyboards/keychron/k10_pro/iso/white/info.json index 0201dd96b6..74c33b68ae 100644 --- a/keyboards/keychron/k10_pro/iso/white/info.json +++ b/keyboards/keychron/k10_pro/iso/white/info.json @@ -25,6 +25,122 @@ "wave_left_right": true, "wave_up_down": true, "effect_max": true - } + }, + "layout": [ + {"matrix":[0,0], "flags":1, "x":0, "y":0}, + {"matrix":[0,1], "flags":1, "x":21, "y":0}, + {"matrix":[0,2], "flags":1, "x":31, "y":0}, + {"matrix":[0,3], "flags":1, "x":42, "y":0}, + {"matrix":[0,4], "flags":1, "x":52, "y":0}, + {"matrix":[0,5], "flags":1, "x":68, "y":0}, + {"matrix":[0,6], "flags":1, "x":78, "y":0}, + {"matrix":[0,7], "flags":1, "x":88, "y":0}, + {"matrix":[0,8], "flags":1, "x":99, "y":0}, + {"matrix":[0,9], "flags":1, "x":114, "y":0}, + {"matrix":[0,10], "flags":1, "x":125, "y":0}, + {"matrix":[0,11], "flags":1, "x":135, "y":0}, + {"matrix":[0,12], "flags":1, "x":146, "y":0}, + {"matrix":[0,14], "flags":1, "x":159, "y":0}, + {"matrix":[0,15], "flags":1, "x":169, "y":0}, + {"matrix":[0,16], "flags":1, "x":180, "y":0}, + {"matrix":[0,17], "flags":4, "x":193, "y":0}, + {"matrix":[0,18], "flags":4, "x":203, "y":0}, + {"matrix":[0,19], "flags":4, "x":214, "y":0}, + {"matrix":[0,20], "flags":4, "x":224, "y":0}, + + {"matrix":[1,0], "flags":1, "x":0, "y":15}, + {"matrix":[1,1], "flags":8, "x":10, "y":15}, + {"matrix":[1,2], "flags":8, "x":21, "y":15}, + {"matrix":[1,3], "flags":8, "x":31, "y":15}, + {"matrix":[1,4], "flags":4, "x":42, "y":15}, + {"matrix":[1,5], "flags":4, "x":52, "y":15}, + {"matrix":[1,6], "flags":4, "x":62, "y":15}, + {"matrix":[1,7], "flags":4, "x":73, "y":15}, + {"matrix":[1,8], "flags":4, "x":83, "y":15}, + {"matrix":[1,9], "flags":4, "x":94, "y":15}, + {"matrix":[1,10], "flags":4, "x":104, "y":15}, + {"matrix":[1,11], "flags":4, "x":114, "y":15}, + {"matrix":[1,12], "flags":4, "x":125, "y":15}, + {"matrix":[1,13], "flags":1, "x":141, "y":15}, + {"matrix":[1,14], "flags":1, "x":159, "y":15}, + {"matrix":[1,15], "flags":1, "x":169, "y":15}, + {"matrix":[1,16], "flags":1, "x":180, "y":15}, + {"matrix":[1,17], "flags":8, "x":193, "y":15}, + {"matrix":[1,18], "flags":4, "x":203, "y":15}, + {"matrix":[1,19], "flags":4, "x":214, "y":15}, + {"matrix":[1,20], "flags":4, "x":224, "y":15}, + + {"matrix":[2,0], "flags":1, "x":3, "y":27}, + {"matrix":[2,1], "flags":4, "x":16, "y":27}, + {"matrix":[2,2], "flags":4, "x":26, "y":27}, + {"matrix":[2,3], "flags":4, "x":36, "y":27}, + {"matrix":[2,4], "flags":4, "x":47, "y":27}, + {"matrix":[2,5], "flags":4, "x":57, "y":27}, + {"matrix":[2,6], "flags":4, "x":68, "y":27}, + {"matrix":[2,7], "flags":4, "x":78, "y":27}, + {"matrix":[2,8], "flags":4, "x":88, "y":27}, + {"matrix":[2,9], "flags":4, "x":99, "y":27}, + {"matrix":[2,10], "flags":4, "x":109, "y":27}, + {"matrix":[2,11], "flags":4, "x":120, "y":27}, + {"matrix":[2,12], "flags":4, "x":130, "y":27}, + {"matrix":[2,14], "flags":1, "x":159, "y":27}, + {"matrix":[2,15], "flags":1, "x":169, "y":27}, + {"matrix":[2,16], "flags":1, "x":180, "y":27}, + {"matrix":[2,17], "flags":4, "x":193, "y":27}, + {"matrix":[2,18], "flags":4, "x":203, "y":27}, + {"matrix":[2,19], "flags":4, "x":214, "y":27}, + {"matrix":[2,20], "flags":4, "x":224, "y":34}, + + {"matrix":[3,0], "flags":8, "x":4, "y":40}, + {"matrix":[3,1], "flags":4, "x":18, "y":40}, + {"matrix":[3,2], "flags":4, "x":29, "y":40}, + {"matrix":[3,3], "flags":4, "x":39, "y":40}, + {"matrix":[3,4], "flags":4, "x":49, "y":40}, + {"matrix":[3,5], "flags":4, "x":60, "y":40}, + {"matrix":[3,6], "flags":4, "x":70, "y":40}, + {"matrix":[3,7], "flag