From 2aab8a114e559cecd4aecbcaf79172f8728262f3 Mon Sep 17 00:00:00 2001 From: MelGeek <65591833+melgeek001365@users.noreply.github.com> Date: Mon, 19 Apr 2021 12:02:13 +0800 Subject: [PATCH] [Keyboard] Update MJ61 architecture to support multi version (#11787) Co-authored-by: Ryan Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre --- keyboards/melgeek/mj61/config.h | 32 +++++++ keyboards/melgeek/mj61/mj61.c | 107 --------------------- keyboards/melgeek/mj61/rev1/config.h | 31 ------- keyboards/melgeek/mj61/rev1/rev1.c | 124 +++++++++++++++++++++++++ keyboards/melgeek/mj61/rev1/rules.mk | 2 + keyboards/melgeek/mj61/rev2/config.h | 39 ++++++++ keyboards/melgeek/mj61/rev2/rev2.c | 134 +++++++++++++++++++++++++++ keyboards/melgeek/mj61/rev2/rules.mk | 23 +++++ 8 files changed, 354 insertions(+), 138 deletions(-) create mode 100644 keyboards/melgeek/mj61/rev1/rev1.c create mode 100644 keyboards/melgeek/mj61/rev2/config.h create mode 100644 keyboards/melgeek/mj61/rev2/rev2.c create mode 100644 keyboards/melgeek/mj61/rev2/rules.mk diff --git a/keyboards/melgeek/mj61/config.h b/keyboards/melgeek/mj61/config.h index 452b1c872..164c04fb5 100644 --- a/keyboards/melgeek/mj61/config.h +++ b/keyboards/melgeek/mj61/config.h @@ -17,3 +17,35 @@ #pragma once #include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xEDED +#define PRODUCT_ID 0xED61 +#define DEVICE_VER 0x0001 +#define MANUFACTURER MelGeek +#define PRODUCT MJ61 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 3 + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + +#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects +#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended +#define RGB_MATRIX_KEYPRESSES +#define RGB_MATRIX_LED_PROCESS_LIMIT 4 +#define RGB_MATRIX_LED_FLUSH_LIMIT 26 +#define DISABLE_RGB_MATRIX_SPLASH +#define DISABLE_RGB_MATRIX_MULTISPLASH +#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH +//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR +#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL +#define DRIVER_ADDR_1 0b0110000 +#define DRIVER_ADDR_2 0b0110000 // this is here for compliancy reasons. +#define DRIVER_COUNT 1 diff --git a/keyboards/melgeek/mj61/mj61.c b/keyboards/melgeek/mj61/mj61.c index 21853019f..a3aa29676 100644 --- a/keyboards/melgeek/mj61/mj61.c +++ b/keyboards/melgeek/mj61/mj61.c @@ -15,110 +15,3 @@ */ #include "mj61.h" - -#ifdef RGB_MATRIX_ENABLE -const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { - {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB1 */ - {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB2 */ - {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB3 */ - {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB4 */ - {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB5 */ - {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB6 */ - {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB7 */ - {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB8 */ - {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB9 */ - {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB10 */ - {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB11 */ - {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB12 */ - {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB13 */ - {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB14 */ - {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB15 */ - {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB16 */ - {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB17 */ - {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB18 */ - {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB19 */ - {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB20 */ - {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB21 */ - {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB22 */ - {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB23 */ - {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB24 */ - {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB25 */ - {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB26 */ - {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB27 */ - {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB28 */ - {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB29 */ - {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB30 */ - {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB31 */ - {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB32 */ - {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB33 */ - {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB34 */ - {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB35 */ - {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB36 */ - {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB37 */ - {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB38 */ - {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB39 */ - {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB40 */ - {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB41 */ - {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB42 */ - {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB43 */ - {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB44 */ - {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB45 */ - {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB46 */ - {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB47 */ - {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB48 */ - {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB49 */ - {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB50 */ - {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB51 */ - {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB52 */ - {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB53 */ - {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB54 */ - {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB55 */ - {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB56 */ - {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB57 */ - {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB58 */ - {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB59 */ - {0, CS30_SW6, CS29_SW6, CS28_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 */ -}; - -led_config_t g_led_config = { - { - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */ - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, /* R0 */ - { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, /* R1 */ - { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NO_LED,}, /* R2 */ - { 52, NO_LED, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, NO_LED }, /* R3 */ - { 53, 54, NO_LED, 55, 61, 56, 62, NO_LED, NO_LED, 57, 58, 59, 60, NO_LED }, /* R4 */ - }, { - {0, 0}, {16, 0}, {32, 0}, {48, 0}, {64, 0}, {80, 0}, {96, 0}, {112, 0}, {128, 0}, {144, 0}, {160, 0}, {176, 0}, {192, 0}, {208, 0}, - {0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16}, - {0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, - {0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, - {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, - }, { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - } -}; - -void suspend_power_down_kb(void) { - rgb_matrix_set_suspend_state(true); - suspend_power_down_user(); -} - -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/mj61/rev1/config.h b/keyboards/melgeek/mj61/rev1/config.h index a0ba953b0..9586a6930 100644 --- a/keyboards/melgeek/mj61/rev1/config.h +++ b/keyboards/melgeek/mj61/rev1/config.h @@ -16,17 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xED61 -#define DEVICE_VER 0x0001 -#define MANUFACTURER MelGeek -#define PRODUCT MJ61 - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 14 - /* * Keyboard Matrix Assignments * @@ -45,26 +34,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 3 - -/* disable these deprecated features by default */ -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION - -#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects -#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended -#define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_LED_PROCESS_LIMIT 4 -#define RGB_MATRIX_LED_FLUSH_LIMIT 26 -#define DISABLE_RGB_MATRIX_SPLASH -#define DISABLE_RGB_MATRIX_MULTISPLASH -#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH -//#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR -#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL -#define DRIVER_ADDR_1 0b0110000 -#define DRIVER_ADDR_2 0b0110000 // this is here for compliancy reasons. -#define DRIVER_COUNT 1 #define DRIVER_1_LED_TOTAL 63 #define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL #define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj61/rev1/rev1.c b/keyboards/melgeek/mj61/rev1/rev1.c new file mode 100644 index 000000000..be58f57a9 --- /dev/null +++ b/keyboards/melgeek/mj61/rev1/rev1.c @@ -0,0 +1,124 @@ +/* Copyright 2020 MelGeek + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "mj61.h" + +#ifdef RGB_MATRIX_ENABLE +const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { + {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB1 */ + {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB2 */ + {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB3 */ + {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB4 */ + {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB5 */ + {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB6 */ + {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB7 */ + {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB8 */ + {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB9 */ + {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB10 */ + {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB11 */ + {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB12 */ + {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB13 */ + {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB14 */ + {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB15 */ + {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB16 */ + {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB17 */ + {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB18 */ + {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB19 */ + {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB20 */ + {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB21 */ + {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB22 */ + {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB23 */ + {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB24 */ + {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB25 */ + {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB26 */ + {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB27 */ + {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB28 */ + {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB29 */ + {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB30 */ + {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB31 */ + {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB32 */ + {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB33 */ + {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB34 */ + {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB35 */ + {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB36 */ + {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB37 */ + {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB38 */ + {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB39 */ + {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB40 */ + {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB41 */ + {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB42 */ + {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB43 */ + {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB44 */ + {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB45 */ + {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB46 */ + {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB47 */ + {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB48 */ + {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB49 */ + {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB50 */ + {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB51 */ + {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB52 */ + {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB53 */ + {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB54 */ + {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB55 */ + {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB56 */ + {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB57 */ + {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB58 */ + {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB59 */ + {0, CS30_SW6, CS29_SW6, CS28_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 */ +}; + +led_config_t g_led_config = { + { + /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */ + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, /* R0 */ + { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, /* R1 */ + { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NO_LED,}, /* R2 */ + { 52, NO_LED, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, NO_LED }, /* R3 */ + { 53, 54, NO_LED, 55, 61, 56, 62, NO_LED, NO_LED, 57, 58, 59, 60, NO_LED }, /* R4 */ + }, { + {0, 0}, {16, 0}, {32, 0}, {48, 0}, {64, 0}, {80, 0}, {96, 0}, {112, 0}, {128, 0}, {144, 0}, {160, 0}, {176, 0}, {192, 0}, {208, 0}, + {0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16}, + {0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, + {0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, + {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, + }, { + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + } +}; + +void suspend_power_down_kb(void) { + rgb_matrix_set_suspend_state(true); + suspend_power_down_user(); +} + +void suspend_wakeup_init_kb(void) { + rgb_matrix_set_suspend_state(false); + suspend_wakeup_init_user(); +} +#endif + +void keyboard_pre_init_kb(void) { + setPinOutput(A2); + writePinHigh(A2); + keyboard_pre_init_user(); +} diff --git a/keyboards/melgeek/mj61/rev1/rules.mk b/keyboards/melgeek/mj61/rev1/rules.mk index 6f196e884..31a770cfb 100644 --- a/keyboards/melgeek/mj61/rev1/rules.mk +++ b/keyboards/melgeek/mj61/rev1/rules.mk @@ -20,3 +20,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth RGB_MATRIX_ENABLE = yes # Use RGB matrix RGB_MATRIX_DRIVER = IS31FL3741 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in + +LAYOUTS = 60_ansi diff --git a/keyboards/melgeek/mj61/rev2/config.h b/keyboards/melgeek/mj61/rev2/config.h new file mode 100644 index 000000000..e6c6e9610 --- /dev/null +++ b/keyboards/melgeek/mj61/rev2/config.h @@ -0,0 +1,39 @@ +/* Copyright 2020 MelGeek + * + * 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 . + */ + +#pragma once + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ + +#define MATRIX_ROW_PINS { B12, B11, B10, B1, A3 } +#define MATRIX_COL_PINS { B15, A8, B13, A15, B3, B4, B5, B8, B9, C13, C14, C15, A0, A1 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION COL2ROW + +#define DRIVER_1_LED_TOTAL 71 +#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL +#define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/melgeek/mj61/rev2/rev2.c b/keyboards/melgeek/mj61/rev2/rev2.c new file mode 100644 index 000000000..236b00397 --- /dev/null +++ b/keyboards/melgeek/mj61/rev2/rev2.c @@ -0,0 +1,134 @@ +/* Copyright 2020 MelGeek + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "mj61.h" + +#ifdef RGB_MATRIX_ENABLE + + +const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { + {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 */ +}; + +led_config_t g_led_config = { + { + /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */ + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14 }, /* R0 */ + { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, /* R1 */ + { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 43, NO_LED }, /* R2 */ + { 46, NO_LED, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 59, NO_LED }, /* R3 */ + { 61, 62, NO_LED, 63, NO_LED, 65, NO_LED, NO_LED, NO_LED, 67, 68, 69, NO_LED, 70 }, /* R4 */ + }, { + {0, 0}, {16, 0}, {32, 0}, {48, 0}, {64, 0}, {80, 0}, {96, 0}, {112, 0}, {128, 0}, {144, 0}, {160, 0}, {176, 0}, {192, 0}, {208, 0}, {224, 0}, {240, 0}, + {0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16}, + {0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32}, {224, 32}, + {0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48}, {224, 48}, {240, 48}, + {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, + }, { + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + } +}; + +void suspend_power_down_kb(void) { + rgb_matrix_set_suspend_state(true); + suspend_power_down_user(); +} + +void suspend_wakeup_init_kb(void) { + rgb_matrix_set_suspend_state(false); + suspend_wakeup_init_user(); +} +#endif + +void keyboard_pre_init_kb(void) { + setPinOutput(A2); + writePinHigh(A2); + keyboard_pre_init_user(); +} diff --git a/keyboards/melgeek/mj61/rev2/rules.mk b/keyboards/melgeek/mj61/rev2/rules.mk new file mode 100644 index 000000000..a4c055805 --- /dev/null +++ b/keyboards/melgeek/mj61/rev2/rules.mk @@ -0,0 +1,23 @@ +# MCU name +MCU = STM32F303 + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +RGB_MATRIX_ENABLE = yes # Use RGB matrix +RGB_MATRIX_DRIVER = IS31FL3741 +NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in + +LAYOUTS = 60_ansi