diff options
Diffstat (limited to 'keyboards/gmmk/gmmk2')
18 files changed, 522 insertions, 721 deletions
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c index 774006d529..d1f01fc8cb 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c +++ b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c @@ -18,105 +18,105 @@ #ifdef RGB_MATRIX_ENABLE -const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = { +const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { /* Refer to AW20216S manual for these locations * driver * | R location * | | G location * | | | B location * | | | | */ - {0, CS1_SW1, CS2_SW1, CS3_SW1 }, // 0 Esc - {0, CS4_SW2, CS5_SW2, CS6_SW2 }, // 1 1 - {0, CS4_SW3, CS5_SW3, CS6_SW3 }, // 2 2 - {0, CS4_SW4, CS5_SW4, CS6_SW4 }, // 3 3 - {0, CS4_SW5, CS5_SW5, CS6_SW5 }, // 4 4 - {0, CS4_SW6, CS5_SW6, CS6_SW6 }, // 5 5 - {0, CS4_SW7, CS5_SW7, CS6_SW7 }, // 6 6 - {0, CS4_SW8, CS5_SW8, CS6_SW8 }, // 7 7 - {0, CS4_SW9, CS5_SW9, CS6_SW9 }, // 8 8 - {0, CS4_SW10, CS5_SW10, CS6_SW10 }, // 9 9 - {0, CS4_SW11, CS5_SW11, CS6_SW11 }, // 10 0 - {0, CS4_SW12, CS5_SW12, CS6_SW12 }, // 11 - - {1, CS1_SW5, CS2_SW5, CS3_SW5 }, // 12 = - {1, CS1_SW7, CS2_SW7, CS3_SW7 }, // 13 Backspace - {1, CS4_SW4, CS5_SW4, CS6_SW4 }, // 14 Del + {0, SW1_CS1, SW1_CS2, SW1_CS3 }, // 0 Esc + {0, SW2_CS4, SW2_CS5, SW2_CS6 }, // 1 1 + {0, SW3_CS4, SW3_CS5, SW3_CS6 }, // 2 2 + {0, SW4_CS4, SW4_CS5, SW4_CS6 }, // 3 3 + {0, SW5_CS4, SW5_CS5, SW5_CS6 }, // 4 4 + {0, SW6_CS4, SW6_CS5, SW6_CS6 }, // 5 5 + {0, SW7_CS4, SW7_CS5, SW7_CS6 }, // 6 6 + {0, SW8_CS4, SW8_CS5, SW8_CS6 }, // 7 7 + {0, SW9_CS4, SW9_CS5, SW9_CS6 }, // 8 8 + {0, SW10_CS4, SW10_CS5, SW10_CS6 }, // 9 9 + {0, SW11_CS4, SW11_CS5, SW11_CS6 }, // 10 0 + {0, SW12_CS4, SW12_CS5, SW12_CS6 }, // 11 - + {1, SW5_CS1, SW5_CS2, SW5_CS3 }, // 12 = + {1, SW7_CS1, SW7_CS2, SW7_CS3 }, // 13 Backspace + {1, SW4_CS4, SW4_CS5, SW4_CS6 }, // 14 Del - {0, CS7_SW1, CS8_SW1, CS9_SW1 }, // 15 Tab - {0, CS7_SW2, CS8_SW2, CS9_SW2 }, // 16 Q - {0, CS7_SW3, CS8_SW3, CS9_SW3 }, // 17 W - {0, CS7_SW4, CS8_SW4, CS9_SW4 }, // 18 E - {0, CS7_SW5, CS8_SW5, CS9_SW5 }, // 19 R - {0, CS7_SW6, CS8_SW6, CS9_SW6 }, // 20 T - {0, CS7_SW7, CS8_SW7, CS9_SW7 }, // 21 Y - {0, CS7_SW8, CS8_SW8, CS9_SW8 }, // 22 U - {0, CS7_SW9, CS8_SW9, CS9_SW9 }, // 23 I - {0, CS7_SW10, CS8_SW10, CS9_SW10 }, // 24 O - {0, CS7_SW11, CS8_SW11, CS9_SW11 }, // 25 P - {0, CS7_SW12, CS8_SW12, CS9_SW12 }, // 26 [ - {1, CS1_SW8, CS2_SW8, CS3_SW8 }, // 27 ] - {1, CS1_SW9, CS2_SW9, CS3_SW9 }, // 28 \| - {1, CS4_SW7, CS5_SW7, CS6_SW7 }, // 29 PgUp + {0, SW1_CS7, SW1_CS8, SW1_CS9 }, // 15 Tab + {0, SW2_CS7, SW2_CS8, SW2_CS9 }, // 16 Q + {0, SW3_CS7, SW3_CS8, SW3_CS9 }, // 17 W + {0, SW4_CS7, SW4_CS8, SW4_CS9 }, // 18 E + {0, SW5_CS7, SW5_CS8, SW5_CS9 }, // 19 R + {0, SW6_CS7, SW6_CS8, SW6_CS9 }, // 20 T + {0, SW7_CS7, SW7_CS8, SW7_CS9 }, // 21 Y + {0, SW8_CS7, SW8_CS8, SW8_CS9 }, // 22 U + {0, SW9_CS7, SW9_CS8, SW9_CS9 }, // 23 I + {0, SW10_CS7, SW10_CS8, SW10_CS9 }, // 24 O + {0, SW11_CS7, SW11_CS8, SW11_CS9 }, // 25 P + {0, SW12_CS7, SW12_CS8, SW12_CS9 }, // 26 [ + {1, SW8_CS1, SW8_CS2, SW8_CS3 }, // 27 ] + {1, SW9_CS1, SW9_CS2, SW9_CS3 }, // 28 \| + {1, SW7_CS4, SW7_CS5, SW7_CS6 }, // 29 PgUp - {0, CS10_SW1, CS11_SW1, CS12_SW1 }, // 30 Caps Lock - {0, CS10_SW2, CS11_SW2, CS12_SW2 }, // 31 A - {0, CS10_SW3, CS11_SW3, CS12_SW3 }, // 32 S - {0, CS10_SW4, CS11_SW4, CS12_SW4 }, // 33 D - {0, CS10_SW5, CS11_SW5, CS12_SW5 }, // 34 F - {0, CS10_SW6, CS11_SW6, CS12_SW6 }, // 35 G - {0, CS10_SW7, CS11_SW7, CS12_SW7 }, // 36 H - {0, CS10_SW8, CS11_SW8, CS12_SW8 }, // 37 J - {0, CS10_SW9, CS11_SW9, CS12_SW9 }, // 38 K - {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 39 L - {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 40 ; - {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 41 ' - {1, CS1_SW11, CS2_SW11, CS3_SW11 }, // 42 Enter - {1, CS4_SW5, CS5_SW5, CS6_SW5 }, // 43 PgDn + {0, SW1_CS10, SW1_CS11, SW1_CS12 }, // 30 Caps Lock + {0, SW2_CS10, SW2_CS11, SW2_CS12 }, // 31 A + {0, SW3_CS10, SW3_CS11, SW3_CS12 }, // 32 S + {0, SW4_CS10, SW4_CS11, SW4_CS12 }, // 33 D + {0, SW5_CS10, SW5_CS11, SW5_CS12 }, // 34 F + {0, SW6_CS10, SW6_CS11, SW6_CS12 }, // 35 G + {0, SW7_CS10, SW7_CS11, SW7_CS12 }, // 36 H + {0, SW8_CS10, SW8_CS11, SW8_CS12 }, // 37 J + {0, SW9_CS10, SW9_CS11, SW9_CS12 }, // 38 K + {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 39 L + {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 40 ; + {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 41 ' + {1, SW11_CS1, SW11_CS2, SW11_CS3 }, // 42 Enter + {1, SW5_CS4, SW5_CS5, SW5_CS6 }, // 43 PgDn - {0, CS13_SW1, CS14_SW1, CS15_SW1 }, // 44 Shift_L - {0, CS13_SW3, CS14_SW3, CS15_SW3 }, // 45 Z - {0, CS13_SW4, CS14_SW4, CS15_SW4 }, // 46 X - {0, CS13_SW5, CS14_SW5, CS15_SW5 }, // 47 C - {0, CS13_SW6, CS14_SW6, CS15_SW6 }, // 48 V - {0, CS13_SW7, CS14_SW7, CS15_SW7 }, // 49 B - {0, CS13_SW8, CS14_SW8, CS15_SW8 }, // 50 N - {0, CS13_SW9, CS14_SW9, CS15_SW9 }, // 51 M - {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 52 , - {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 53 . - {0, CS13_SW12, CS14_SW12, CS15_SW12}, // 54 / - {1, CS4_SW8, CS5_SW8, CS6_SW8 }, // 55 Shift_R - {1, CS4_SW9, CS5_SW9, CS6_SW9 }, // 56 Up - {1, CS4_SW6, CS5_SW6, CS6_SW6 }, // 57 END + {0, SW1_CS13, SW1_CS14, SW1_CS15 }, // 44 Shift_L + {0, SW3_CS13, SW3_CS14, SW3_CS15 }, // 45 Z + {0, SW4_CS13, SW4_CS14, SW4_CS15 }, // 46 X + {0, SW5_CS13, SW5_CS14, SW5_CS15 }, // 47 C + {0, SW6_CS13, SW6_CS14, SW6_CS15 }, // 48 V + {0, SW7_CS13, SW7_CS14, SW7_CS15 }, // 49 B + {0, SW8_CS13, SW8_CS14, SW8_CS15 }, // 50 N + {0, SW9_CS13, SW9_CS14, SW9_CS15 }, // 51 M + {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 52 , + {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 53 . + {0, SW12_CS13, SW12_CS14, SW12_CS15}, // 54 / + {1, SW8_CS4, SW8_CS5, SW8_CS6 }, // 55 Shift_R + {1, SW9_CS4, SW9_CS5, SW9_CS6 }, // 56 Up + {1, SW6_CS4, SW6_CS5, SW6_CS6 }, // 57 END - {0, CS16_SW1, CS17_SW1, CS18_SW1 }, // 58 Ctrl_L - {0, CS16_SW2, CS17_SW2, CS18_SW2 }, // 59 Win_L - {0, CS16_SW3, CS17_SW3, CS18_SW3 }, // 60 Alt_L - {0, CS16_SW6, CS17_SW6, CS18_SW6 }, // 61 Space - {0, CS16_SW9, CS17_SW9, CS18_SW9 }, // 62 Alt_R - {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 63 FN - {1, CS4_SW10, CS5_SW10, CS6_SW10 }, // 64 Left - {1, CS4_SW11, CS5_SW11, CS6_SW11 }, // 65 Down - {1, CS4_SW12, CS5_SW12, CS6_SW12 }, // 66 Right + {0, SW1_CS16, SW1_CS17, SW1_CS18 }, // 58 Ctrl_L + {0, SW2_CS16, SW2_CS17, SW2_CS18 }, // 59 Win_L + {0, SW3_CS16, SW3_CS17, SW3_CS18 }, // 60 Alt_L + {0, SW6_CS16, SW6_CS17, SW6_CS18 }, // 61 Space + {0, SW9_CS16, SW9_CS17, SW9_CS18 }, // 62 Alt_R + {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 63 FN + {1, SW10_CS4, SW10_CS5, SW10_CS6 }, // 64 Left + {1, SW11_CS4, SW11_CS5, SW11_CS6 }, // 65 Down + {1, SW12_CS4, SW12_CS5, SW12_CS6 }, // 66 Right - {1, CS13_SW1, CS14_SW1, CS15_SW1 }, // 69 LED 1 - {1, CS13_SW2, CS14_SW2, CS15_SW2 }, // 70 LED 2 - {1, CS13_SW3, CS14_SW3, CS15_SW3 }, // 71 LED 3 - {1, CS13_SW4, CS14_SW4, CS15_SW4 }, // 72 LED 4 - {1, CS13_SW5, CS14_SW5, CS15_SW5 }, // 73 LED 5 - {1, CS13_SW6, CS14_SW6, CS15_SW6 }, // 74 LED 6 - {1, CS13_SW7, CS14_SW7, CS15_SW7 }, // 75 LED 7 - {1, CS13_SW8, CS14_SW8, CS15_SW8 }, // 76 LED 8 - {1, CS13_SW9, CS14_SW9, CS15_SW9 }, // 77 LED 9 - {1, CS13_SW10, CS14_SW10, CS15_SW10}, // 78 LED 10 - {1, CS16_SW1, CS17_SW1, CS18_SW1 }, // 79 LED 11 - {1, CS16_SW2, CS17_SW2, CS18_SW2 }, // 80 LED 12 - {1, CS16_SW3, CS17_SW3, CS18_SW3 }, // 81 LED 13 - {1, CS16_SW4, CS17_SW4, CS18_SW4 }, // 82 LED 14 - {1, CS16_SW5, CS17_SW5, CS18_SW5 }, // 83 LED 15 - {1, CS16_SW6, CS17_SW6, CS18_SW6 }, // 84 LED 16 - {1, CS16_SW7, CS17_SW7, CS18_SW7 }, // 85 LED 17 - {1, CS16_SW8, CS17_SW8, CS18_SW8 }, // 86 LED 18 - {1, CS16_SW9, CS17_SW9, CS18_SW9 }, // 87 LED 19 - {1, CS16_SW10, CS17_SW10, CS18_SW10} // 88 LED 20 + {1, SW1_CS13, SW1_CS14, SW1_CS15 }, // 69 LED 1 + {1, SW2_CS13, SW2_CS14, SW2_CS15 }, // 70 LED 2 + {1, SW3_CS13, SW3_CS14, SW3_CS15 }, // 71 LED 3 + {1, SW4_CS13, SW4_CS14, SW4_CS15 }, // 72 LED 4 + {1, SW5_CS13, SW5_CS14, SW5_CS15 }, // 73 LED 5 + {1, SW6_CS13, SW6_CS14, SW6_CS15 }, // 74 LED 6 + {1, SW7_CS13, SW7_CS14, SW7_CS15 }, // 75 LED 7 + {1, SW8_CS13, SW8_CS14, SW8_CS15 }, // 76 LED 8 + {1, SW9_CS13, SW9_CS14, SW9_CS15 }, // 77 LED 9 + {1, SW10_CS13, SW10_CS14, SW10_CS15}, // 78 LED 10 + {1, SW1_CS16, SW1_CS17, SW1_CS18 }, // 79 LED 11 + {1, SW2_CS16, SW2_CS17, SW2_CS18 }, // 80 LED 12 + {1, SW3_CS16, SW3_CS17, SW3_CS18 }, // 81 LED 13 + {1, SW4_CS16, SW4_CS17, SW4_CS18 }, // 82 LED 14 + {1, SW5_CS16, SW5_CS17, SW5_CS18 }, // 83 LED 15 + {1, SW6_CS16, SW6_CS17, SW6_CS18 }, // 84 LED 16 + {1, SW7_CS16, SW7_CS17, SW7_CS18 }, // 85 LED 17 + {1, SW8_CS16, SW8_CS17, SW8_CS18 }, // 86 LED 18 + {1, SW9_CS16, SW9_CS17, SW9_CS18 }, // 87 LED 19 + {1, SW10_CS16, SW10_CS17, SW10_CS18} // 88 LED 20 }; #define __ NO_LED diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json index cd9296b81a..2d2230a3b9 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p65/ansi/info.json @@ -11,9 +11,6 @@ "qmk": { "tap_keycode_delay": 10 }, - "rgb_matrix": { - "driver": "aw20216s" - }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"] diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c deleted file mode 100644 index 8ca676273b..0000000000 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/keymap.c +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright 2022 Eugenio Pastoral - * - * 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 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 { - _BL, - _FL, -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Keymap _BL: Base Layer (Default Layer) - */ -[_BL] = LAYOUT( - QK_GESC, 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_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_END, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), - - /* Keymap _FL: Function Layer - */ -[_FL] = LAYOUT( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_HUI, RGB_HUD, RGB_SPD, RGB_SPI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_VAI, _______, - EE_CLR, _______, _______, QK_BOOT, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD) -}; - -// Turns side LEDs to white for caps lock and layer indicators. -bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { - if (host_keyboard_led_state().caps_lock || get_highest_layer(layer_state | default_layer_state)) { - for (uint8_t i = led_min; i < led_max; i++) { - if (HAS_FLAGS(g_led_config.flags[i], 0x02)) { // 0x02 == LED_FLAG_UNDERGLOW - rgb_matrix_set_color(i, 0xff, 0xff, 0xff); - } - } - } - return false; -}; diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/readme.md b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/readme.md deleted file mode 100644 index 4f80a5b956..0000000000 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/readme.md +++ /dev/null @@ -1 +0,0 @@ -# ANSI GMMKV2 65% Layout diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc deleted file mode 100644 index 2966fe2586..0000000000 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rgb_matrix_user.inc +++ /dev/null @@ -1,72 +0,0 @@ - /* Copyright 2022 Eugenio Pastoral - * - * 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/>. - */ - -RGB_MATRIX_EFFECT(SOLID_UNDERGLOW) -RGB_MATRIX_EFFECT(HOLOGRAPHICS_UNDERGLOW) - -#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS - -// This is a side lights only configuration where the solid color is following the current HSV setting. -static bool SOLID_UNDERGLOW(effect_params_t* params) { - RGB_MATRIX_USE_LIMITS(led_min, led_max); - - RGB rgb = rgb_matrix_hsv_to_rgb(rgb_matrix_config.hsv); - for (uint8_t i = led_min; i < led_max; i++) { - if (HAS_FLAGS(g_led_config.flags[i], 0x02)) { // 0x02 == LED_FLAG_UNDERGLOW - rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b); - } else { - rgb_matrix_set_color(i, 0x00, 0x00, 0x00); - } - } - return rgb_matrix_check_finished_leds(led_max); -} - -// This is a side lights only configuration where the color is set to a static gradient. -static bool HOLOGRAPHICS_UNDERGLOW(effect_params_t* params) { - RGB_MATRIX_USE_LIMITS(led_min, led_max); - - for (uint8_t i = led_min; i < led_max; i++) { - if (HAS_FLAGS(g_led_config.flags[i], 0x02)) { // 0x02 == LED_FLAG_UNDERGLOW - // RIGHT-HAND SIDE LEDS || LEFT-HAND SIDE LEDS - if (i == 67 || i == 77) { - rgb_matrix_set_color(i, 0xff, 0x00, 0xee); - } else if (i == 68 || i == 78) { - rgb_matrix_set_color(i, 0xcc, 0x00, 0xff); - } else if (i == 69 || i == 79) { - rgb_matrix_set_color(i, 0x9e, 0x00, 0xff); - } else if (i == 70 || i == 80) { - rgb_matrix_set_color(i, 0x70, 0x00, 0xff); - } else if (i == 71 || i == 81) { - rgb_matrix_set_color(i, 0x52, 0x00, 0xff); - } else if (i == 72 || i == 82) { - rgb_matrix_set_color(i, 0x33, 0x00, 0xff); - } else if (i == 73 || i == 83) { - rgb_matrix_set_color(i, 0x00, 0x38, 0xff); - } else if (i == 74 || i == 84) { - rgb_matrix_set_color(i, 0x00, 0x57, 0xff); - } else if (i == 75 || i == 85) { - rgb_matrix_set_color(i, 0x00, 0x85, 0xff); - } else if (i == 76 || i == 86) { - rgb_matrix_set_color(i, 0x00, 0xb2, 0xff); - } else { - rgb_matrix_set_color(i, 0x00, 0x00, 0x00); - } - } - } - return rgb_matrix_check_finished_leds(led_max); -} - -#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk deleted file mode 100644 index 6245023e80..0000000000 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/achrovisual/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGB_MATRIX_CUSTOM_USER = yes diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c deleted file mode 100644 index c5f90e3fee..0000000000 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/keymap.c +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2021 Glorious, LLC <[email protected]> - * - * 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 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 { - _BL, - _FL, -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Keymap _BL: Base Layer (Default Layer) - */ -[_BL] = LAYOUT( - QK_GESC, 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_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - 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_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), - - /* Keymap _FL: Function Layer - */ -[_FL] = LAYOUT( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_INS, - RGB_M_P, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_HUI, RGB_HUD, RGB_SPD, RGB_SPI, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, RGB_VAI, RGB_TOG, - KC_MUTE, KC_VOLU, KC_VOLD, QK_BOOT, _______, _______, RGB_RMOD, RGB_VAD, RGB_MOD) -}; diff --git a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/readme.md b/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/readme.md deleted file mode 100644 index 4f80a5b956..0000000000 --- a/keyboards/gmmk/gmmk2/p65/ansi/keymaps/thekorn/readme.md +++ /dev/null @@ -1 +0,0 @@ -# ANSI GMMKV2 65% Layout diff --git a/keyboards/gmmk/gmmk2/p65/config.h b/keyboards/gmmk/gmmk2/p65/config.h index ce9ff69433..4ea6b3d739 100644 --- a/keyboards/gmmk/gmmk2/p65/config.h +++ b/keyboards/gmmk/gmmk2/p65/config.h @@ -21,8 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DISABLE_WHEN_USB_SUSPENDED - /* SPI Config for LED Driver */ #define SPI_DRIVER SPIDM2 #define SPI_SCK_PIN B13 @@ -31,60 +29,4 @@ #define AW20216S_CS_PIN_1 A15 #define AW20216S_CS_PIN_2 B9 -#define AW20216S_EN_PIN_1 C13 -#define AW20216S_EN_PIN_2 C13 - -#define DRIVER_1_LED_TOTAL 54 -#define DRIVER_2_LED_TOTAL 34 -#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) - -// RGB Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -#define ENABLE_RGB_MATRIX_ALPHAS_MODS -#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_BREATHING -#define ENABLE_RGB_MATRIX_BAND_SAT -#define ENABLE_RGB_MATRIX_BAND_VAL -#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -#define ENABLE_RGB_MATRIX_CYCLE_ALL -#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -#define ENABLE_RGB_MATRIX_DUAL_BEACON -#define ENABLE_RGB_MATRIX_RAINBOW_BEACON -#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -#define ENABLE_RGB_MATRIX_RAINDROPS -#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -#define ENABLE_RGB_MATRIX_HUE_BREATHING -#define ENABLE_RGB_MATRIX_HUE_PENDULUM -#define ENABLE_RGB_MATRIX_HUE_WAVE -#define ENABLE_RGB_MATRIX_PIXEL_RAIN -#define ENABLE_RGB_MATRIX_PIXEL_FLOW -#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define ENABLE_RGB_MATRIX_TYPING_HEATMAP -#define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -#define RGB_MATRIX_KEYPRESSES -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -#define ENABLE_RGB_MATRIX_SPLASH -#define ENABLE_RGB_MATRIX_MULTISPLASH -#define ENABLE_RGB_MATRIX_SOLID_SPLASH -#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#define AW20216S_EN_PIN C13 diff --git a/keyboards/gmmk/gmmk2/p65/info.json b/keyboards/gmmk/gmmk2/p65/info.json new file mode 100644 index 0000000000..9108057519 --- /dev/null +++ b/keyboards/gmmk/gmmk2/p65/info.json @@ -0,0 +1,51 @@ +{ + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "driver": "aw20216s", + "sleep": true + } +}
\ No newline at end of file diff --git a/keyboards/gmmk/gmmk2/p65/iso/info.json b/keyboards/gmmk/gmmk2/p65/iso/info.json index c286cb7ba0..aa31b50f61 100644 --- a/keyboards/gmmk/gmmk2/p65/iso/info.json +++ b/keyboards/gmmk/gmmk2/p65/iso/info.json @@ -11,9 +11,6 @@ "qmk": { "tap_keycode_delay": 10 }, - "rgb_matrix": { - "driver": "aw20216s" - }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"] diff --git a/keyboards/gmmk/gmmk2/p65/iso/iso.c b/keyboards/gmmk/gmmk2/p65/iso/iso.c index 80c0dc2e0d..2be5285394 100644 --- a/keyboards/gmmk/gmmk2/p65/iso/iso.c +++ b/keyboards/gmmk/gmmk2/p65/iso/iso.c @@ -18,106 +18,106 @@ #ifdef RGB_MATRIX_ENABLE -const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = { +const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { /* Refer to AW20216S manual for these locations * driver * | R location * | | G location * | | | B location * | | | | */ - {0, CS1_SW1, CS2_SW1, CS3_SW1 }, // 0 Esc - {0, CS4_SW2, CS5_SW2, CS6_SW2 }, // 1 1 - {0, CS4_SW3, CS5_SW3, CS6_SW3 }, // 2 2 - {0, CS4_SW4, CS5_SW4, CS6_SW4 }, // 3 3 - {0, CS4_SW5, CS5_SW5, CS6_SW5 }, // 4 4 - {0, CS4_SW6, CS5_SW6, CS6_SW6 }, // 5 5 - {0, CS4_SW7, CS5_SW7, CS6_SW7 }, // 6 6 - {0, CS4_SW8, CS5_SW8, CS6_SW8 }, // 7 7 - {0, CS4_SW9, CS5_SW9, CS6_SW9 }, // 8 8 - {0, CS4_SW10, CS5_SW10, CS6_SW10 }, // 9 9 - {0, CS4_SW11, CS5_SW11, CS6_SW11 }, // 10 0 - {0, CS4_SW12, CS5_SW12, CS6_SW12 }, // 11 - - {1, CS1_SW5, CS2_SW5, CS3_SW5 }, // 12 = - {1, CS1_SW7, CS2_SW7, CS3_SW7 }, // 13 Backspace - {1, CS4_SW4, CS5_SW4, CS6_SW4 }, // 14 HOME + {0, SW1_CS1, SW1_CS2, SW1_CS3 }, // 0 Esc + {0, SW2_CS4, SW2_CS5, SW2_CS6 }, // 1 1 + {0, SW3_CS4, SW3_CS5, SW3_CS6 }, // 2 2 + {0, SW4_CS4, SW4_CS5, SW4_CS6 }, // 3 3 + {0, SW5_CS4, SW5_CS5, SW5_CS6 }, // 4 4 + {0, SW6_CS4, SW6_CS5, SW6_CS6 }, // 5 5 + {0, SW7_CS4, SW7_CS5, SW7_CS6 }, // 6 6 + {0, SW8_CS4, SW8_CS5, SW8_CS6 }, // 7 7 + {0, SW9_CS4, SW9_CS5, SW9_CS6 }, // 8 8 + {0, SW10_CS4, SW10_CS5, SW10_CS6 }, // 9 9 + {0, SW11_CS4, SW11_CS5, SW11_CS6 }, // 10 0 + {0, SW12_CS4, SW12_CS5, SW12_CS6 }, // 11 - + {1, SW5_CS1, SW5_CS2, SW5_CS3 }, // 12 = + {1, SW7_CS1, SW7_CS2, SW7_CS3 }, // 13 Backspace + {1, SW4_CS4, SW4_CS5, SW4_CS6 }, // 14 HOME - {0, CS7_SW1, CS8_SW1, CS9_SW1 }, // 15 Tab - {0, CS7_SW2, CS8_SW2, CS9_SW2 }, // 16 Q - {0, CS7_SW3, CS8_SW3, CS9_SW3 }, // 17 W - {0, CS7_SW4, CS8_SW4, CS9_SW4 }, // 18 E - {0, CS7_SW5, CS8_SW5, CS9_SW5 }, // 19 R - {0, CS7_SW6, CS8_SW6, CS9_SW6 }, // 20 T - {0, CS7_SW7, CS8_SW7, CS9_SW7 }, // 21 Y - {0, CS7_SW8, CS8_SW8, CS9_SW8 }, // 22 U - {0, CS7_SW9, CS8_SW9, CS9_SW9 }, // 23 I - {0, CS7_SW10, CS8_SW10, CS9_SW10 }, // 24 O - {0, CS7_SW11, CS8_SW11, CS9_SW11 }, // 25 P - {0, CS7_SW12, CS8_SW12, CS9_SW12 }, // 26 [ - {1, CS1_SW8, CS2_SW8, CS3_SW8 }, // 27 ] - {1, CS1_SW11, CS2_SW11, CS3_SW11 }, // 28 ENTER - {1, CS4_SW7, CS5_SW7, CS6_SW7 }, // 29 PgUp + {0, SW1_CS7, SW1_CS8, SW1_CS9 }, // 15 Tab + {0, SW2_CS7, SW2_CS8, SW2_CS9 }, // 16 Q + {0, SW3_CS7, SW3_CS8, SW3_CS9 }, // 17 W + {0, SW4_CS7, SW4_CS8, SW4_CS9 }, // 18 E + {0, SW5_CS7, SW5_CS8, SW5_CS9 }, // 19 R + {0, SW6_CS7, SW6_CS8, SW6_CS9 }, // 20 T + {0, SW7_CS7, SW7_CS8, SW7_CS9 }, // 21 Y + {0, SW8_CS7, SW8_CS8, SW8_CS9 }, // 22 U + {0, SW9_CS7, SW9_CS8, SW9_CS9 }, // 23 I + {0, SW10_CS7, SW10_CS8, SW10_CS9 }, // 24 O + {0, SW11_CS7, SW11_CS8, SW11_CS9 }, // 25 P + {0, SW12_CS7, SW12_CS8, SW12_CS9 }, // 26 [ + {1, SW8_CS1, SW8_CS2, SW8_CS3 }, // 27 ] + {1, SW11_CS1, SW11_CS2, SW11_CS3 }, // 28 ENTER + {1, SW7_CS4, SW7_CS5, SW7_CS6 }, // 29 PgUp - {0, CS10_SW1, CS11_SW1, CS12_SW1 }, // 30 Caps Lock - {0, CS10_SW2, CS11_SW2, CS12_SW2 }, // 31 A - {0, CS10_SW3, CS11_SW3, CS12_SW3 }, // 32 S - {0, CS10_SW4, CS11_SW4, CS12_SW4 }, // 33 D - {0, CS10_SW5, CS11_SW5, CS12_SW5 }, // 34 F - {0, CS10_SW6, CS11_SW6, CS12_SW6 }, // 35 G - {0, CS10_SW7, CS11_SW7, CS12_SW7 }, // 36 H - {0, CS10_SW8, CS11_SW8, CS12_SW8 }, // 37 J - {0, CS10_SW9, CS11_SW9, CS12_SW9 }, // 38 K - {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 39 L - {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 40 ; - {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 41 ' - {1, CS1_SW10, CS2_SW10, CS3_SW10 }, // 42 k42 - {1, CS4_SW5, CS5_SW5, CS6_SW5 }, // 43 PgDn + {0, SW1_CS10, SW1_CS11, SW1_CS12 }, // 30 Caps Lock + {0, SW2_CS10, SW2_CS11, SW2_CS12 }, // 31 A + {0, SW3_CS10, SW3_CS11, SW3_CS12 }, // 32 S + {0, SW4_CS10, SW4_CS11, SW4_CS12 }, // 33 D + {0, SW5_CS10, SW5_CS11, SW5_CS12 }, // 34 F + {0, SW6_CS10, SW6_CS11, SW6_CS12 }, // 35 G + {0, SW7_CS10, SW7_CS11, SW7_CS12 }, // 36 H + {0, SW8_CS10, SW8_CS11, SW8_CS12 }, // 37 J + {0, SW9_CS10, SW9_CS11, SW9_CS12 }, // 38 K + {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 39 L + {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 40 ; + {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 41 ' + {1, SW10_CS1, SW10_CS2, SW10_CS3 }, // 42 k42 + {1, SW5_CS4, SW5_CS5, SW5_CS6 }, // 43 PgDn - {0, CS13_SW1, CS14_SW1, CS15_SW1 }, // 44 Shift_L - {0, CS13_SW2, CS14_SW2, CS15_SW2 }, // 45 k45 - {0, CS13_SW3, CS14_SW3, CS15_SW3 }, // 46 Z - {0, CS13_SW4, CS14_SW4, CS15_SW4 }, // 47 X - {0, CS13_SW5, CS14_SW5, CS15_SW5 }, // 48 C - {0, CS13_SW6, CS14_SW6, CS15_SW6 }, // 49 V - {0, CS13_SW7, CS14_SW7, CS15_SW7 }, // 50 B - {0, CS13_SW8, CS14_SW8, CS15_SW8 }, // 51 N - {0, CS13_SW9, CS14_SW9, CS15_SW9 }, // 52 M - {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 53 , - {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 54 . - {0, CS13_SW12, CS14_SW12, CS15_SW12}, // 55 / - {1, CS4_SW8, CS5_SW8, CS6_SW8 }, // 56 Shift_R - {1, CS4_SW9, CS5_SW9, CS6_SW9 }, // 57 Up - {1, CS4_SW6, CS5_SW6, CS6_SW6 }, // 58 END + {0, SW1_CS13, SW1_CS14, SW1_CS15 }, // 44 Shift_L + {0, SW2_CS13, SW2_CS14, SW2_CS15 }, // 45 k45 + {0, SW3_CS13, SW3_CS14, SW3_CS15 }, // 46 Z + {0, SW4_CS13, SW4_CS14, SW4_CS15 }, // 47 X + {0, SW5_CS13, SW5_CS14, SW5_CS15 }, // 48 C + {0, SW6_CS13, SW6_CS14, SW6_CS15 }, // 49 V + {0, SW7_CS13, SW7_CS14, SW7_CS15 }, // 50 B + {0, SW8_CS13, SW8_CS14, SW8_CS15 }, // 51 N + {0, SW9_CS13, SW9_CS14, SW9_CS15 }, // 52 M + {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 53 , + {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 54 . + {0, SW12_CS13, SW12_CS14, SW12_CS15}, // 55 / + {1, SW8_CS4, SW8_CS5, SW8_CS6 }, // 56 Shift_R + {1, SW9_CS4, SW9_CS5, SW9_CS6 }, // 57 Up + {1, SW6_CS4, SW6_CS5, SW6_CS6 }, // 58 END - {0, CS16_SW1, CS17_SW1, CS18_SW1 }, // 59 Ctrl_L - {0, CS16_SW2, CS17_SW2, CS18_SW2 }, // 60 Win_L - {0, CS16_SW3, CS17_SW3, CS18_SW3 }, // 61 Alt_L - {0, CS16_SW6, CS17_SW6, CS18_SW6 }, // 62 Space - {0, CS16_SW9, CS17_SW9, CS18_SW9 }, // 63 Alt_R - {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 64 FN - {1, CS4_SW10, CS5_SW10, CS6_SW10 }, // 65 Left - {1, CS4_SW11, CS5_SW11, CS6_SW11 }, // 66 Down - {1, CS4_SW12, CS5_SW12, CS6_SW12 }, // 67 Right + {0, SW1_CS16, SW1_CS17, SW1_CS18 }, // 59 Ctrl_L + {0, SW2_CS16, SW2_CS17, SW2_CS18 }, // 60 Win_L + {0, SW3_CS16, SW3_CS17, SW3_CS18 }, // 61 Alt_L + {0, SW6_CS16, SW6_CS17, SW6_CS18 }, // 62 Space + {0, SW9_CS16, SW9_CS17, SW9_CS18 }, // 63 Alt_R + {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 64 FN + {1, SW10_CS4, SW10_CS5, SW10_CS6 }, // 65 Left + {1, SW11_CS4, SW11_CS5, SW11_CS6 }, // 66 Down + {1, SW12_CS4, SW12_CS5, SW12_CS6 }, // 67 Right - {1, CS13_SW1, CS14_SW1, CS15_SW1 }, // 68 LED 1 - {1, CS13_SW2, CS14_SW2, CS15_SW2 }, // 69 LED 2 - {1, CS13_SW3, CS14_SW3, CS15_SW3 }, // 70 LED 3 - {1, CS13_SW4, CS14_SW4, CS15_SW4 }, // 71 LED 4 - {1, CS13_SW5, CS14_SW5, CS15_SW5 }, // 72 LED 5 - {1, CS13_SW6, CS14_SW6, CS15_SW6 }, // 73 LED 6 - {1, CS13_SW7, CS14_SW7, CS15_SW7 }, // 74 LED 7 - {1, CS13_SW8, CS14_SW8, CS15_SW8 }, // 75 LED 8 - {1, CS13_SW9, CS14_SW9, CS15_SW9 }, // 76 LED 9 - {1, CS13_SW10, CS14_SW10, CS15_SW10}, // 77 LED 10 - {1, CS16_SW1, CS17_SW1, CS18_SW1 }, // 78 LED 11 - {1, CS16_SW2, CS17_SW2, CS18_SW2 }, // 79 LED 12 - {1, CS16_SW3, CS17_SW3, CS18_SW3 }, // 80 LED 13 - {1, CS16_SW4, CS17_SW4, CS18_SW4 }, // 81 LED 14 - {1, CS16_SW5, CS17_SW5, CS18_SW5 }, // 82 LED 15 - {1, CS16_SW6, CS17_SW6, CS18_SW6 }, // 83 LED 16 - {1, CS16_SW7, CS17_SW7, CS18_SW7 }, // 84 LED 17 - {1, CS16_SW8, CS17_SW8, CS18_SW8 }, // 85 LED 18 - {1, CS16_SW9, CS17_SW9, CS18_SW9 }, // 86 LED 19 - {1, CS16_SW10, CS17_SW10, CS18_SW10} // 87 LED 20 + {1, SW1_CS13, SW1_CS14, SW1_CS15 }, // 68 LED 1 + {1, SW2_CS13, SW2_CS14, SW2_CS15 }, // 69 LED 2 + {1, SW3_CS13, SW3_CS14, SW3_CS15 }, // 70 LED 3 + {1, SW4_CS13, SW4_CS14, SW4_CS15 }, // 71 LED 4 + {1, SW5_CS13, SW5_CS14, SW5_CS15 }, // 72 LED 5 + {1, SW6_CS13, SW6_CS14, SW6_CS15 }, // 73 LED 6 + {1, SW7_CS13, SW7_CS14, SW7_CS15 }, // 74 LED 7 + {1, SW8_CS13, SW8_CS14, SW8_CS15 }, // 75 LED 8 + {1, SW9_CS13, SW9_CS14, SW9_CS15 }, // 76 LED 9 + {1, SW10_CS13, SW10_CS14, SW10_CS15}, // 77 LED 10 + {1, SW1_CS16, SW1_CS17, SW1_CS18 }, // 78 LED 11 + {1, SW2_CS16, SW2_CS17, SW2_CS18 }, // 79 LED 12 + {1, SW3_CS16, SW3_CS17, SW3_CS18 }, // 80 LED 13 + {1, SW4_CS16, SW4_CS17, SW4_CS18 }, // 81 LED 14 + {1, SW5_CS16, SW5_CS17, SW5_CS18 }, // 82 LED 15 + {1, SW6_CS16, SW6_CS17, SW6_CS18 }, // 83 LED 16 + {1, SW7_CS16, SW7_CS17, SW7_CS18 }, // 84 LED 17 + {1, SW8_CS16, SW8_CS17, SW8_CS18 }, // 85 LED 18 + {1, SW9_CS16, SW9_CS17, SW9_CS18 }, // 86 LED 19 + {1, SW10_CS16, SW10_CS17, SW10_CS18} // 87 LED 20 }; #define __ NO_LED diff --git a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c index bc05ab6301..d60b9e2254 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c +++ b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c @@ -18,138 +18,138 @@ #ifdef RGB_MATRIX_ENABLE -const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = { +const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { /* Refer to AW20216S manual for these locations * driver * | R location * | | G location * | | | B location * | | | | */ - {0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, k00, Esc - {0, CS1_SW2, CS2_SW2, CS3_SW2}, // 1, k10, F1 - {0, CS1_SW3, CS2_SW3, CS3_SW3}, // 2, k20, F2 - {0, CS1_SW4, CS2_SW4, CS3_SW4}, // 3, k30, F3 - {0, CS1_SW5, CS2_SW5, CS3_SW5}, // 4, k40, F4 - {0, CS1_SW6, CS2_SW6, CS3_SW6}, // 5, k50, F5 - {0, CS1_SW7, CS2_SW7, CS3_SW7}, // 6, k60, F6 - {0, CS1_SW8, CS2_SW8, CS3_SW8}, // 7, k70, F7 - {0, CS1_SW9, CS2_SW9, CS3_SW9}, // 8, k80, F8 - {0, CS1_SW10, CS2_SW10, CS3_SW10}, // 9, k90, F9 - {0, CS1_SW11, CS2_SW11, CS3_SW11}, // 10, ka0, F10 - {0, CS1_SW12, CS2_SW12, CS3_SW12}, // 11, kb0, F11 - {1, CS1_SW1, CS2_SW1, CS3_SW1}, // 12, kc0, F12 - {1, CS4_SW2, CS5_SW2, CS6_SW2}, // 13, kd0, Printscreen - {1, CS4_SW3, CS5_SW3, CS6_SW3}, // 14, k06, Delete - {1, CS1_SW2, CS2_SW2, CS3_SW2}, // 15, k16, Insert - {1, CS4_SW4, CS5_SW4, CS6_SW4}, // 16, k26, Page Up - {1, CS4_SW7, CS5_SW7, CS6_SW7}, // 17, k36, Page Down + {0, SW1_CS1, SW1_CS2, SW1_CS3}, // 0, k00, Esc + {0, SW2_CS1, SW2_CS2, SW2_CS3}, // 1, k10, F1 + {0, SW3_CS1, SW3_CS2, SW3_CS3}, // 2, k20, F2 + {0, SW4_CS1, SW4_CS2, SW4_CS3}, // 3, k30, F3 + {0, SW5_CS1, SW5_CS2, SW5_CS3}, // 4, k40, F4 + {0, SW6_CS1, SW6_CS2, SW6_CS3}, // 5, k50, F5 + {0, SW7_CS1, SW7_CS2, SW7_CS3}, // 6, k60, F6 + {0, SW8_CS1, SW8_CS2, SW8_CS3}, // 7, k70, F7 + {0, SW9_CS1, SW9_CS2, SW9_CS3}, // 8, k80, F8 + {0, SW10_CS1, SW10_CS2, SW10_CS3}, // 9, k90, F9 + {0, SW11_CS1, SW11_CS2, SW11_CS3}, // 10, ka0, F10 + {0, SW12_CS1, SW12_CS2, SW12_CS3}, // 11, kb0, F11 + {1, SW1_CS1, SW1_CS2, SW1_CS3}, // 12, kc0, F12 + {1, SW2_CS4, SW2_CS5, SW2_CS6}, // 13, kd0, Printscreen + {1, SW3_CS4, SW3_CS5, SW3_CS6}, // 14, k06, Delete + {1, SW2_CS1, SW2_CS2, SW2_CS3}, // 15, k16, Insert + {1, SW4_CS4, SW4_CS5, SW4_CS6}, // 16, k26, Page Up + {1, SW7_CS4, SW7_CS5, SW7_CS6}, // 17, k36, Page Down - {0, CS4_SW1, CS5_SW1, CS6_SW1}, // 18, k01, ` - {0, CS4_SW2, CS5_SW2, CS6_SW2}, // 19, k11, 1 - {0, CS4_SW3, CS5_SW3, CS6_SW3}, // 20, k21, 2 - {0, CS4_SW4, CS5_SW4, CS6_SW4}, // 21, k31, 3 - {0, CS4_SW5, CS5_SW5, CS6_SW5}, // 22, k41, 4 - {0, CS4_SW6, CS5_SW6, CS6_SW6}, // 23, k51, 5 - {0, CS4_SW7, CS5_SW7, CS6_SW7}, // 24, k61, 6 - {0, CS4_SW8, CS5_SW8, CS6_SW8}, // 25, k71, 7 - {0, CS4_SW9, CS5_SW9, CS6_SW9}, // 26, k81, 8 - {0, CS4_SW10, CS5_SW10, CS6_SW10}, // 27, k91, 9 - {0, CS4_SW11, CS5_SW11, CS6_SW11}, // 28, ka1, 0 - {0, CS4_SW12, CS5_SW12, CS6_SW12}, // 29, kb1, - - {1, CS1_SW5, CS2_SW5, CS3_SW5}, // 30, kc1, = - {1, CS1_SW7, CS2_SW7, CS3_SW7}, // 31, kd1, Backspace - {1, CS7_SW1, CS8_SW1, CS9_SW1}, // 32, k46, Num Lock - {1, CS7_SW2, CS8_SW2, CS9_SW2}, // 33, k56, Num / - {1, CS7_SW3, CS8_SW3, CS9_SW3}, // 34, k66, Num * - {1, CS7_SW4, CS8_SW4, CS9_SW4}, // 35, k76, Num - + {0, SW1_CS4, SW1_CS5, SW1_CS6}, // 18, k01, ` + {0, SW2_CS4, SW2_CS5, SW2_CS6}, // 19, k11, 1 + {0, SW3_CS4, SW3_CS5, SW3_CS6}, // 20, k21, 2 + {0, SW4_CS4, SW4_CS5, SW4_CS6}, // 21, k31, 3 + {0, SW5_CS4, SW5_CS5, SW5_CS6}, // 22, k41, 4 + {0, SW6_CS4, SW6_CS5, SW6_CS6}, // 23, k51, 5 + {0, SW7_CS4, SW7_CS5, SW7_CS6}, // 24, k61, 6 + {0, SW8_CS4, SW8_CS5, SW8_CS6}, // 25, k71, 7 + {0, SW9_CS4, SW9_CS5, SW9_CS6}, // 26, k81, 8 + {0, SW10_CS4, SW10_CS5, SW10_CS6}, // 27, k91, 9 + {0, SW11_CS4, SW11_CS5, SW11_CS6}, // 28, ka1, 0 + {0, SW12_CS4, SW12_CS5, SW12_CS6}, // 29, kb1, - + {1, SW5_CS1, SW5_CS2, SW5_CS3}, // 30, kc1, = + {1, SW7_CS1, SW7_CS2, SW7_CS3}, // 31, kd1, Backspace + {1, SW1_CS7, SW1_CS8, SW1_CS9}, // 32, k46, Num Lock + {1, SW2_CS7, SW2_CS8, SW2_CS9}, // 33, k56, Num / + {1, SW3_CS7, SW3_CS8, SW3_CS9}, // 34, k66, Num * + {1, SW4_CS7, SW4_CS8, SW4_CS9}, // 35, k76, Num - - {0, CS7_SW1, CS8_SW1, CS9_SW1}, // 36, k02, Tab - {0, CS7_SW2, CS8_SW2, CS9_SW2}, // 37, k12, Q - {0, CS7_SW3, CS8_SW3, CS9_SW3}, // 38, k22, W - {0, CS7_SW4, CS8_SW4, CS9_SW4}, // 39, k32, E - {0, CS7_SW5, CS8_SW5, CS9_SW5}, // 40, k42, R - {0, CS7_SW6, CS8_SW6, CS9_SW6}, // 41, k52, T - {0, CS7_SW7, CS8_SW7, CS9_SW7}, // 42, k62, Y - {0, CS7_SW8, CS8_SW8, CS9_SW8}, // 43, k72, U - {0, CS7_SW9, CS8_SW9, CS9_SW9}, // 44, k82, I - {0, CS7_SW10, CS8_SW10, CS9_SW10}, // 45, k92, O - {0, CS7_SW11, CS8_SW11, CS9_SW11}, // 46, ka2, P - {0, CS7_SW12, CS8_SW12, CS9_SW12}, // 47, kb2, [ - {1, CS1_SW8, CS2_SW8, CS3_SW8}, // 48, kc2, ] - {1, CS1_SW9, CS2_SW9, CS3_SW9}, // 49, kd3, "\\" - {1, CS7_SW5, CS8_SW5, CS9_SW5}, // 50, k86, Num 7 - {1, CS7_SW6, CS8_SW6, CS9_SW6}, // 51, k96, Num 8 - {1, CS7_SW7, CS8_SW7, CS9_SW7}, // 52, ka6, Num 9 - {1, CS7_SW8, CS8_SW8, CS9_SW8}, // 53, kb6, Num + + {0, SW1_CS7, SW1_CS8, SW1_CS9}, // 36, k02, Tab + {0, SW2_CS7, SW2_CS8, SW2_CS9}, // 37, k12, Q + {0, SW3_CS7, SW3_CS8, SW3_CS9}, // 38, k22, W + {0, SW4_CS7, SW4_CS8, SW4_CS9}, // 39, k32, E + {0, SW5_CS7, SW5_CS8, SW5_CS9}, // 40, k42, R + {0, SW6_CS7, SW6_CS8, SW6_CS9}, // 41, k52, T + {0, SW7_CS7, SW7_CS8, SW7_CS9}, // 42, k62, Y + {0, SW8_CS7, SW8_CS8, SW8_CS9}, // 43, k72, U + {0, SW9_CS7, SW9_CS8, SW9_CS9}, // 44, k82, I + {0, SW10_CS7, SW10_CS8, SW10_CS9}, // 45, k92, O + {0, SW11_CS7, SW11_CS8, SW11_CS9}, // 46, ka2, P + {0, SW12_CS7, SW12_CS8, SW12_CS9}, // 47, kb2, [ + {1, SW8_CS1, SW8_CS2, SW8_CS3}, // 48, kc2, ] + {1, SW9_CS1, SW9_CS2, SW9_CS3}, // 49, kd3, "\\" + {1, SW5_CS7, SW5_CS8, SW5_CS9}, // 50, k86, Num 7 + {1, SW6_CS7, SW6_CS8, SW6_CS9}, // 51, k96, Num 8 + {1, SW7_CS7, SW7_CS8, SW7_CS9}, // 52, ka6, Num 9 + {1, SW8_CS7, SW8_CS8, SW8_CS9}, // 53, kb6, Num + - {0, CS10_SW1, CS11_SW1, CS12_SW1}, // 54, k03, Caps Lock - {0, CS10_SW2, CS11_SW2, CS12_SW2}, // 55, k13, A - {0, CS10_SW3, CS11_SW3, CS12_SW3}, // 56, k23, S - {0, CS10_SW4, CS11_SW4, CS12_SW4}, // 57, k33, D - {0, CS10_SW5, CS11_SW5, CS12_SW5}, // 58, k43, F - {0, CS10_SW6, CS11_SW6, CS12_SW6}, // 59, k53, G - {0, CS10_SW7, CS11_SW7, CS12_SW7}, // 60, k63, H - {0, CS10_SW8, CS11_SW8, CS12_SW8}, // 61, k73, J - {0, CS10_SW9, CS11_SW9, CS12_SW9}, // 62, k83, K - {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 63, k93, L - {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 64, ka3, ; - {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 65, kb3, ' - {1, CS1_SW11, CS2_SW11, CS3_SW11}, // 66, kc3, Enter - {1, CS7_SW9, CS8_SW9, CS9_SW9}, // 67, ka7, Num 4 - {1, CS7_SW10, CS8_SW10, CS9_SW10}, // 68, kb7, Num 5 - {1, CS7_SW11, CS8_SW11, CS9_SW11}, // 69, kc7, Num 6 + {0, SW1_CS10, SW1_CS11, SW1_CS12}, // 54, k03, Caps Lock + {0, SW2_CS10, SW2_CS11, SW2_CS12}, // 55, k13, A + {0, SW3_CS10, SW3_CS11, SW3_CS12}, // 56, k23, S + {0, SW4_CS10, SW4_CS11, SW4_CS12}, // 57, k33, D + {0, SW5_CS10, SW5_CS11, SW5_CS12}, // 58, k43, F + {0, SW6_CS10, SW6_CS11, SW6_CS12}, // 59, k53, G + {0, SW7_CS10, SW7_CS11, SW7_CS12}, // 60, k63, H + {0, SW8_CS10, SW8_CS11, SW8_CS12}, // 61, k73, J + {0, SW9_CS10, SW9_CS11, SW9_CS12}, // 62, k83, K + {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 63, k93, L + {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 64, ka3, ; + {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 65, kb3, ' + {1, SW11_CS1, SW11_CS2, SW11_CS3}, // 66, kc3, Enter + {1, SW9_CS7, SW9_CS8, SW9_CS9}, // 67, ka7, Num 4 + {1, SW10_CS7, SW10_CS8, SW10_CS9}, // 68, kb7, Num 5 + {1, SW11_CS7, SW11_CS8, SW11_CS9}, // 69, kc7, Num 6 - {0, CS13_SW1, CS14_SW1, CS15_SW1}, // 70, k04, Shift_L - {0, CS13_SW2, CS14_SW2, CS15_SW2}, // 71, k24, Z - {0, CS13_SW3, CS14_SW3, CS15_SW3}, // 72, k34, X - {0, CS13_SW4, CS14_SW4, CS15_SW4}, // 73, k44, C - {0, CS13_SW5, CS14_SW5, CS15_SW5}, // 74, k54, V - {0, CS13_SW6, CS14_SW6, CS15_SW6}, // 75, k64, B - {0, CS13_SW7, CS14_SW7, CS15_SW7}, // 76, k74, N - {0, CS13_SW8, CS14_SW8, CS15_SW8}, // 77, k84, M - {0, CS13_SW9, CS14_SW9, CS15_SW9}, // 78, k94, , - {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 79, ka4, . - {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 80, kb4, / - {1, CS4_SW8, CS5_SW8, CS6_SW8}, // 81, kd4, Shift_R - {1, CS4_SW9, CS5_SW9, CS6_SW9}, // 82, k17, Up - {1, CS10_SW1, CS11_SW1, CS12_SW1}, // 83, k67, Num 1 - {1, CS10_SW2, CS11_SW2, CS12_SW2}, // 84, k77, Num 2 - {1, CS10_SW3, CS11_SW3, CS12_SW3}, // 85, k87, Num 3 - {1, CS10_SW4, CS11_SW4, CS12_SW4}, // 86, k97, Enter_R + {0, SW1_CS13, SW1_CS14, SW1_CS15}, // 70, k04, Shift_L + {0, SW2_CS13, SW2_CS14, SW2_CS15}, // 71, k24, Z + {0, SW3_CS13, SW3_CS14, SW3_CS15}, // 72, k34, X + {0, SW4_CS13, SW4_CS14, SW4_CS15}, // 73, k44, C + {0, SW5_CS13, SW5_CS14, SW5_CS15}, // 74, k54, V + {0, SW6_CS13, SW6_CS14, SW6_CS15}, // 75, k64, B + {0, SW7_CS13, SW7_CS14, SW7_CS15}, // 76, k74, N + {0, SW8_CS13, SW8_CS14, SW8_CS15}, // 77, k84, M + {0, SW9_CS13, SW9_CS14, SW9_CS15}, // 78, k94, , + {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 79, ka4, . + {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 80, kb4, / + {1, SW8_CS4, SW8_CS5, SW8_CS6}, // 81, kd4, Shift_R + {1, SW9_CS4, SW9_CS5, SW9_CS6}, // 82, k17, Up + {1, SW1_CS10, SW1_CS11, SW1_CS12}, // 83, k67, Num 1 + {1, SW2_CS10, SW2_CS11, SW2_CS12}, // 84, k77, Num 2 + {1, SW3_CS10, SW3_CS11, SW3_CS12}, // 85, k87, Num 3 + {1, SW4_CS10, SW4_CS11, SW4_CS12}, // 86, k97, Enter_R - {0, CS16_SW1, CS17_SW1, CS18_SW1}, // 87, k05, Ctrl_L - {0, CS16_SW2, CS17_SW2, CS18_SW2}, // 88, k15, Win_L - {0, CS16_SW3, CS17_SW3, CS18_SW3}, // 89, k25, Alt_L - {0, CS16_SW6, CS17_SW6, CS18_SW6}, // 90, k65, Space - {0, CS16_SW9, CS17_SW9, CS18_SW9}, // 91, k95, Alt_R - {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 92, ka5, FN - {0, CS16_SW12, CS17_SW12, CS18_SW12}, // 93, kc5, Ctrl_R - {1, CS4_SW10, CS5_SW10, CS6_SW10}, // 94, k07, Left - {1, CS4_SW11, CS5_SW11, CS6_SW11}, // 95, k27, Down - {1, CS10_SW5, CS11_SW5, CS12_SW5}, // 96, k37, Right - {1, CS10_SW6, CS11_SW6, CS12_SW6}, // 97, k47, Num 0 - {1, CS10_SW7, CS11_SW7, CS12_SW7}, // 98, k57, Num . + {0, SW1_CS16, SW1_CS17, SW1_CS18}, // 87, k05, Ctrl_L + {0, SW2_CS16, SW2_CS17, SW2_CS18}, // 88, k15, Win_L + {0, SW3_CS16, SW3_CS17, SW3_CS18}, // 89, k25, Alt_L + {0, SW6_CS16, SW6_CS17, SW6_CS18}, // 90, k65, Space + {0, SW9_CS16, SW9_CS17, SW9_CS18}, // 91, k95, Alt_R + {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 92, ka5, FN + {0, SW12_CS16, SW12_CS17, SW12_CS18}, // 93, kc5, Ctrl_R + {1, SW10_CS4, SW10_CS5, SW10_CS6}, // 94, k07, Left + {1, SW11_CS4, SW11_CS5, SW11_CS6}, // 95, k27, Down + {1, SW5_CS10, SW5_CS11, SW5_CS12}, // 96, k37, Right + {1, SW6_CS10, SW6_CS11, SW6_CS12}, // 97, k47, Num 0 + {1, SW7_CS10, SW7_CS11, SW7_CS12}, // 98, k57, Num . - {1, CS13_SW1, CS14_SW1, CS15_SW1}, // 101, LED 1 - {1, CS13_SW2, CS14_SW2, CS15_SW2}, // 102, LED 2 - {1, CS13_SW3, CS14_SW3, CS15_SW3}, // 103, LED 3 - {1, CS13_SW4, CS14_SW4, CS15_SW4}, // 104, LED 4 - {1, CS13_SW5, CS14_SW5, CS15_SW5}, // 105, LED 5 - {1, CS13_SW6, CS14_SW6, CS15_SW6}, // 106, LED 6 - {1, CS13_SW7, CS14_SW7, CS15_SW7}, // 107, LED 7 - {1, CS13_SW8, CS14_SW8, CS15_SW8}, // 108, LED 8 - {1, CS13_SW9, CS14_SW9, CS15_SW9}, // 109, LED 9 - {1, CS13_SW10, CS14_SW10, CS15_SW10}, // 110, LED 10 - {1, CS16_SW1, CS17_SW1, CS18_SW1}, // 111, LED 11 - {1, CS16_SW2, CS17_SW2, CS18_SW2}, // 112, LED 12 - {1, CS16_SW3, CS17_SW3, CS18_SW3}, // 113, LED 13 - {1, CS16_SW4, CS17_SW4, CS18_SW4}, // 114, LED 14 - {1, CS16_SW5, CS17_SW5, CS18_SW5}, // 115, LED 15 - {1, CS16_SW6, CS17_SW6, CS18_SW6}, // 116, LED 16 - {1, CS16_SW7, CS17_SW7, CS18_SW7}, // 117, LED 17 - {1, CS16_SW8, CS17_SW8, CS18_SW8}, // 118, LED 18 - {1, CS16_SW9, CS17_SW9, CS18_SW9}, // 119, LED 19 - {1, CS16_SW10, CS17_SW10, CS18_SW10} // 120, LED 20 + {1, SW1_CS13, SW1_CS14, SW1_CS15}, // 101, LED 1 + {1, SW2_CS13, SW2_CS14, SW2_CS15}, // 102, LED 2 + {1, SW3_CS13, SW3_CS14, SW3_CS15}, // 103, LED 3 + {1, SW4_CS13, SW4_CS14, SW4_CS15}, // 104, LED 4 + {1, SW5_CS13, SW5_CS14, SW5_CS15}, // 105, LED 5 + {1, SW6_CS13, SW6_CS14, SW6_CS15}, // 106, LED 6 + {1, SW7_CS13, SW7_CS14, SW7_CS15}, // 107, LED 7 + {1, SW8_CS13, SW8_CS14, SW8_CS15}, // 108, LED 8 + {1, SW9_CS13, SW9_CS14, SW9_CS15}, // 109, LED 9 + {1, SW10_CS13, SW10_CS14, SW10_CS15}, // 110, LED 10 + {1, SW1_CS16, SW1_CS17, SW1_CS18}, // 111, LED 11 + {1, SW2_CS16, SW2_CS17, SW2_CS18}, // 112, LED 12 + {1, SW3_CS16, SW3_CS17, SW3_CS18}, // 113, LED 13 + {1, SW4_CS16, SW4_CS17, SW4_CS18}, // 114, LED 14 + {1, SW5_CS16, SW5_CS17, SW5_CS18}, // 115, LED 15 + {1, SW6_CS16, SW6_CS17, SW6_CS18}, // 116, LED 16 + {1, SW7_CS16, SW7_CS17, SW7_CS18}, // 117, LED 17 + {1, SW8_CS16, SW8_CS17, SW8_CS18}, // 118, LED 18 + {1, SW9_CS16, SW9_CS17, SW9_CS18}, // 119, LED 19 + {1, SW10_CS16, SW10_CS17, SW10_CS18} // 120, LED 20 }; #define __ NO_LED diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json index e4eaddbfe8..d7e0e38ceb 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json @@ -11,9 +11,6 @@ "qmk": { "tap_keycode_delay": 10 }, - "rgb_matrix": { - "driver": "aw20216s" - }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"] diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h index fb21c571f5..2b73b4a396 100644 --- a/keyboards/gmmk/gmmk2/p96/config.h +++ b/keyboards/gmmk/gmmk2/p96/config.h @@ -21,8 +21,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DISABLE_WHEN_USB_SUSPENDED - /* External spi flash */ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14 @@ -34,58 +32,4 @@ #define AW20216S_CS_PIN_1 A15 #define AW20216S_CS_PIN_2 B15 -#define AW20216S_EN_PIN_1 C13 -#define AW20216S_EN_PIN_2 C13 - -#define DRIVER_1_LED_TOTAL 66 -#define DRIVER_2_LED_TOTAL 54 -#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) - -// RGB Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -#define ENABLE_RGB_MATRIX_ALPHAS_MODS -#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_BREATHING -#define ENABLE_RGB_MATRIX_BAND_SAT -#define ENABLE_RGB_MATRIX_BAND_VAL -#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -#define ENABLE_RGB_MATRIX_CYCLE_ALL -#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -#define ENABLE_RGB_MATRIX_DUAL_BEACON -#define ENABLE_RGB_MATRIX_RAINBOW_BEACON -#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -#define ENABLE_RGB_MATRIX_RAINDROPS -#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -#define ENABLE_RGB_MATRIX_HUE_BREATHING -#define ENABLE_RGB_MATRIX_HUE_PENDULUM -#define ENABLE_RGB_MATRIX_HUE_WAVE -#define ENABLE_RGB_MATRIX_PIXEL_RAIN -#define ENABLE_RGB_MATRIX_PIXEL_FLOW -#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -#define ENABLE_RGB_MATRIX_TYPING_HEATMAP -#define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -#define ENABLE_RGB_MATRIX_SPLASH -#define ENABLE_RGB_MATRIX_MULTISPLASH -#define ENABLE_RGB_MATRIX_SOLID_SPLASH -#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#define AW20216S_EN_PIN C13 diff --git a/keyboards/gmmk/gmmk2/p96/info.json b/keyboards/gmmk/gmmk2/p96/info.json new file mode 100644 index 0000000000..9108057519 --- /dev/null +++ b/keyboards/gmmk/gmmk2/p96/info.json @@ -0,0 +1,51 @@ +{ + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "driver": "aw20216s", + "sleep": true + } +}
\ No newline at end of file diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json index d9f53b76f1..c5079a22dd 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/info.json +++ b/keyboards/gmmk/gmmk2/p96/iso/info.json @@ -11,9 +11,6 @@ "qmk": { "tap_keycode_delay": 10 }, - "rgb_matrix": { - "driver": "aw20216s" - }, "matrix_pins": { "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"] diff --git a/keyboards/gmmk/gmmk2/p96/iso/iso.c b/keyboards/gmmk/gmmk2/p96/iso/iso.c index f6b3528cb4..af2ee17c4a 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/iso.c +++ b/keyboards/gmmk/gmmk2/p96/iso/iso.c @@ -18,139 +18,139 @@ #ifdef RGB_MATRIX_ENABLE -const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = { +const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { /* Refer to AW20216S manual for these locations * driver * | R location * | | G location * | | | B location * | | | | */ - {0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, k00, Esc - {0, CS1_SW2, CS2_SW2, CS3_SW2}, // 1, k10, F1 - {0, CS1_SW3, CS2_SW3, CS3_SW3}, // 2, k20, F2 - {0, CS1_SW4, CS2_SW4, CS3_SW4}, // 3, k30, F3 - {0, CS1_SW5, CS2_SW5, CS3_SW5}, // 4, k40, F4 - {0, CS1_SW6, CS2_SW6, CS3_SW6}, // 5, k50, F5 - {0, CS1_SW7, CS2_SW7, CS3_SW7}, // 6, k60, F6 - {0, CS1_SW8, CS2_SW8, CS3_SW8}, // 7, k70, F7 - {0, CS1_SW9, CS2_SW9, CS3_SW9}, // 8, k80, F8 - {0, CS1_SW10, CS2_SW10, CS3_SW10}, // 9, k90, F9 - {0, CS1_SW11, CS2_SW11, CS3_SW11}, // 10, ka0, F10 - {0, CS1_SW12, CS2_SW12, CS3_SW12}, // 11, kb0, F11 - {1, CS1_SW1, CS2_SW1, CS3_SW1}, // 12, kc0, F12 - {1, CS4_SW2, CS5_SW2, CS6_SW2}, // 13, kd0, Printscreen - {1, CS4_SW3, CS5_SW3, CS6_SW3}, // 14, k06, Delete - {1, CS1_SW2, CS2_SW2, CS3_SW2}, // 15, k16, Insert - {1, CS4_SW4, CS5_SW4, CS6_SW4}, // 16, k26, Page Up - {1, CS4_SW7, CS5_SW7, CS6_SW7}, // 17, k36, Page Down + {0, SW1_CS1, SW1_CS2, SW1_CS3}, // 0, k00, Esc + {0, SW2_CS1, SW2_CS2, SW2_CS3}, // 1, k10, F1 + {0, SW3_CS1, SW3_CS2, SW3_CS3}, // 2, k20, F2 + {0, SW4_CS1, SW4_CS2, SW4_CS3}, // 3, k30, F3 + {0, SW5_CS1, SW5_CS2, SW5_CS3}, // 4, k40, F4 + {0, SW6_CS1, SW6_CS2, SW6_CS3}, // 5, k50, F5 + {0, SW7_CS1, SW7_CS2, SW7_CS3}, // 6, k60, F6 + {0, SW8_CS1, SW8_CS2, SW8_CS3}, // 7, k70, F7 + {0, SW9_CS1, SW9_CS2, SW9_CS3}, // 8, k80, F8 + {0, SW10_CS1, SW10_CS2, SW10_CS3}, // 9, k90, F9 + {0, SW11_CS1, SW11_CS2, SW11_CS3}, // 10, ka0, F10 + {0, SW12_CS1, SW12_CS2, SW12_CS3}, // 11, kb0, F11 + {1, SW1_CS1, SW1_CS2, SW1_CS3}, // 12, kc0, F12 + {1, SW2_CS4, SW2_CS5, SW2_CS6}, // 13, kd0, Printscreen + {1, SW3_CS4, SW3_CS5, SW3_CS6}, // 14, k06, Delete + {1, SW2_CS1, SW2_CS2, SW2_CS3}, // 15, k16, Insert + {1, SW4_CS4, SW4_CS5, SW4_CS6}, // 16, k26, Page Up + {1, SW7_CS4, SW7_CS5, SW7_CS6}, // 17, k36, Page Down - {0, CS4_SW1, CS5_SW1, CS6_SW1}, // 18, k01, ` - {0, CS4_SW2, CS5_SW2, CS6_SW2}, // 19, k11, 1 - {0, CS4_SW3, CS5_SW3, CS6_SW3}, // 20, k21, 2 - {0, CS4_SW4, CS5_SW4, CS6_SW4}, // 21, k31, 3 - {0, CS4_SW5, CS5_SW5, CS6_SW5}, // 22, k41, 4 - {0, CS4_SW6, CS5_SW6, CS6_SW6}, // 23, k51, 5 - {0, CS4_SW7, CS5_SW7, CS6_SW7}, // 24, k61, 6 - {0, CS4_SW8, CS5_SW8, CS6_SW8}, // 25, k71, 7 - {0, CS4_SW9, CS5_SW9, CS6_SW9}, // 26, k81, 8 - {0, CS4_SW10, CS5_SW10, CS6_SW10}, // 27, k91, 9 - {0, CS4_SW11, CS5_SW11, CS6_SW11}, // 28, ka1, 0 - {0, CS4_SW12, CS5_SW12, CS6_SW12}, // 29, kb1, - - {1, CS1_SW5, CS2_SW5, CS3_SW5}, // 30, kc1, = - {1, CS1_SW7, CS2_SW7, CS3_SW7}, // 31, kd1, Backspace - {1, CS7_SW1, CS8_SW1, CS9_SW1}, // 32, k46, Num Lock - {1, CS7_SW2, CS8_SW2, CS9_SW2}, // 33, k56, Num / - {1, CS7_SW3, CS8_SW3, CS9_SW3}, // 34, k66, Num * - {1, CS7_SW4, CS8_SW4, CS9_SW4}, // 35, k76, Num - + {0, SW1_CS4, SW1_CS5, SW1_CS6}, // 18, k01, ` + {0, SW2_CS4, SW2_CS5, SW2_CS6}, // 19, k11, 1 + {0, SW3_CS4, SW3_CS5, SW3_CS6}, // 20, k21, 2 + {0, SW4_CS4, SW4_CS5, SW4_CS6}, // 21, k31, 3 + {0, SW5_CS4, SW5_CS5, SW5_CS6}, // 22, k41, 4 + {0, SW6_CS4, SW6_CS5, SW6_CS6}, // 23, k51, 5 + {0, SW7_CS4, SW7_CS5, SW7_CS6}, // 24, k61, 6 + {0, SW8_CS4, SW8_CS5, SW8_CS6}, // 25, k71, 7 + {0, SW9_CS4, SW9_CS5, SW9_CS6}, // 26, k81, 8 + {0, SW10_CS4, SW10_CS5, SW10_CS6}, // 27, k91, 9 + {0, SW11_CS4, SW11_CS5, SW11_CS6}, // 28, ka1, 0 + {0, SW12_CS4, SW12_CS5, SW12_CS6}, // 29, kb1, - + {1, SW5_CS1, SW5_CS2, SW5_CS3}, // 30, kc1, = + {1, SW7_CS1, SW7_CS2, SW7_CS3}, // 31, kd1, Backspace + {1, SW1_CS7, SW1_CS8, SW1_CS9}, // 32, k46, Num Lock + {1, SW2_CS7, SW2_CS8, SW2_CS9}, // 33, k56, Num / + {1, SW3_CS7, SW3_CS8, SW3_CS9}, // 34, k66, Num * + {1, SW4_CS7, SW4_CS8, SW4_CS9}, // 35, k76, Num - - {0, CS7_SW1, CS8_SW1, CS9_SW1}, // 36, k02, Tab - {0, CS7_SW2, CS8_SW2, CS9_SW2}, // 37, k12, Q - {0, CS7_SW3, CS8_SW3, CS9_SW3}, // 38, k22, W - {0, CS7_SW4, CS8_SW4, CS9_SW4}, // 39, k32, E - {0, CS7_SW5, CS8_SW5, CS9_SW5}, // 40, k42, R - {0, CS7_SW6, CS8_SW6, CS9_SW6}, // 41, k52, T - {0, CS7_SW7, CS8_SW7, CS9_SW7}, // 42, k62, Y - {0, CS7_SW8, CS8_SW8, CS9_SW8}, // 43, k72, U - {0, CS7_SW9, CS8_SW9, CS9_SW9}, // 44, k82, I - {0, CS7_SW10, CS8_SW10, CS9_SW10}, // 45, k92, O - {0, CS7_SW11, CS8_SW11, CS9_SW11}, // 46, ka2, P - {0, CS7_SW12, CS8_SW12, CS9_SW12}, // 47, kb2, [ - {1, CS1_SW8, CS2_SW8, CS3_SW8}, // 48, kc2, ] - {1, CS1_SW11, CS2_SW11, CS3_SW11}, // 49, kd3, Enter - {1, CS7_SW5, CS8_SW5, CS9_SW5}, // 50, k86, Num 7 - {1, CS7_SW6, CS8_SW6, CS9_SW6}, // 51, k96, Num 8 - {1, CS7_SW7, CS8_SW7, CS9_SW7}, // 52, ka6, Num 9 - {1, CS7_SW8, CS8_SW8, CS9_SW8}, // 53, kb6, Num + + {0, SW1_CS7, SW1_CS8, SW1_CS9}, // 36, k02, Tab + {0, SW2_CS7, SW2_CS8, SW2_CS9}, // 37, k12, Q + {0, SW3_CS7, SW3_CS8, SW3_CS9}, // 38, k22, W + {0, SW4_CS7, SW4_CS8, SW4_CS9}, // 39, k32, E + {0, SW5_CS7, SW5_CS8, SW5_CS9}, // 40, k42, R + {0, SW6_CS7, SW6_CS8, SW6_CS9}, // 41, k52, T + {0, SW7_CS7, SW7_CS8, SW7_CS9}, // 42, k62, Y + {0, SW8_CS7, SW8_CS8, SW8_CS9}, // 43, k72, U + {0, SW9_CS7, SW9_CS8, SW9_CS9}, // 44, k82, I + {0, SW10_CS7, SW10_CS8, SW10_CS9}, // 45, k92, O + {0, SW11_CS7, SW11_CS8, SW11_CS9}, // 46, ka2, P + {0, SW12_CS7, SW12_CS8, SW12_CS9}, // 47, kb2, [ + {1, SW8_CS1, SW8_CS2, SW8_CS3}, // 48, kc2, ] + {1, SW11_CS1, SW11_CS2, SW11_CS3}, // 49, kd3, Enter + {1, SW5_CS7, SW5_CS8, SW5_CS9}, // 50, k86, Num 7 + {1, SW6_CS7, SW6_CS8, SW6_CS9}, // 51, k96, Num 8 + {1, SW7_CS7, SW7_CS8, SW7_CS9}, // 52, ka6, Num 9 + {1, SW8_CS7, SW8_CS8, SW8_CS9}, // 53, kb6, Num + - {0, CS10_SW1, CS11_SW1, CS12_SW1}, // 54, k03, Caps Lock - {0, CS10_SW2, CS11_SW2, CS12_SW2}, // 55, k13, A - {0, CS10_SW3, CS11_SW3, CS12_SW3}, // 56, k23, S - {0, CS10_SW4, CS11_SW4, CS12_SW4}, // 57, k33, D - {0, CS10_SW5, CS11_SW5, CS12_SW5}, // 58, k43, F - {0, CS10_SW6, CS11_SW6, CS12_SW6}, // 59, k53, G - {0, CS10_SW7, CS11_SW7, CS12_SW7}, // 60, k63, H - {0, CS10_SW8, CS11_SW8, CS12_SW8}, // 61, k73, J - {0, CS10_SW9, CS11_SW9, CS12_SW9}, // 62, k83, K - {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 63, k93, L - {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 64, ka3, ; - {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 65, kb3, ' - {1, CS1_SW10, CS2_SW10, CS3_SW10}, // 66, kc3, # - {1, CS7_SW9, CS8_SW9, CS9_SW9}, // 67, ka7, Num 4 - {1, CS7_SW10, CS8_SW10, CS9_SW10}, // 68, kb7, Num 5 - {1, CS7_SW11, CS8_SW11, CS9_SW11}, // 69, kc7, Num 6 + {0, SW1_CS10, SW1_CS11, SW1_CS12}, // 54, k03, Caps Lock + {0, SW2_CS10, SW2_CS11, SW2_CS12}, // 55, k13, A + {0, SW3_CS10, SW3_CS11, SW3_CS12}, // 56, k23, S + {0, SW4_CS10, SW4_CS11, SW4_CS12}, // 57, k33, D + {0, SW5_CS10, SW5_CS11, SW5_CS12}, // 58, k43, F + {0, SW6_CS10, SW6_CS11, SW6_CS12}, // 59, k53, G + {0, SW7_CS10, SW7_CS11, SW7_CS12}, // 60, k63, H + {0, SW8_CS10, SW8_CS11, SW8_CS12}, // 61, k73, J + {0, SW9_CS10, SW9_CS11, SW9_CS12}, // 62, k83, K + {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 63, k93, L + {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 64, ka3, ; + {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 65, kb3, ' + {1, SW10_CS1, SW10_CS2, SW10_CS3}, // 66, kc3, # + {1, SW9_CS7, SW9_CS8, SW9_CS9}, // 67, ka7, Num 4 + {1, SW10_CS7, SW10_CS8, SW10_CS9}, // 68, kb7, Num 5 + {1, SW11_CS7, SW11_CS8, SW11_CS9}, // 69, kc7, Num 6 - {0, CS13_SW1, CS14_SW1, CS15_SW1}, // 70, k04, Shift_L - {0, CS13_SW12, CS14_SW12, CS15_SW12}, // 71, k14, "\\" - {0, CS13_SW2, CS14_SW2, CS15_SW2}, // 72, k24, Z - {0, CS13_SW3, CS14_SW3, CS15_SW3}, // 73, k34, X - {0, CS13_SW4, CS14_SW4, CS15_SW4}, // 74, k44, C - {0, CS13_SW5, CS14_SW5, CS15_SW5}, // 75, k54, V - {0, CS13_SW6, CS14_SW6, CS15_SW6}, // 76, k64, B - {0, CS13_SW7, CS14_SW7, CS15_SW7}, // 77, k74, N - {0, CS13_SW8, CS14_SW8, CS15_SW8}, // 78, k84, M - {0, CS13_SW9, CS14_SW9, CS15_SW9}, // 79, k94, , - {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 80, ka4, . - {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 81, kb4, / - {1, CS4_SW8, CS5_SW8, CS6_SW8}, // 82, kd4, Shift_R - {1, CS4_SW9, CS5_SW9, CS6_SW9}, // 83, k17, Up - {1, CS10_SW1, CS11_SW1, CS12_SW1}, // 84, k67, Num 1 - {1, CS10_SW2, CS11_SW2, CS12_SW2}, // 85, k77, Num 2 - {1, CS10_SW3, CS11_SW3, CS12_SW3}, // 86, k87, Num 3 - {1, CS10_SW4, CS11_SW4, CS12_SW4}, // 87, k97, Enter_R + {0, SW1_CS13, SW1_CS14, SW1_CS15}, // 70, k04, Shift_L + {0, SW12_CS13, SW12_CS14, SW12_CS15}, // 71, k14, "\\" + {0, SW2_CS13, SW2_CS14, SW2_CS15}, // 72, k24, Z + {0, SW3_CS13, SW3_CS14, SW3_CS15}, // 73, k34, X + {0, SW4_CS13, SW4_CS14, SW4_CS15}, // 74, k44, C + {0, SW5_CS13, SW5_CS14, SW5_CS15}, // 75, k54, V + {0, SW6_CS13, SW6_CS14, SW6_CS15}, // 76, k64, B + {0, SW7_CS13, SW7_CS14, SW7_CS15}, // 77, k74, N + {0, SW8_CS13, SW8_CS14, SW8_CS15}, // 78, k84, M + {0, SW9_CS13, SW9_CS14, SW9_CS15}, // 79, k94, , + {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 80, ka4, . + {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 81, kb4, / + {1, SW8_CS4, SW8_CS5, SW8_CS6}, // 82, kd4, Shift_R + {1, SW9_CS4, SW9_CS5, SW9_CS6}, // 83, k17, Up + {1, SW1_CS10, SW1_CS11, SW1_CS12}, // 84, k67, Num 1 + {1, SW2_CS10, SW2_CS11, SW2_CS12}, // 85, k77, Num 2 + {1, SW3_CS10, SW3_CS11, SW3_CS12}, // 86, k87, Num 3 + {1, SW4_CS10, SW4_CS11, SW4_CS12}, // 87, k97, Enter_R - {0, CS16_SW1, CS17_SW1, CS18_SW1}, // 88, k05, Ctrl_L - {0, CS16_SW2, CS17_SW2, CS18_SW2}, // 89, k15, Win_L - {0, CS16_SW3, CS17_SW3, CS18_SW3}, // 90, k25, Alt_L - {0, CS16_SW6, CS17_SW6, CS18_SW6}, // 91, k65, Space - {0, CS16_SW9, CS17_SW9, CS18_SW9}, // 92, k95, Alt_R - {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 93, ka5, FN - {0, CS16_SW12, CS17_SW12, CS18_SW12}, // 94, kc5, Ctrl_R - {1, CS4_SW10, CS5_SW10, CS6_SW10}, // 95, k07, Left - {1, CS4_SW11, CS5_SW11, CS6_SW11}, // 96, k27, Down - {1, CS10_SW5, CS11_SW5, CS12_SW5}, // 97, k37, Right - {1, CS10_SW6, CS11_SW6, CS12_SW6}, // 98, k47, Num 0 - {1, CS10_SW7, CS11_SW7, CS12_SW7}, // 99, k57, Num . + {0, SW1_CS16, SW1_CS17, SW1_CS18}, // 88, k05, Ctrl_L + {0, SW2_CS16, SW2_CS17, SW2_CS18}, // 89, k15, Win_L + {0, SW3_CS16, SW3_CS17, SW3_CS18}, // 90, k25, Alt_L + {0, SW6_CS16, SW6_CS17, SW6_CS18}, // 91, k65, Space + {0, SW9_CS16, SW9_CS17, SW9_CS18}, // 92, k95, Alt_R + {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 93, ka5, FN + {0, SW12_CS16, SW12_CS17, SW12_CS18}, // 94, kc5, Ctrl_R + {1, SW10_CS4, SW10_CS5, SW10_CS6}, // 95, k07, Left + {1, SW11_CS4, SW11_CS5, SW11_CS6}, // 96, k27, Down + {1, SW5_CS10, SW5_CS11, SW5_CS12}, // 97, k37, Right + {1, SW6_CS10, SW6_CS11, SW6_CS12}, // 98, k47, Num 0 + {1, SW7_CS10, SW7_CS11, SW7_CS12}, // 99, k57, Num . - {1, CS13_SW1, CS14_SW1, CS15_SW1}, // 101, LED 1 - {1, CS13_SW2, CS14_SW2, CS15_SW2}, // 102, LED 2 - {1, CS13_SW3, CS14_SW3, CS15_SW3}, // 103, LED 3 - {1, CS13_SW4, CS14_SW4, CS15_SW4}, // 104, LED 4 - {1, CS13_SW5, CS14_SW5, CS15_SW5}, // 105, LED 5 - {1, CS13_SW6, CS14_SW6, CS15_SW6}, // 106, LED 6 - {1, CS13_SW7, CS14_SW7, CS15_SW7}, // 107, LED 7 - {1, CS13_SW8, CS14_SW8, CS15_SW8}, // 108, LED 8 - {1, CS13_SW9, CS14_SW9, CS15_SW9}, // 109, LED 9 - {1, CS13_SW10, CS14_SW10, CS15_SW10}, // 110, LED 10 - {1, CS16_SW1, CS17_SW1, CS18_SW1}, // 111, LED 11 - {1, CS16_SW2, CS17_SW2, CS18_SW2}, // 112, LED 12 - {1, CS16_SW3, CS17_SW3, CS18_SW3}, // 113, LED 13 - {1, CS16_SW4, CS17_SW4, CS18_SW4}, // 114, LED 14 - {1, CS16_SW5, CS17_SW5, CS18_SW5}, // 115, LED 15 - {1, CS16_SW6, CS17_SW6, CS18_SW6}, // 116, LED 16 - {1, CS16_SW7, CS17_SW7, CS18_SW7}, // 117, LED 17 - {1, CS16_SW8, CS17_SW8, CS18_SW8}, // 118, LED 18 - {1, CS16_SW9, CS17_SW9, CS18_SW9}, // 119, LED 19 - {1, CS16_SW10, CS17_SW10, CS18_SW10} // 120, LED 20 + {1, SW1_CS13, SW1_CS14, SW1_CS15}, // 101, LED 1 + {1, SW2_CS13, SW2_CS14, SW2_CS15}, // 102, LED 2 + {1, SW3_CS13, SW3_CS14, SW3_CS15}, // 103, LED 3 + {1, SW4_CS13, SW4_CS14, SW4_CS15}, // 104, LED 4 + {1, SW5_CS13, SW5_CS14, SW5_CS15}, // 105, LED 5 + {1, SW6_CS13, SW6_CS14, SW6_CS15}, // 106, LED 6 + {1, SW7_CS13, SW7_CS14, SW7_CS15}, // 107, LED 7 + {1, SW8_CS13, SW8_CS14, SW8_CS15}, // 108, LED 8 + {1, SW9_CS13, SW9_CS14, SW9_CS15}, // 109, LED 9 + {1, SW10_CS13, SW10_CS14, SW10_CS15}, // 110, LED 10 + {1, SW1_CS16, SW1_CS17, SW1_CS18}, // 111, LED 11 + {1, SW2_CS16, SW2_CS17, SW2_CS18}, // 112, LED 12 + {1, SW3_CS16, SW3_CS17, SW3_CS18}, // 113, LED 13 + {1, SW4_CS16, SW4_CS17, SW4_CS18}, // 114, LED 14 + {1, SW5_CS16, SW5_CS17, SW5_CS18}, // 115, LED 15 + {1, SW6_CS16, SW6_CS17, SW6_CS18}, // 116, LED 16 + {1, SW7_CS16, SW7_CS17, SW7_CS18}, // 117, LED 17 + {1, SW8_CS16, SW8_CS17, SW8_CS18}, // 118, LED 18 + {1, SW9_CS16, SW9_CS17, SW9_CS18}, // 119, LED 19 + {1, SW10_CS16, SW10_CS17, SW10_CS18} // 120, LED 20 }; #define __ NO_LED |