summaryrefslogtreecommitdiff
path: root/keyboards/melgeek/mj64
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/melgeek/mj64')
-rw-r--r--keyboards/melgeek/mj64/config.h55
-rw-r--r--keyboards/melgeek/mj64/info.json51
-rw-r--r--keyboards/melgeek/mj64/rev1/config.h20
-rw-r--r--keyboards/melgeek/mj64/rev1/info.json3
-rw-r--r--keyboards/melgeek/mj64/rev1/rev1.c137
-rw-r--r--keyboards/melgeek/mj64/rev2/config.h20
-rw-r--r--keyboards/melgeek/mj64/rev2/info.json3
-rw-r--r--keyboards/melgeek/mj64/rev2/rev2.c142
-rw-r--r--keyboards/melgeek/mj64/rev3/config.h20
-rw-r--r--keyboards/melgeek/mj64/rev3/info.json3
-rw-r--r--keyboards/melgeek/mj64/rev3/rev3.c152
11 files changed, 257 insertions, 349 deletions
diff --git a/keyboards/melgeek/mj64/config.h b/keyboards/melgeek/mj64/config.h
index 704699ece9..010e035e2e 100644
--- a/keyboards/melgeek/mj64/config.h
+++ b/keyboards/melgeek/mj64/config.h
@@ -16,58 +16,5 @@
#pragma once
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_LED_PROCESS_LIMIT 4
-#define RGB_MATRIX_LED_FLUSH_LIMIT 26
-// 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 RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+#define IS31FL3741_SDB_PIN A2
diff --git a/keyboards/melgeek/mj64/info.json b/keyboards/melgeek/mj64/info.json
index cbc73a262a..731996ef84 100644
--- a/keyboards/melgeek/mj64/info.json
+++ b/keyboards/melgeek/mj64/info.json
@@ -12,6 +12,57 @@
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C",
"debounce": 3,
+ "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,
+ "solid_splash": true
+ },
+ "default": {
+ "animation": "cycle_all"
+ },
+ "driver": "is31fl3741",
+ "led_flush_limit": 26,
+ "led_process_limit": 4,
+ "sleep": true
+ },
"community_layouts": ["64_ansi"],
"layouts": {
"LAYOUT_64_ansi": {
diff --git a/keyboards/melgeek/mj64/rev1/config.h b/keyboards/melgeek/mj64/rev1/config.h
deleted file mode 100644
index ab8fcd6e09..0000000000
--- a/keyboards/melgeek/mj64/rev1/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGB_MATRIX_LED_COUNT 66
-#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj64/rev1/info.json b/keyboards/melgeek/mj64/rev1/info.json
index 705023fb8e..67a4a004d6 100644
--- a/keyboards/melgeek/mj64/rev1/info.json
+++ b/keyboards/melgeek/mj64/rev1/info.json
@@ -1,7 +1,4 @@
{
- "rgb_matrix": {
- "driver": "is31fl3741"
- },
"matrix_pins": {
"cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
"rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj64/rev1/rev1.c b/keyboards/melgeek/mj64/rev1/rev1.c
index fff946b20a..b9609cad1e 100644
--- a/keyboards/melgeek/mj64/rev1/rev1.c
+++ b/keyboards/melgeek/mj64/rev1/rev1.c
@@ -18,71 +18,71 @@
#ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
};
led_config_t g_led_config = {
@@ -116,11 +116,4 @@ void suspend_wakeup_init_kb(void) {
rgb_matrix_set_suspend_state(false);
suspend_wakeup_init_user();
}
-
-void keyboard_pre_init_kb(void) {
- setPinOutput(A2);
- writePinHigh(A2);
- keyboard_pre_init_user();
-}
-
#endif
diff --git a/keyboards/melgeek/mj64/rev2/config.h b/keyboards/melgeek/mj64/rev2/config.h
deleted file mode 100644
index ab8fcd6e09..0000000000
--- a/keyboards/melgeek/mj64/rev2/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGB_MATRIX_LED_COUNT 66
-#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj64/rev2/info.json b/keyboards/melgeek/mj64/rev2/info.json
index 705023fb8e..67a4a004d6 100644
--- a/keyboards/melgeek/mj64/rev2/info.json
+++ b/keyboards/melgeek/mj64/rev2/info.json
@@ -1,7 +1,4 @@
{
- "rgb_matrix": {
- "driver": "is31fl3741"
- },
"matrix_pins": {
"cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
"rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj64/rev2/rev2.c b/keyboards/melgeek/mj64/rev2/rev2.c
index 35da35b2e4..16c8e1f612 100644
--- a/keyboards/melgeek/mj64/rev2/rev2.c
+++ b/keyboards/melgeek/mj64/rev2/rev2.c
@@ -18,73 +18,73 @@
#ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB62 */
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB63 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */
+ {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
};
led_config_t g_led_config = {
@@ -119,12 +119,4 @@ void suspend_wakeup_init_kb(void) {
rgb_matrix_set_suspend_state(false);
suspend_wakeup_init_user();
}
-
-void keyboard_pre_init_kb(void) {
- setPinOutput(A2);
- writePinHigh(A2);
- keyboard_pre_init_user();
-}
-
#endif
-
diff --git a/keyboards/melgeek/mj64/rev3/config.h b/keyboards/melgeek/mj64/rev3/config.h
deleted file mode 100644
index a5a1fbf3e0..0000000000
--- a/keyboards/melgeek/mj64/rev3/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define RGB_MATRIX_LED_COUNT 72
-#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/melgeek/mj64/rev3/info.json b/keyboards/melgeek/mj64/rev3/info.json
index 62b2c58f15..62c5827117 100644
--- a/keyboards/melgeek/mj64/rev3/info.json
+++ b/keyboards/melgeek/mj64/rev3/info.json
@@ -1,7 +1,4 @@
{
- "rgb_matrix": {
- "driver": "is31fl3741"
- },
"matrix_pins": {
"cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
"rows": ["B12", "B11", "B10", "B1", "A3"]
diff --git a/keyboards/melgeek/mj64/rev3/rev3.c b/keyboards/melgeek/mj64/rev3/rev3.c
index 942bda1487..7af80c7388 100644
--- a/keyboards/melgeek/mj64/rev3/rev3.c
+++ b/keyboards/melgeek/mj64/rev3/rev3.c
@@ -18,79 +18,79 @@
#ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB3 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB4 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB5 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB6 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB7 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB2 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB48 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB46 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB49 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB50 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB51 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB52 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB53 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB16 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB12 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB17 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB13 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB14 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB18 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB15 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB47 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB60 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB61 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB21 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB22 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB26 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB23 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB24 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB25 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB56 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB57 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB62 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB58 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB63 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB35 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB32 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB33 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB34 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB40 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB43 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB38 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB44 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB45 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB39 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB42 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB72 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB3 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB4 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB5 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB6 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB7 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB2 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB48 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB46 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB49 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB50 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB51 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB52 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB53 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB16 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB12 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB17 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB13 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB14 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB18 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB15 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB47 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB60 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB61 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB21 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB19 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB22 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB26 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB23 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB24 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB25 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB56 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB57 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB62 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB58 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB63 */
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB59 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB35 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB32 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB33 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB34 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
+ {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB40 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB43 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB38 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB44 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB45 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB39 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
+ {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */
};
led_config_t g_led_config = {
@@ -126,9 +126,3 @@ void suspend_wakeup_init_kb(void) {
suspend_wakeup_init_user();
}
#endif
-
-void keyboard_pre_init_kb(void) {
- setPinOutput(A2);
- writePinHigh(A2);
- keyboard_pre_init_user();
-}