diff options
Diffstat (limited to 'keyboards/wuque')
40 files changed, 3521 insertions, 4792 deletions
diff --git a/keyboards/wuque/creek70/config.h b/keyboards/wuque/creek70/config.h index 4f17871ab0..61a472d2fb 100644 --- a/keyboards/wuque/creek70/config.h +++ b/keyboards/wuque/creek70/config.h @@ -16,8 +16,6 @@ #pragma once -#define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN # define RGBLED_NUM 7 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -34,4 +32,3 @@ # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/wuque/creek70/creek70.c b/keyboards/wuque/creek70/creek70.c deleted file mode 100644 index f6ea64ee33..0000000000 --- a/keyboards/wuque/creek70/creek70.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2023 wuque - * - * 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 "creek70.h" diff --git a/keyboards/wuque/creek70/creek70.h b/keyboards/wuque/creek70/creek70.h deleted file mode 100644 index d182671cc4..0000000000 --- a/keyboards/wuque/creek70/creek70.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2023 wuque - * - * 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 "quantum.h" - - -/* Standard Arrangement - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐ - * │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │2E ││0F │0G │0H │ - * ┌───┐├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤ - * |10 |│11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E ││1F │1G │1H │ - * ├───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘ - * |20 |│21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │ - * ├───┤├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ - * |30 |│31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │ │3G │ - * ├───┤├────┼───┴┬──┴─┬─┴───┴───┼───┴┬──┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐ - * |40 |│41 │42 │43 │46 │47 │48 │4B │4C │4D │4E ││4F │4G │4H │ - * └───┘└────┴────┴────┴─────────┴────┴─────────┴────┴────┴────┴────┘└───┴───┴───┘ - */ - -#define LAYOUT( \ - K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K2E, K0F, K0G, K0H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3G, \ - K40, K41, K42, K43, K46, K47, K48, K4B, K4C, K4D, K4E, K4F, K4G, K4H \ -) { \ - { KC_NO, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, KC_NO, KC_NO, KC_NO }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, KC_NO, K3G, KC_NO }, \ - { K40, K41, K42, K43, KC_NO, KC_NO, K46, K47, K48, KC_NO, KC_NO, K4B, K4C, K4D, K4E, K4F, K4G, K4H }, \ -} - diff --git a/keyboards/wuque/creek70/info.json b/keyboards/wuque/creek70/info.json index e03b4df35f..866d0413ca 100644 --- a/keyboards/wuque/creek70/info.json +++ b/keyboards/wuque/creek70/info.json @@ -45,93 +45,100 @@ "caps_lock": "F6", "on_state": 0 }, + "ws2812": { + "pin": "D0" + }, "layouts": { "LAYOUT": { "layout": [ - { "label": "~", "x": 1, "y": 0 }, - { "label": "1", "x": 2, "y": 0 }, - { "label": "2", "x": 3, "y": 0 }, - { "label": "3", "x": 4, "y": 0 }, - { "label": "4", "x": 5, "y": 0 }, - { "label": "5", "x": 6, "y": 0 }, - { "label": "6", "x": 7, "y": 0 }, - { "label": "7", "x": 8, "y": 0 }, - { "label": "8", "x": 9, "y": 0 }, - { "label": "9", "x": 10, "y": 0 }, - { "label": "0", "x": 11, "y": 0 }, - { "label": "-", "x": 12, "y": 0 }, - { "label": "=", "x": 13, "y": 0 }, - { "label": "Backspace", "x": 14, "y": 0 }, - { "label": "Insert", "x": 16.25, "y": 0 }, - { "label": "Home", "x": 17.25, "y": 0 }, - { "label": "PageUp", "x": 18.25, "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": [2, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 15], "x": 17.25, "y": 0}, + {"matrix": [0, 16], "x": 18.25, "y": 0}, + + {"matrix": [0, 17], "x": 0, "y": 1}, + {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 2.5, "y": 1}, + {"matrix": [1, 2], "x": 3.5, "y": 1}, + {"matrix": [1, 3], "x": 4.5, "y": 1}, + {"matrix": [1, 4], "x": 5.5, "y": 1}, + {"matrix": [1, 5], "x": 6.5, "y": 1}, + {"matrix": [1, 6], "x": 7.5, "y": 1}, + {"matrix": [1, 7], "x": 8.5, "y": 1}, + {"matrix": [1, 8], "x": 9.5, "y": 1}, + {"matrix": [1, 9], "x": 10.5, "y": 1}, + {"matrix": [1, 10], "x": 11.5, "y": 1}, + {"matrix": [1, 11], "x": 12.5, "y": 1}, + {"matrix": [1, 12], "x": 13.5, "y": 1}, + {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 16.25, "y": 1}, + {"matrix": [1, 15], "x": 17.25, "y": 1}, + {"matrix": [1, 16], "x": 18.25, "y": 1}, + + {"matrix": [1, 17], "x": 0, "y": 2}, + {"matrix": [2, 0], "x": 1, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2.75, "y": 2}, + {"matrix": [2, 2], "x": 3.75, "y": 2}, + {"matrix": [2, 3], "x": 4.75, "y": 2}, + {"matrix": [2, 4], "x": 5.75, "y": 2}, + {"matrix": [2, 5], "x": 6.75, "y": 2}, + {"matrix": [2, 6], "x": 7.75, "y": 2}, + {"matrix": [2, 7], "x": 8.75, "y": 2}, + {"matrix": [2, 8], "x": 9.75, "y": 2}, + {"matrix": [2, 9], "x": 10.75, "y": 2}, + {"matrix": [2, 10], "x": 11.75, "y": 2}, + {"matrix": [2, 11], "x": 12.75, "y": 2}, + {"matrix": [2, 12], "x": 13.75, "y": 2, "w": 2.25}, + {"matrix": [2, 13], "x": 15, "y": 0}, - { "label": "Func1", "x": 0, "y": 1 }, - { "label": "Tab", "x": 1, "y": 1, "w": 1.5 }, - { "label": "Q", "x": 2.5, "y": 1 }, - { "label": "W", "x": 3.5, "y": 1 }, - { "label": "E", "x": 4.5, "y": 1 }, - { "label": "R", "x": 5.5, "y": 1 }, - { "label": "T", "x": 6.5, "y": 1 }, - { "label": "Y", "x": 7.5, "y": 1 }, - { "label": "U", "x": 8.5, "y": 1 }, - { "label": "I", "x": 9.5, "y": 1 }, - { "label": "O", "x": 10.5, "y": 1 }, - { "label": "P", "x": 11.5, "y": 1 }, - { "label": "[", "x": 12.5, "y": 1 }, - { "label": "]", "x": 13.5, "y": 1 }, - { "label": "\\", "x": 14.5, "y": 1, "w": 1.5 }, - { "label": "Delete", "x": 16.25, "y": 1 }, - { "label": "End", "x": 17.25, "y": 1 }, - { "label": "PageDown", "x": 18.25, "y": 1 }, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3}, + {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 15, "y": 3}, - { "label": "Func2", "x": 0, "y": 2 }, - { "label": "Caps Lock", "x": 1, "y": 2, "w": 1.75 }, - { "label": "A", "x": 2.75, "y": 2 }, - { "label": "S", "x": 3.75, "y": 2 }, - { "label": "D", "x": 4.75, "y": 2 }, - { "label": "F", "x": 5.75, "y": 2 }, - { "label": "G", "x": 6.75, "y": 2 }, - { "label": "H", "x": 7.75, "y": 2 }, - { "label": "J", "x": 8.75, "y": 2 }, - { "label": "K", "x": 9.75, "y": 2 }, - { "label": "L", "x": 10.75, "y": 2 }, - { "label": ";", "x": 11.75, "y": 2 }, - { "label": "'", "x": 12.75, "y": 2 }, - { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 }, - { "label": "Backspace1", "x": 15, "y": 0 }, + {"matrix": [3, 16], "x": 17.25, "y": 3}, - { "label": "Func3", "x": 0, "y": 3 }, - { "label": "Shift1", "x": 1, "y": 3 }, - { "label": "Shift2", "x": 2, "y": 3, "w": 1.25 }, - { "label": "Z", "x": 3.25, "y": 3 }, - { "label": "X", "x": 4.25, "y": 3 }, - { "label": "C", "x": 5.25, "y": 3 }, - { "label": "V", "x": 6.25, "y": 3 }, - { "label": "B", "x": 7.25, "y": 3 }, - { "label": "N", "x": 8.25, "y": 3 }, - { "label": "M", "x": 9.25, "y": 3 }, - { "label": ",", "x": 10.25, "y": 3 }, - { "label": ".", "x": 11.25, "y": 3 }, - { "label": "/", "x": 12.25, "y": 3 }, - { "label": "Shift1", "x": 13.25, "y": 3, "w": 1.75 }, - { "label": "Shift2", "x": 15, "y": 3 }, - { "label": "\u2191", "x": 17.25, "y": 3 }, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 4.75, "y": 4, "w": 2.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.5}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25}, - { "label": "Func4", "x": 0, "y": 4 }, - { "label": "Ctrl", "x": 1, "y": 4, "w": 1.25 }, - { "label": "Win", "x": 2.25, "y": 4, "w": 1.25 }, - { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 }, - { "label": "Space", "x": 4.75, "y": 4, "w": 2.5 }, - { "label": "Space", "x": 7.25, "y": 4, "w": 1.25 }, - { "label": "Space", "x": 8.5, "y": 4, "w": 2.5 }, - { "label": "Alt", "x": 11, "y": 4, "w": 1.25 }, - { "label": "Win", "x": 12.25, "y": 4, "w": 1.25 }, - { "label": "Fn", "x": 13.5, "y": 4, "w": 1.25 }, - { "label": "Ctrl", "x": 14.75, "y": 4, "w": 1.25 }, - { "label": "\u2190", "x": 16.25, "y": 4 }, - { "label": "\u2193", "x": 17.25, "y": 4 }, - { "label": "\u2192", "x": 18.25, "y": 4 } + {"matrix": [4, 15], "x": 16.25, "y": 4}, + {"matrix": [4, 16], "x": 17.25, "y": 4}, + {"matrix": [4, 17], "x": 18.25, "y": 4} ] } } diff --git a/keyboards/wuque/ikki68/config.h b/keyboards/wuque/ikki68/config.h index 45f7843698..9ca2e18c52 100644 --- a/keyboards/wuque/ikki68/config.h +++ b/keyboards/wuque/ikki68/config.h @@ -17,20 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6 } -#define MATRIX_COL_PINS { D1, D0, D2, D3, D5, D4, D6, D7, B4, B5, F0, F1, B6, F4, F5, F6,F7 } - -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -48,4 +40,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/wuque/ikki68/ikki68.c b/keyboards/wuque/ikki68/ikki68.c index 57aa7bf570..a61ddf3a56 100644 --- a/keyboards/wuque/ikki68/ikki68.c +++ b/keyboards/wuque/ikki68/ikki68.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ikki68.h" +#include "quantum.h" void matrix_init_kb(void) { setPinOutput(C6); diff --git a/keyboards/wuque/ikki68/ikki68.h b/keyboards/wuque/ikki68/ikki68.h deleted file mode 100644 index 3210748914..0000000000 --- a/keyboards/wuque/ikki68/ikki68.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 wuquestudio - * - * 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 "quantum.h" - -#define LAYOUT_68_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, \ - K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3F, \ - K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F, K4G \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F, K0G }, \ - { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \ - { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO, K3F, KC_NO }, \ - { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D, K4E, K4F, K4G }, \ -} diff --git a/keyboards/wuque/ikki68/info.json b/keyboards/wuque/ikki68/info.json index 4cdf46a99a..5de436ac17 100644 --- a/keyboards/wuque/ikki68/info.json +++ b/keyboards/wuque/ikki68/info.json @@ -8,80 +8,95 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, + "matrix_pins": { + "cols": ["D1", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "F0", "F1", "B6", "F4", "F5", "F6", "F7"], + "rows": ["B0", "B1", "B2", "B3", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["68_ansi"], "layouts": { "LAYOUT_68_ansi": { "layout": [ - {"label":"K00 (B0,D1)", "x":0, "y":0}, - {"label":"K01 (B0,D0)", "x":1, "y":0}, - {"label":"K02 (B0,D2)", "x":2, "y":0}, - {"label":"K03 (B0,D3)", "x":3, "y":0}, - {"label":"K04 (B0,D5)", "x":4, "y":0}, - {"label":"K05 (B0,D4)", "x":5, "y":0}, - {"label":"K06 (B0,D6)", "x":6, "y":0}, - {"label":"K07 (B0,D7)", "x":7, "y":0}, - {"label":"K08 (B0,B4)", "x":8, "y":0}, - {"label":"K09 (B0,B5)", "x":9, "y":0}, - {"label":"K0A (B0,F0)", "x":10, "y":0}, - {"label":"K0B (B0,F1)", "x":11, "y":0}, - {"label":"K0C (B0,B6)", "x":12, "y":0}, - {"label":"K0E (B0,F5)", "x":13, "y":0, "w":2}, - {"label":"K0F (B0,F6)", "x":15.5, "y":0}, - {"label":"K0G (B0,F7)", "x":16.5, "y":0}, - {"label":"K10 (B1,D1)", "x":0, "y":1, "w":1.5}, - {"label":"K12 (B1,D2)", "x":1.5, "y":1}, - {"label":"K13 (B1,D3)", "x":2.5, "y":1}, - {"label":"K14 (B1,D5)", "x":3.5, "y":1}, - {"label":"K15 (B1,D4)", "x":4.5, "y":1}, - {"label":"K16 (B1,D6)", "x":5.5, "y":1}, - {"label":"K17 (B1,D7)", "x":6.5, "y":1}, - {"label":"K18 (B1,B4)", "x":7.5, "y":1}, - {"label":"K19 (B1,B5)", "x":8.5, "y":1}, - {"label":"K1A (B1,F0)", "x":9.5, "y":1}, - {"label":"K1B (B1,F1)", "x":10.5, "y":1}, - {"label":"K1C (B1,B6)", "x":11.5, "y":1}, - {"label":"K1D (B1,F4)", "x":12.5, "y":1}, - {"label":"K1E (B1,F5)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1F (B1,F6)", "x":15.5, "y":1}, - {"label":"K1G (B1,F7)", "x":16.5, "y":1}, - {"label":"K20 (B2,D1)", "x":0, "y":2, "w":1.75}, - {"label":"K22 (B2,D2)", "x":1.75, "y":2}, - {"label":"K23 (B2,D3)", "x":2.75, "y":2}, - {"label":"K24 (B2,D5)", "x":3.75, "y":2}, - {"label":"K25 (B2,D4)", "x":4.75, "y":2}, - {"label":"K26 (B2,D6)", "x":5.75, "y":2}, - {"label":"K27 (B2,D7)", "x":6.75, "y":2}, - {"label":"K28 (B2,B4)", "x":7.75, "y":2}, - {"label":"K29 (B2,B5)", "x":8.75, "y":2}, - {"label":"K2A (B2,F0)", "x":9.75, "y":2}, - {"label":"K2B (B2,F1)", "x":10.75, "y":2}, - {"label":"K2C (B2,B6)", "x":11.75, "y":2}, - {"label":"K2D (B2,F4)", "x":12.75, "y":2, "w":2.25}, - {"label":"K31 (B3,D0)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (B3,D2)", "x":2.25, "y":3}, - {"label":"K33 (B3,D3)", "x":3.25, "y":3}, - {"label":"K34 (B3,D5)", "x":4.25, "y":3}, - {"label":"K35 (B3,D4)", "x":5.25, "y":3}, - {"label":"K36 (B3,D6)", "x":6.25, "y":3}, - {"label":"K37 (B3,D7)", "x":7.25, "y":3}, - {"label":"K38 (B3,B4)", "x":8.25, "y":3}, - {"label":"K39 (B3,B5)", "x":9.25, "y":3}, - {"label":"K3A (B3,F0)", "x":10.25, "y":3}, - {"label":"K3B (B3,F1)", "x":11.25, "y":3}, - {"label":"K3D (B3,F4)", "x":12.25, "y":3, "w":2.75}, - {"label":"K3F (B3,F6)", "x":15.5, "y":3}, - {"label":"K40 (E6,D1)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (E6,D0)", "x":1.25, "y":4, "w":1.25}, - {"label":"K43 (E6,D3)", "x":2.5, "y":4, "w":1.25}, - {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25}, - {"label":"K4A (E6,F0)", "x":10, "y":4, "w":1.25}, - {"label":"K4B (E6,F1)", "x":11.25, "y":4, "w":1.25}, - {"label":"K4D (E6,F4)", "x":12.5, "y":4, "w":1.25}, - {"label":"K4E (E6,F5)", "x":14.5, "y":4}, - {"label":"K4F (E6,F6)", "x":15.5, "y":4}, - {"label":"K4G (E6,F7)", "x":16.5, "y":4} + {"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, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 15], "x": 15.5, "y": 0}, + {"matrix": [0, 16], "x": 16.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 15], "x": 15.5, "y": 1}, + {"matrix": [1, 16], "x": 16.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [3, 15], "x": 15.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 14], "x": 14.5, "y": 4}, + {"matrix": [4, 15], "x": 15.5, "y": 4}, + {"matrix": [4, 16], "x": 16.5, "y": 4} ] } } diff --git a/keyboards/wuque/ikki68_aurora/config.h b/keyboards/wuque/ikki68_aurora/config.h index 85a6ecf974..19720b3bb4 100644 --- a/keyboards/wuque/ikki68_aurora/config.h +++ b/keyboards/wuque/ikki68_aurora/config.h @@ -17,20 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D5, D3, D2, D1, D0, F0, F1, E6, B5, B4, D7, D6, D4, F4, F5, F6 } - -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -48,4 +40,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/wuque/ikki68_aurora/ikki68_aurora.c b/keyboards/wuque/ikki68_aurora/ikki68_aurora.c deleted file mode 100644 index 8e4e4e5889..0000000000 --- a/keyboards/wuque/ikki68_au |