Resolved requested changes

This commit is contained in:
jukaie 2023-04-27 10:48:41 +08:00 committed by GitHub
parent 060bb19d3d
commit dee18ac03c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 337 additions and 347 deletions

View File

@ -16,25 +16,6 @@
#pragma once
#define MATRIX_ROW_PINS \
{ B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B12 }
#define MATRIX_COL_PINS \
{ A0, A1, A2, A3, A4, A8, A9, A10 }
#define ENCODERS_PAD_A \
{ C2 }
#define ENCODERS_PAD_B \
{ C3 }
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* Hold ESC on start up to clear EEPROM and boot into bootloader mode */
#define BOOTMAGIC_LITE_ROW 1
#define BOOTMAGIC_LITE_COLUMN 3
#define TAP_CODE_DELAY 10
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
@ -58,8 +39,8 @@
#define DRIVER_2_EN C13
#define DRIVER_COUNT 2
#define DRIVER_1_LED_TOTAL 68
#define DRIVER_2_LED_TOTAL 54
#define DRIVER_1_LED_TOTAL 66
#define DRIVER_2_LED_TOTAL 19
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
// RGB Matrix Animation modes. Explicitly enabled
@ -110,6 +91,3 @@
#define ENABLE_RGB_MATRIX_MULTISPLASH
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
#define RGB_MATRIX_CENTER { 76, 25 }

View File

@ -21,4 +21,3 @@
#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#include_next <halconf.h>

View File

@ -1,111 +1,259 @@
{
"keyboard_name": "JK01",
"manufacturer": "Jukaie",
"url": "",
"keyboard_name": "JK01",
"maintainer": "Jukaie",
"usb": {
"vid": "0x0191",
"pid": "0x0002",
"device_version": "0.0.2"
"bootloader": "wb32-dfu",
"bootmagic": {
"enabled": true,
"matrix": [1, 3]
},
"config_h_features": {
"audio": false,
"backlight": false,
"bootmagic": true,
"command": false,
"console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
"nkro": true,
"rgb_matrix": true,
"rgblight": false
},
"diode_direction": "COL2ROW",
"encoder": {
"enabled": true,
"rotary": [
{
"pin_a": "C2",
"pin_b": "C3"
}
]
},
"features": {
"audio": false,
"backlight": false,
"bootmagic": true,
"command": false,
"console": false,
"encoder": true,
"extrakey": true,
"mousekey": true,
"nkro": true,
"rgb_matrix": true,
"rgblight": false
},
"indicators": {
"caps_lock": "C14"
},
"keyboard_folder": "jukaie/jk01",
"keymaps": {},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
"rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B12"]
},
"matrix_size": {
"cols": 8,
"rows": 12
},
"mouse_key": {
"enabled": true
},
"parse_errors": [],
"parse_warnings": [],
"platform_key": "chibios",
"processor": "WB32FQ95",
"bootloader": "wb32-dfu",
"processor_type": "arm",
"protocol": "ChibiOS",
"qmk": {
"tap_keycode_delay": 10
},
"rgb_matrix": {
"center_point": [76, 25],
"driver": "AW20216",
"layout": [
{ "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
{ "flags": 4, "matrix": [2, 6], "x": 20, "y": 0 },
{ "flags": 4, "matrix": [3, 6], "x": 30, "y": 0 },
{ "flags": 4, "matrix": [3, 1], "x": 40, "y": 0 },
{ "flags": 4, "matrix": [3, 3], "x": 50, "y": 0 },
{ "flags": 4, "matrix": [0, 7], "x": 60, "y": 0 },
{ "flags": 4, "matrix": [6, 3], "x": 70, "y": 0 },
{ "flags": 4, "matrix": [7, 1], "x": 80, "y": 0 },
{ "flags": 4, "matrix": [7, 6], "x": 90, "y": 0 },
{ "flags": 4, "matrix": [10, 6], "x": 100, "y": 0 },
{ "flags": 4, "matrix": [10, 7], "x": 110, "y": 0 },
{ "flags": 4, "matrix": [10, 3], "x": 120, "y": 0 },
{ "flags": 4, "matrix": [10, 5], "x": 130, "y": 0 },
{ "flags": 4, "matrix": [9, 7], "x": 140, "y": 0 },
{ "flags": 4, "matrix": [0, 2], "x": 150, "y": 0 },
{ "flags": 4, "matrix": [1, 6], "x": 0, "y": 10 },
{ "flags": 4, "matrix": [1, 7], "x": 10, "y": 10 },
{ "flags": 4, "matrix": [2, 7], "x": 20, "y": 10 },
{ "flags": 4, "matrix": [3, 7], "x": 30, "y": 10 },
{ "flags": 4, "matrix": [4, 7], "x": 40, "y": 10 },
{ "flags": 4, "matrix": [4, 6], "x": 50, "y": 10 },
{ "flags": 4, "matrix": [5, 6], "x": 60, "y": 10 },
{ "flags": 4, "matrix": [5, 7], "x": 70, "y": 10 },
{ "flags": 4, "matrix": [6, 7], "x": 80, "y": 10 },
{ "flags": 4, "matrix": [7, 7], "x": 90, "y": 10 },
{ "flags": 4, "matrix": [8, 7], "x": 100, "y": 10 },
{ "flags": 4, "matrix": [8, 6], "x": 110, "y": 10 },
{ "flags": 4, "matrix": [6, 6], "x": 120, "y": 10 },
{ "flags": 4, "matrix": [10, 1], "x": 130, "y": 10 },
{ "flags": 4, "matrix": [11, 6], "x": 150, "y": 10 },
{ "flags": 4, "matrix": [1, 1], "x": 0, "y": 20 },
{ "flags": 4, "matrix": [1, 0], "x": 15, "y": 20 },
{ "flags": 4, "matrix": [2, 0], "x": 25, "y": 20 },
{ "flags": 4, "matrix": [3, 0], "x": 35, "y": 20 },
{ "flags": 4, "matrix": [4, 0], "x": 45, "y": 20 },
{ "flags": 4, "matrix": [4, 1], "x": 55, "y": 20 },
{ "flags": 4, "matrix": [5, 1], "x": 65, "y": 20 },
{ "flags": 4, "matrix": [5, 0], "x": 75, "y": 20 },
{ "flags": 4, "matrix": [6, 0], "x": 85, "y": 20 },
{ "flags": 4, "matrix": [7, 0], "x": 95, "y": 20 },
{ "flags": 4, "matrix": [8, 0], "x": 105, "y": 20 },
{ "flags": 4, "matrix": [8, 1], "x": 115, "y": 20 },
{ "flags": 4, "matrix": [6, 1], "x": 125, "y": 20 },
{ "flags": 4, "matrix": [10, 2], "x": 135, "y": 20 },
{ "flags": 4, "matrix": [6, 5], "x": 150, "y": 20 },
{ "flags": 4, "matrix": [2, 1], "x": 0, "y": 30 },
{ "flags": 4, "matrix": [1, 2], "x": 17, "y": 30 },
{ "flags": 8, "matrix": [2, 2], "x": 27, "y": 30 },
{ "flags": 4, "matrix": [3, 2], "x": 37, "y": 30 },
{ "flags": 4, "matrix": [4, 2], "x": 47, "y": 30 },
{ "flags": 4, "matrix": [4, 3], "x": 57, "y": 30 },
{ "flags": 4, "matrix": [5, 3], "x": 67, "y": 30 },
{ "flags": 4, "matrix": [5, 2], "x": 77, "y": 30 },
{ "flags": 4, "matrix": [6, 2], "x": 87, "y": 30 },
{ "flags": 4, "matrix": [7, 2], "x": 97, "y": 30 },
{ "flags": 4, "matrix": [8, 2], "x": 107, "y": 30 },
{ "flags": 4, "matrix": [8, 3], "x": 117, "y": 30 },
{ "flags": 4, "matrix": [10, 4], "x": 127, "y": 30 },
{ "flags": 4, "matrix": [1, 5], "x": 150, "y": 30 },
{ "flags": 4, "matrix": [0, 0], "x": 0, "y": 40 },
{ "flags": 4, "matrix": [1, 4], "x": 22, "y": 40 },
{ "flags": 4, "matrix": [2, 4], "x": 32, "y": 40 },
{ "flags": 4, "matrix": [3, 4], "x": 42, "y": 40 },
{ "flags": 4, "matrix": [4, 4], "x": 52, "y": 40 },
{ "flags": 4, "matrix": [4, 5], "x": 62, "y": 40 },
{ "flags": 4, "matrix": [5, 5], "x": 72, "y": 40 },
{ "flags": 4, "matrix": [5, 4], "x": 82, "y": 40 },
{ "flags": 4, "matrix": [6, 4], "x": 92, "y": 40 },
{ "flags": 4, "matrix": [7, 4], "x": 102, "y": 40 },
{ "flags": 4, "matrix": [8, 5], "x": 112, "y": 40 },
{ "flags": 4, "matrix": [9, 1], "x": 122, "y": 40 },
{ "flags": 4, "matrix": [3, 5], "x": 140, "y": 40 },
{ "flags": 4, "matrix": [2, 5], "x": 150, "y": 40 },
{ "flags": 4, "matrix": [0, 6], "x": 0, "y": 50 },
{ "flags": 4, "matrix": [9, 0], "x": 12, "y": 50 },
{ "flags": 4, "matrix": [9, 3], "x": 25, "y": 50 },
{ "flags": 4, "matrix": [9, 4], "x": 37, "y": 50 },
{ "flags": 4, "matrix": [9, 5], "x": 100, "y": 50 },
{ "flags": 4, "matrix": [9, 2], "x": 110, "y": 50 },
{ "flags": 4, "matrix": [0, 4], "x": 120, "y": 50 },
{ "flags": 4, "matrix": [0, 3], "x": 130, "y": 50 },
{ "flags": 4, "matrix": [7, 3], "x": 140, "y": 50 },
{ "flags": 4, "matrix": [0, 5], "x": 150, "y": 50 },
{ "flags": 4, "matrix": [11, 0], "x": 0, "y": 1 },
{ "flags": 4, "matrix": [11, 1], "x": 0, "y": 2 }
]
},
"url": "",
"usb": {
"device_version": "0.0.2",
"pid": "0x0002",
"vid": "0x0191"
},
"layouts": {
"LAYOUT": {
"c_macro": true,
"filename": "keyboards/jukaie/jk01/jk01.h",
"json_layout": true,
"layout": [
{ "label": "ESC", "x": 0, "y": 0 },
{ "label": "F1", "x": 2, "y": 0 },
{ "label": "F2", "x": 3, "y": 0 },
{ "label": "F3", "x": 4, "y": 0 },
{ "label": "F4", "x": 5, "y": 0 },
{ "label": "F5", "x": 6, "y": 0 },
{ "label": "F6", "x": 7, "y": 0 },
{ "label": "F7", "x": 8, "y": 0 },
{ "label": "F8", "x": 9, "y": 0 },
{ "label": "F9", "x": 10, "y": 0 },
{ "label": "F10", "x": 11, "y": 0 },
{ "label": "F11", "x": 12, "y": 0 },
{ "label": "F12", "x": 13, "y": 0 },
{ "label": "Printscreen", "x": 14, "y": 0 },
{ "label": "Del", "x": 15, "y": 0 },
{ "label": "`", "x": 0, "y": 1 },
{ "label": "1", "x": 1, "y": 1 },
{ "label": "2", "x": 2, "y": 1 },
{ "label": "3", "x": 3, "y": 1 },
{ "label": "4", "x": 4, "y": 1 },
{ "label": "5", "x": 5, "y": 1 },
{ "label": "6", "x": 6, "y": 1 },
{ "label": "7", "x": 7, "y": 1 },
{ "label": "8", "x": 8, "y": 1 },
{ "label": "9", "x": 9, "y": 1 },
{ "label": "0", "x": 10, "y": 1 },
{ "label": "-", "x": 11, "y": 1 },
{ "label": "=", "x": 12, "y": 1 },
{ "label": "Backspace", "x": 13, "y": 1, "w": 2},
{ "label": "Home", "x": 15, "y": 1 },
{ "label": "Tab", "x": 0, "y": 2, "w": 1.5},
{ "label": "Q", "x": 1.5, "y": 2 },
{ "label": "W", "x": 2.5, "y": 2 },
{ "label": "E", "x": 3.5, "y": 2 },
{ "label": "R", "x": 4.5, "y": 2 },
{ "label": "T", "x": 5.5, "y": 2 },
{ "label": "Y", "x": 6.5, "y": 2 },
{ "label": "U", "x": 7.5, "y": 2 },
{ "label": "I", "x": 8.5, "y": 2 },
{ "label": "O", "x": 9.5, "y": 2 },
{ "label": "P", "x": 10.5, "y": 2 },
{ "label": "[", "x": 11.5, "y": 2 },
{ "label": "]", "x": 12.5, "y": 2 },
{ "label": "\\", "x": 13.5, "y": 2 , "w": 1.5},
{ "label": "End", "x": 15, "y": 2 },
{ "label": "Caps Lock", "x": 0, "y": 3, "w": 1.75},
{ "label": "A", "x": 1.75, "y": 3 },
{ "label": "S", "x": 2.75, "y": 3 },
{ "label": "D", "x": 3.75, "y": 3 },
{ "label": "F", "x": 4.75, "y": 3 },
{ "label": "G", "x": 5.75, "y": 3 },
{ "label": "H", "x": 6.75, "y": 3 },
{ "label": "J", "x": 7.75, "y": 3 },
{ "label": "K", "x": 8.75, "y": 3 },
{ "label": "L", "x": 9.75, "y": 3 },
{ "label": ";", "x": 10.75, "y": 3 },
{ "label": "'", "x": 11.75, "y": 3 },
{ "label": "Enter", "x": 12.75, "y": 3, "w": 2.25 },
{ "label": "PgUp", "x": 15, "y": 3 },
{ "label": "Shift", "x": 0, "y": 4, "w": 2.25},
{ "label": "Z", "x": 2.25, "y": 4 },
{ "label": "X", "x": 3.25, "y": 4 },
{ "label": "C", "x": 4.25, "y": 4 },
{ "label": "V", "x": 5.25, "y": 4 },
{ "label": "B", "x": 6.25, "y": 4 },
{ "label": "N", "x": 7.25, "y": 4 },
{ "label": "M", "x": 8.25, "y": 4 },
{ "label": ",", "x": 9.25, "y": 4 },
{ "label": ".", "x": 10.25, "y": 4 },
{ "label": "/", "x": 11.25, "y": 4 },
{ "label": "Shift", "x": 12.25, "y": 4, "w": 1.75},
{ "label": "Up", "x": 14, "y": 4 },
{ "label": "PgDn", "x": 15, "y": 4 },
{ "label": "Ctrl", "x": 0, "y": 5, "w": 1.25},
{ "label": "Win", "x": 1.25, "y": 5, "w": 1.25},
{ "label": "Alt", "x": 2.5, "y": 5, "w": 1.25},
{ "label": "Space", "x": 3.75, "y": 5, "w": 6.25},
{ "label": "Alt", "x": 10, "y": 5 },
{ "label": "FN", "x": 11, "y": 5 },
{ "label": "Ctrl", "x": 12, "y": 5 },
{ "label": "Left", "x": 13, "y": 5 },
{ "label": "Down", "x": 14, "y": 5 },
{ "label": "Right", "x": 15, "y": 5 }
{ "label": "ESC", "matrix": [1, 3], "w": 1, "x": 0, "y": 0 },
{ "label": "F1", "matrix": [2, 6], "w": 1, "x": 2, "y": 0 },
{ "label": "F2", "matrix": [3, 6], "w": 1, "x": 3, "y": 0 },
{ "label": "F3", "matrix": [3, 1], "w": 1, "x": 4, "y": 0 },
{ "label": "F4", "matrix": [3, 3], "w": 1, "x": 5, "y": 0 },
{ "label": "F5", "matrix": [0, 7], "w": 1, "x": 6, "y": 0 },
{ "label": "F6", "matrix": [6, 3], "w": 1, "x": 7, "y": 0 },
{ "label": "F7", "matrix": [7, 1], "w": 1, "x": 8, "y": 0 },
{ "label": "F8", "matrix": [7, 6], "w": 1, "x": 9, "y": 0 },
{ "label": "F9", "matrix": [10, 6], "w": 1, "x": 10, "y": 0 },
{ "label": "F10", "matrix": [10, 7], "w": 1, "x": 11, "y": 0 },
{ "label": "F11", "matrix": [10, 3], "w": 1, "x": 12, "y": 0 },
{ "label": "F12", "matrix": [10, 5], "w": 1, "x": 13, "y": 0 },
{ "label": "Printscreen", "matrix": [9, 7], "w": 1, "x": 14, "y": 0 },
{ "label": "Del", "matrix": [0, 2], "w": 1, "x": 15, "y": 0 },
{ "label": "`", "matrix": [1, 6], "w": 1, "x": 0, "y": 1 },
{ "label": "1", "matrix": [1, 7], "w": 1, "x": 1, "y": 1 },
{ "label": "2", "matrix": [2, 7], "w": 1, "x": 2, "y": 1 },
{ "label": "3", "matrix": [3, 7], "w": 1, "x": 3, "y": 1 },
{ "label": "4", "matrix": [4, 7], "w": 1, "x": 4, "y": 1 },
{ "label": "5", "matrix": [4, 6], "w": 1, "x": 5, "y": 1 },
{ "label": "6", "matrix": [5, 6], "w": 1, "x": 6, "y": 1 },
{ "label": "7", "matrix": [5, 7], "w": 1, "x": 7, "y": 1 },
{ "label": "8", "matrix": [6, 7], "w": 1, "x": 8, "y": 1 },
{ "label": "9", "matrix": [7, 7], "w": 1, "x": 9, "y": 1 },
{ "label": "0", "matrix": [8, 7], "w": 1, "x": 10, "y": 1 },
{ "label": "-", "matrix": [8, 6], "w": 1, "x": 11, "y": 1 },
{ "label": "=", "matrix": [6, 6], "w": 1, "x": 12, "y": 1 },
{ "label": "Backspace", "matrix": [10, 1], "w": 2, "x": 13, "y": 1 },
{ "label": "Home", "matrix": [11, 6], "w": 1, "x": 15, "y": 1 },
{ "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 2 },
{ "label": "Q", "matrix": [1, 0], "w": 1, "x": 1.5, "y": 2 },
{ "label": "W", "matrix": [2, 0], "w": 1, "x": 2.5, "y": 2 },
{ "label": "E", "matrix": [3, 0], "w": 1, "x": 3.5, "y": 2 },
{ "label": "R", "matrix": [4, 0], "w": 1, "x": 4.5, "y": 2 },
{ "label": "T", "matrix": [4, 1], "w": 1, "x": 5.5, "y": 2 },
{ "label": "Y", "matrix": [5, 1], "w": 1, "x": 6.5, "y": 2 },
{ "label": "U", "matrix": [5, 0], "w": 1, "x": 7.5, "y": 2 },
{ "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 2 },
{ "label": "O", "matrix": [7, 0], "w": 1, "x": 9.5, "y": 2 },
{ "label": "P", "matrix": [8, 0], "w": 1, "x": 10.5, "y": 2 },
{ "label": "[", "matrix": [8, 1], "w": 1, "x": 11.5, "y": 2 },
{ "label": "]", "matrix": [6, 1], "w": 1, "x": 12.5, "y": 2 },
{ "label": "\\", "matrix": [10, 2], "w": 1.5, "x": 13.5, "y": 2 },
{ "label": "End", "matrix": [6, 5], "w": 1, "x": 15, "y": 2 },
{ "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 3 },
{ "label": "A", "matrix": [1, 2], "w": 1, "x": 1.75, "y": 3 },
{ "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 3 },
{ "label": "D", "matrix": [3, 2], "w": 1, "x": 3.75, "y": 3 },
{ "label": "F", "matrix": [4, 2], "w": 1, "x": 4.75, "y": 3 },
{ "label": "G", "matrix": [4, 3], "w": 1, "x": 5.75, "y": 3 },
{ "label": "H", "matrix": [5, 3], "w": 1, "x": 6.75, "y": 3 },
{ "label": "J", "matrix": [5, 2], "w": 1, "x": 7.75, "y": 3 },
{ "label": "K", "matrix": [6, 2], "w": 1, "x": 8.75, "y": 3 },
{ "label": "L", "matrix": [7, 2], "w": 1, "x": 9.75, "y": 3 },
{ "label": ";", "matrix": [8, 2], "w": 1, "x": 10.75, "y": 3 },
{ "label": "'", "matrix": [8, 3], "w": 1, "x": 11.75, "y": 3 },
{ "label": "Enter", "matrix": [10, 4], "w": 2.25, "x": 12.75, "y": 3 },
{ "label": "PgUp", "matrix": [1, 5], "w": 1, "x": 15, "y": 3 },
{ "label": "Shift", "matrix": [0, 0], "w": 2.25, "x": 0, "y": 4 },
{ "label": "Z", "matrix": [1, 4], "w": 1, "x": 2.25, "y": 4 },
{ "label": "X", "matrix": [2, 4], "w": 1, "x": 3.25, "y": 4 },
{ "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 4 },
{ "label": "V", "matrix": [4, 4], "w": 1, "x": 5.25, "y": 4 },
{ "label": "B", "matrix": [4, 5], "w": 1, "x": 6.25, "y": 4 },
{ "label": "N", "matrix": [5, 5], "w": 1, "x": 7.25, "y": 4 },
{ "label": "M", "matrix": [5, 4], "w": 1, "x": 8.25, "y": 4 },
{ "label": ",", "matrix": [6, 4], "w": 1, "x": 9.25, "y": 4 },
{ "label": ".", "matrix": [7, 4], "w": 1, "x": 10.25, "y": 4 },
{ "label": "/", "matrix": [8, 5], "w": 1, "x": 11.25, "y": 4 },
{ "label": "Shift", "matrix": [9, 1], "w": 1.75, "x": 12.25, "y": 4 },
{ "label": "Up", "matrix": [3, 5], "w": 1, "x": 14, "y": 4 },
{ "label": "PgDn", "matrix": [2, 5], "w": 1, "x": 15, "y": 4 },
{ "label": "Ctrl", "matrix": [0, 6], "w": 1.25, "x": 0, "y": 5 },
{ "label": "Win", "matrix": [9, 0], "w": 1.25, "x": 1.25, "y": 5 },
{ "label": "Alt", "matrix": [9, 3], "w": 1.25, "x": 2.5, "y": 5 },
{ "label": "Space", "matrix": [9, 4], "w": 6.25, "x": 3.75, "y": 5 },
{ "label": "Alt", "matrix": [9, 5], "w": 1, "x": 10, "y": 5 },
{ "label": "FN", "matrix": [9, 2], "w": 1, "x": 11, "y": 5 },
{ "label": "Ctrl", "matrix": [0, 4], "w": 1, "x": 12, "y": 5 },
{ "label": "Left", "matrix": [0, 3], "w": 1, "x": 13, "y": 5 },
{ "label": "Down", "matrix": [7, 3], "w": 1, "x": 14, "y": 5 },
{ "label": "Right", "matrix": [0, 5], "w": 1, "x": 15, "y": 5 }
]
}
}

View File

@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "jk01.h"
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
@ -27,220 +27,99 @@ const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
* | | | | */
//{0, CS1_SW4, CS2_SW4, CS3_SW4}, // 0, k00, Esc
{0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, k13, Esc
{0, CS1_SW2, CS2_SW2, CS3_SW2}, // 1, k26, F1
{0, CS1_SW3, CS2_SW3, CS3_SW3}, // 2, k36, F2
{0, CS1_SW4, CS2_SW4, CS3_SW4}, // 3, k31, F3
{0, CS1_SW5, CS2_SW5, CS3_SW5}, // 4, k33, F4
{0, CS1_SW6, CS2_SW6, CS3_SW6}, // 5, k07, F5
{0, CS1_SW7, CS2_SW7, CS3_SW7}, // 6, k63, F6
{0, CS1_SW8, CS2_SW8, CS3_SW8}, // 7, k71, F7
{0, CS1_SW9, CS2_SW9, CS3_SW9}, // 8, k76, F8
{0, CS1_SW10, CS2_SW10, CS3_SW10}, // 9, ka6, F9
{0, CS1_SW11, CS2_SW11, CS3_SW11}, // 10, ka7, F10
{0, CS1_SW12, CS2_SW12, CS3_SW12}, // 11, ka3, F11
{1, CS1_SW1, CS2_SW1, CS3_SW1}, // 12, ka5, F12
{1, CS4_SW2, CS5_SW2, CS6_SW2}, // 13, k97, Printscreen
{1, CS4_SW5, CS5_SW5, CS6_SW5}, // 14, k02, Del
{0, CS1_SW1, CS2_SW1, CS3_SW1}, // 1, k13, Esc
{0, CS1_SW2, CS2_SW2, CS3_SW2}, // 2, k26, F1
{0, CS1_SW3, CS2_SW3, CS3_SW3}, // 3, k36, F2
{0, CS1_SW4, CS2_SW4, CS3_SW4}, // 4, k31, F3
{0, CS1_SW5, CS2_SW5, CS3_SW5}, // 5, k33, F4
{0, CS1_SW6, CS2_SW6, CS3_SW6}, // 6, k07, F5
{0, CS1_SW7, CS2_SW7, CS3_SW7}, // 7, k63, F6
{0, CS1_SW8, CS2_SW8, CS3_SW8}, // 8, k71, F7
{0, CS1_SW9, CS2_SW9, CS3_SW9}, // 9, k76, F8
{0, CS1_SW10, CS2_SW10, CS3_SW10}, // 10, ka6, F9
{0, CS1_SW11, CS2_SW11, CS3_SW11}, // 11, ka7, F10
{0, CS1_SW12, CS2_SW12, CS3_SW12}, // 12, ka3, F11
{1, CS1_SW1, CS2_SW1, CS3_SW1}, // 13, ka5, F12
{1, CS4_SW2, CS5_SW2, CS6_SW2}, // 14, k97, Printscreen
{1, CS4_SW5, CS5_SW5, CS6_SW5}, // 15, k02, Del
{0, CS4_SW1, CS5_SW1, CS6_SW1}, // 15, k16, `
{0, CS4_SW2, CS5_SW2, CS6_SW2}, // 16, k17, 1
{0, CS4_SW3, CS5_SW3, CS6_SW3}, // 17, k27, 2
{0, CS4_SW4, CS5_SW4, CS6_SW4}, // 18, k37, 3
{0, CS4_SW5, CS5_SW5, CS6_SW5}, // 19, k47, 4
{0, CS4_SW6, CS5_SW6, CS6_SW6}, // 20, k46, 5
{0, CS4_SW7, CS5_SW7, CS6_SW7}, // 21, k56, 6
{0, CS4_SW8, CS5_SW8, CS6_SW8}, // 22, k57, 7
{0, CS4_SW9, CS5_SW9, CS6_SW9}, // 23, k67, 8
{0, CS4_SW10, CS5_SW10, CS6_SW10}, // 24, k77, 9
{0, CS4_SW11, CS5_SW11, CS6_SW11}, // 25, k87, 0
{0, CS4_SW12, CS5_SW12, CS6_SW12}, // 26, k86, -
{1, CS1_SW5, CS2_SW5, CS3_SW5}, // 27, k66, =
{1, CS1_SW7, CS2_SW7, CS3_SW7}, // 28, ka1, Backspace
{1, CS1_SW2, CS2_SW2, CS3_SW2}, // 29, kc6, Home
{0, CS4_SW1, CS5_SW1, CS6_SW1}, // 16, k16, `
{0, CS4_SW2, CS5_SW2, CS6_SW2}, // 17, k17, 1
{0, CS4_SW3, CS5_SW3, CS6_SW3}, // 18, k27, 2
{0, CS4_SW4, CS5_SW4, CS6_SW4}, // 19, k37, 3
{0, CS4_SW5, CS5_SW5, CS6_SW5}, // 20, k47, 4
{0, CS4_SW6, CS5_SW6, CS6_SW6}, // 21, k46, 5
{0, CS4_SW7, CS5_SW7, CS6_SW7}, // 22, k56, 6
{0, CS4_SW8, CS5_SW8, CS6_SW8}, // 23, k57, 7
{0, CS4_SW9, CS5_SW9, CS6_SW9}, // 24, k67, 8
{0, CS4_SW10, CS5_SW10, CS6_SW10}, // 25, k77, 9
{0, CS4_SW11, CS5_SW11, CS6_SW11}, // 26, k87, 0
{0, CS4_SW12, CS5_SW12, CS6_SW12}, // 27, k86, -
{1, CS1_SW5, CS2_SW5, CS3_SW5}, // 28, k66, =
{1, CS1_SW7, CS2_SW7, CS3_SW7}, // 29, ka1, Backspace
{1, CS1_SW2, CS2_SW2, CS3_SW2}, // 30, kc6, Home
{0, CS7_SW1, CS8_SW1, CS9_SW1}, // 30, k11, Tab
{0, CS7_SW2, CS8_SW2, CS9_SW2}, // 31, k10, Q
{0, CS7_SW3, CS8_SW3, CS9_SW3}, // 32, k20, W
{0, CS7_SW4, CS8_SW4, CS9_SW4}, // 33, k30, E
{0, CS7_SW5, CS8_SW5, CS9_SW5}, // 34, k40, R
{0, CS7_SW6, CS8_SW6, CS9_SW6}, // 35, k41, T
{0, CS7_SW7, CS8_SW7, CS9_SW7}, // 36, k51, Y
{0, CS7_SW8, CS8_SW8, CS9_SW8}, // 37, k50, U
{0, CS7_SW9, CS8_SW9, CS9_SW9}, // 38, k60, I
{0, CS7_SW10, CS8_SW10, CS9_SW10}, // 39, k70, O
{0, CS7_SW11, CS8_SW11, CS9_SW11}, // 40, k80, P
{0, CS7_SW12, CS8_SW12, CS9_SW12}, // 41, k81, [
{1, CS1_SW8, CS2_SW8, CS3_SW8}, // 42, k61, ]
{1, CS1_SW9, CS2_SW9, CS3_SW9}, // 43, ka2, "\\"
{1, CS4_SW3, CS5_SW3, CS6_SW3}, // 44, k65, End
{0, CS7_SW1, CS8_SW1, CS9_SW1}, // 31, k11, Tab
{0, CS7_SW2, CS8_SW2, CS9_SW2}, // 32, k10, Q
{0, CS7_SW3, CS8_SW3, CS9_SW3}, // 33, k20, W
{0, CS7_SW4, CS8_SW4, CS9_SW4}, // 34, k30, E
{0, CS7_SW5, CS8_SW5, CS9_SW5}, // 35, k40, R
{0, CS7_SW6, CS8_SW6, CS9_SW6}, // 36, k41, T
{0, CS7_SW7, CS8_SW7, CS9_SW7}, // 37, k51, Y
{0, CS7_SW8, CS8_SW8, CS9_SW8}, // 38, k50, U
{0, CS7_SW9, CS8_SW9, CS9_SW9}, // 39, k60, I
{0, CS7_SW10, CS8_SW10, CS9_SW10}, // 40, k70, O
{0, CS7_SW11, CS8_SW11, CS9_SW11}, // 41, k80, P
{0, CS7_SW12, CS8_SW12, CS9_SW12}, // 42, k81, [
{1, CS1_SW8, CS2_SW8, CS3_SW8}, // 43, k61, ]
{1, CS1_SW9, CS2_SW9, CS3_SW9}, // 44, ka2, "\\"
{1, CS4_SW3, CS5_SW3, CS6_SW3}, // 45, k65, End
{0, CS10_SW1, CS11_SW1, CS12_SW1}, // 45, k21, Caps Lock
{0, CS10_SW2, CS11_SW2, CS12_SW2}, // 46, k12, A
{0, CS10_SW3, CS11_SW3, CS12_SW3}, // 47, k22, S
{0, CS10_SW4, CS11_SW4, CS12_SW4}, // 48, k32, D
{0, CS10_SW5, CS11_SW5, CS12_SW5}, // 49, k42, F
{0, CS10_SW6, CS11_SW6, CS12_SW6}, // 50, k43, G
{0, CS10_SW7, CS11_SW7, CS12_SW7}, // 51, k53, H
{0, CS10_SW8, CS11_SW8, CS12_SW8}, // 52, k52, J
{0, CS10_SW9, CS11_SW9, CS12_SW9}, // 53, k62, K
{0, CS10_SW10, CS11_SW10, CS12_SW10}, // 54, k72, L
{0, CS10_SW11, CS11_SW11, CS12_SW11}, // 55, k82, ;
{0, CS10_SW12, CS11_SW12, CS12_SW12}, // 56, k83, '
{1, CS1_SW11, CS2_SW11, CS3_SW11}, // 57, ka4, Enter
{1, CS4_SW4, CS5_SW4, CS6_SW4}, // 58, k15, PgUp
{0, CS10_SW1, CS11_SW1, CS12_SW1}, // 46, k21, Caps Lock
{0, CS10_SW2, CS11_SW2, CS12_SW2}, // 47, k12, A
{0, CS10_SW3, CS11_SW3, CS12_SW3}, // 48, k22, S
{0, CS10_SW4, CS11_SW4, CS12_SW4}, // 49, k32, D
{0, CS10_SW5, CS11_SW5, CS12_SW5}, // 50, k42, F
{0, CS10_SW6, CS11_SW6, CS12_SW6}, // 51, k43, G
{0, CS10_SW7, CS11_SW7, CS12_SW7}, // 52, k53, H
{0, CS10_SW8, CS11_SW8, CS12_SW8}, // 53, k52, J
{0, CS10_SW9, CS11_SW9, CS12_SW9}, // 54, k62, K
{0, CS10_SW10, CS11_SW10, CS12_SW10}, // 55, k72, L
{0, CS10_SW11, CS11_SW11, CS12_SW11}, // 56, k82, ;
{0, CS10_SW12, CS11_SW12, CS12_SW12}, // 57, k83, '
{1, CS1_SW11, CS2_SW11, CS3_SW11}, // 58, ka4, Enter
{1, CS4_SW4, CS5_SW4, CS6_SW4}, // 59, k15, PgUp
{0, CS13_SW1, CS14_SW1, CS15_SW1}, // 59, k00, Shift_L
{0, CS13_SW2, CS14_SW2, CS15_SW2}, // 60, k14, Z
{0, CS13_SW3, CS14_SW3, CS15_SW3}, // 61, k24, X
{0, CS13_SW4, CS14_SW4, CS15_SW4}, // 62, k34, C
{0, CS13_SW5, CS14_SW5, CS15_SW5}, // 63, k44, V
{0, CS13_SW6, CS14_SW6, CS15_SW6}, // 64, k45, B
{0, CS13_SW7, CS14_SW7, CS15_SW7}, // 65, k55, N
{0, CS13_SW8, CS14_SW8, CS15_SW8}, // 66, k54, M
{0, CS13_SW9, CS14_SW9, CS15_SW9}, // 67, k64, ,
{0, CS13_SW10, CS14_SW10, CS15_SW10}, // 68, k74, .
{0, CS13_SW11, CS14_SW11, CS15_SW11}, // 69, k85, /
{1, CS4_SW8, CS5_SW8, CS6_SW8}, // 70, k91, Shift_R
{1, CS4_SW9, CS5_SW9, CS6_SW9}, // 71, k35, Up
{1, CS4_SW7, CS5_SW7, CS6_SW7}, // 72, k25, PgDn
{0, CS13_SW1, CS14_SW1, CS15_SW1}, // 60, k00, Shift_L
{0, CS13_SW2, CS14_SW2, CS15_SW2}, // 61, k14, Z
{0, CS13_SW3, CS14_SW3, CS15_SW3}, // 62, k24, X
{0, CS13_SW4, CS14_SW4, CS15_SW4}, // 63, k34, C
{0, CS13_SW5, CS14_SW5, CS15_SW5}, // 64, k44, V
{0, CS13_SW6, CS14_SW6, CS15_SW6}, // 65, k45, B
{0, CS13_SW7, CS14_SW7, CS15_SW7}, // 66, k55, N
{0, CS13_SW8, CS14_SW8, CS15_SW8}, // 67, k54, M
{0, CS13_SW9, CS14_SW9, CS15_SW9}, // 68, k64, ,
{0, CS13_SW10, CS14_SW10, CS15_SW10}, // 69, k74, .
{0, CS13_SW11, CS14_SW11, CS15_SW11}, // 70, k85, /
{1, CS4_SW8, CS5_SW8, CS6_SW8}, // 71, k91, Shift_R
{1, CS4_SW9, CS5_SW9, CS6_SW9}, // 72, k35, Up
{1, CS4_SW7, CS5_SW7, CS6_SW7}, // 73, k25, PgDn
{0, CS16_SW1, CS17_SW1, CS18_SW1}, // 73, k06, Ctrl_L
{0, CS16_SW2, CS17_SW2, CS18_SW2}, // 74, k90, Win_L
{0, CS16_SW3, CS17_SW3, CS18_SW3}, // 75, k93, Alt_L
{0, CS16_SW6, CS17_SW6, CS18_SW6}, // 76, k94, Space
{0, CS16_SW9, CS17_SW9, CS18_SW9}, // 77, k95, Alt_R
{0, CS16_SW10, CS17_SW10, CS18_SW10}, // 78, k92, FN
{0, CS16_SW12, CS17_SW12, CS18_SW12}, // 79, k04, Ctrl_R
{1, CS4_SW10, CS5_SW10, CS6_SW10}, // 80, k03, Left
{1, CS4_SW11, CS5_SW11, CS6_SW11}, // 81, k73, Down
{1, CS10_SW5, CS11_SW5, CS12_SW5}, // 82, k05, Right
{0, CS16_SW1, CS17_SW1, CS18_SW1}, // 74, k06, Ctrl_L
{0, CS16_SW2, CS17_SW2, CS18_SW2}, // 75, k90, Win_L
{0, CS16_SW3, CS17_SW3, CS18_SW3}, // 76, k93, Alt_L
{0, CS16_SW6, CS17_SW6, CS18_SW6}, // 77, k94, Space
{0, CS16_SW9, CS17_SW9, CS18_SW9}, // 78, k95, Alt_R
{0, CS16_SW10, CS17_SW10, CS18_SW10}, // 79, k92, FN
{0, CS16_SW12, CS17_SW12, CS18_SW12}, // 80, k04, Ctrl_R
{1, CS4_SW10, CS5_SW10, CS6_SW10}, // 81, k03, Left
{1, CS4_SW11, CS5_SW11, CS6_SW11}, // 82, k73, Down
{1, CS10_SW5, CS11_SW5, CS12_SW5}, // 83, k05, Right
{1, CS10_SW10, CS11_SW10, CS12_SW10}, // 83, kb0, Z1
{1, CS10_SW11, CS11_SW11, CS12_SW11}, // 84, kb1, Z2
{1, CS10_SW10, CS11_SW10, CS12_SW10}, // 84, kb0, Z1
{1, CS10_SW11, CS11_SW11, CS12_SW11}, // 85, kb1, Z2
};
#define __ NO_LED
//#define RGB_LAYOUT LAYOUT
led_config_t g_led_config = {
{
{ 59, __, 14, 80, 79, 82, 73, 5},
{ 31, 30, 46, 0, 60, 58, 15, 16},
{ 32, 45, 47, __, 61, 72, 1 , 17},
{ 33, 3, 48, 4, 62, 71, 2, 18},
{ 34, 35, 49, 50, 63, 64, 20, 19},
{ 37, 36, 52, 51, 66, 65, 21, 22},
{ 38, 42, 53, 6, 67, 44, 27, 23},
{ 39, 7, 54, 81, 68, __, 8, 24},
{ 40, 41, 55, 56, __, 69, 26, 25},
{ 74, 70, 78, 75, 76, 77, __, 13},
{ __, 28, 43, 11, 57, 12, 9, 10},
{ 83, 84, __, __, __, __, 29, __}
},
{
{ 0, 0}, // 0, k13, Esc
{ 20, 0}, // 1, k26, F1
{ 30, 0}, // 2, k36, F2
{ 40, 0}, // 3, k31, F3
{ 50, 0}, // 4, k33, F4
{ 60, 0}, // 5, k07, F5
{ 70, 0}, // 6, k63, F6
{ 80, 0}, // 7, k71, F7
{ 90, 0}, // 8, k76, F8
{ 100,0}, // 9, ka6, F9
{ 110,0}, // 10, ka7, F10
{ 120,0}, // 11, ka3, F11
{ 130,0}, // 12, ka5, F12
{ 140,0}, // 13, k97, Printscreen
{ 150,0}, // 14, k02, Del
{ 0, 10}, // 15, k16, `
{ 10, 10}, // 16, k17, 1
{ 20, 10}, // 17, k27, 2
{ 30, 10}, // 18, k37, 3
{ 40, 10}, // 19, k47, 4
{ 50, 10}, // 20, k46, 5
{ 60, 10}, // 21, k56, 6
{ 70, 10}, // 22, k57, 7
{ 80, 10}, // 23, k67, 8
{ 90, 10}, // 24, k77, 9
{ 100,10}, // 25, k87, 0
{ 110,10}, // 26, k86, -
{ 120,10}, // 27, k66, =
{ 130,10}, // 28, ka1, Backspace
{ 150,10}, // 29, kc6, Home
{ 0, 20}, // 30, k11, Tab
{ 15, 20}, // 31, k10, Q
{ 25, 20}, // 32, k20, W
{ 35, 20}, // 33, k30, E
{ 45, 20}, // 34, k40, R
{ 55, 20}, // 35, k41, T
{ 65, 20}, // 36, k51, Y
{ 75, 20}, // 37, k50, U
{ 85, 20}, // 38, k60, I
{ 95, 20}, // 39, k70, O
{ 105,20}, // 40, k80, P
{ 115,20}, // 41, k81, [
{ 125,20}, // 42, k61, ]
{ 135,20}, // 43, ka2, "\\"
{ 150,20}, // 44, k65, End
{ 0, 30}, // 45, k21, Caps Lock
{ 17, 30}, // 46, k12, A
{ 27, 30}, // 47, k22, S
{ 37, 30}, // 48, k32, D
{ 47, 30}, // 49, k42, F
{ 57, 30}, // 50, k43, G
{ 67, 30}, // 51, k53, H
{ 77, 30}, // 52, k52, J
{ 87, 30}, // 53, k62, K
{ 97, 30}, // 54, k72, L
{ 107,30}, // 55, k82, ;
{ 117,30}, // 56, k83, '
{ 127,30}, // 57, ka4, Enter
{ 150,30}, // 58, k15, PgUp
{ 0, 40}, // 59, k00, Shift_L
{ 22, 40}, // 60, k14, Z
{ 32, 40}, // 61, k24, X
{ 42, 40}, // 62, k34, C
{ 52, 40}, // 63, k44, V
{ 62, 40}, // 64, k45, B
{ 72, 40}, // 65, k55, N
{ 82, 40}, // 66, k54, M
{ 92, 40}, // 67, k64, ,
{ 102, 40}, // 68, k74, .
{ 112,40}, // 69, k85, /
{ 122,40}, // 70, k91, Shift_R
{ 140,40}, // 70, k35, Up
{ 150,40}, // 72, k25, PgDn
{ 0, 50}, // 73, k06, Ctrl_L
{ 12, 50}, // 74, k90, Win_L
{ 25, 50}, // 75, k93, Alt_L
{ 37, 50}, // 76, k94, Space
{ 100, 50}, // 77, k95, Alt_R
{ 110, 50}, // 78, k92, FN
{ 120, 50}, // 79, k04, Ctrl_R
{ 130, 50}, // 80, k03, Left
{ 140, 50}, // 81, k73, Down
{ 150, 50}, // 82, k05, Right
{ 0, 1}, // 83, kb0, Z1
{ 0, 2}, // 84, kb1, Z2
},
{
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,
8, 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
#ifdef EEPROM_ENABLE
@ -282,4 +161,3 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
return true;
}
#endif

View File

@ -16,7 +16,6 @@
#include QMK_KEYBOARD_H
// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
enum custom_layers {
@ -61,4 +60,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, TO(Mac), KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, RGB_VAI, KC_PGDN,
KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(Winfn),KC_RCTL, RGB_SPD, RGB_VAD, RGB_SPI),
};
};

View File

@ -16,11 +16,10 @@
#include QMK_KEYBOARD_H
// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
enum my_keycodes {
KC_MC = SAFE_RANGE,
KC_MC = QK_USER,
KC_SIRI,
KC_DND,
KC_SPOT,

View File

@ -1,17 +1,6 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite.
MOUSEKEY_ENABLE = yes # Mouse keys.
EXTRAKEY_ENABLE = yes # Audio control and System control.
CONSOLE_ENABLE = no # Console for debug.
COMMAND_ENABLE = no # Commands for debug and configuration.
NKRO_ENABLE = yes # Enable NKRO Rollover.
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality.
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow.
AUDIO_ENABLE = no # Audio output.
ENCODER_ENABLE = yes
RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
RGB_MATRIX_DRIVER = AW20216 # Enable RGB matrix effects.
EEPROM_DRIVER = wear_leveling
WEAR_LEVELING_DRIVER = spi_flash
WEAR_LEVELING_DRIVER = spi_flash