diff options
| author | MelGeek <65591833+melgeek001365@users.noreply.github.com> | 2021-02-13 10:34:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 21:34:34 -0500 |
| commit | c2b0bd2a0aabd6da83daffa02c7dd11299f24dd9 (patch) | |
| tree | 281354d09cc37e4e7d20ff67acbd23d777640757 /keyboards/melgeek | |
| parent | 6e74abc643e944dc18d4f53762b52459b7691308 (diff) | |
| download | qmk_firmware-c2b0bd2a0aabd6da83daffa02c7dd11299f24dd9.tar.gz qmk_firmware-c2b0bd2a0aabd6da83daffa02c7dd11299f24dd9.zip | |
[Keyboard] Update MOJO75 to support multi version (#11790)
* Add Z70Ultra which is a Hotsawp RGB 65% keyboard
* Update keyboards/melgeek/z70ultra/z70ultra.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/z70ultra/z70ultra.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/z70ultra/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/z70ultra/rev1/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/z70ultra/z70ultra.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/z70ultra/z70ultra.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/z70ultra/z70ultra.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/z70ultra/z70ultra.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update readme.md
* Update info.json
update the name of layout to consistent the keyboard.
* Update keyboards/melgeek/z70ultra/z70ultra.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/z70ultra/z70ultra.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/z70ultra/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add Z70Ultra
* Support Z70Ultra
[Modified] info.json to support two different layouts
[Add] rules.mk to support default folder
* Update keyboards/melgeek/z70ultra/rev1/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/z70ultra/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* remove excessive arguments from LAYOUT_split_space
* Update keyboards/melgeek/z70ultra/info.json
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/melgeek/z70ultra/info.json
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/melgeek/z70ultra/z70ultra.h
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/melgeek/z70ultra/z70ultra.h
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/melgeek/z70ultra/rev1/rules.mk
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Use macro replace with the literal for CS & SW
* Update keyboards/melgeek/z70ultra/z70ultra.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* [Keyboard] Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard
* Update keyboards/melgeek/mj61/mj61.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/melgeek/mj61/mj61.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* [Keyboard] MJ61 Add license header for files and the link for readme
* Update keyboards/melgeek/mj61/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/mj61/rev1/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/mj61/rev1/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/mj61/mj61.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/melgeek/mj61/mj61.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add GPL for files
* Update keymaps/default/keymap.c
* Update keymaps/via/keymap.c
* Update keyboards/melgeek/z70ultra/z70ultra.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/melgeek/z70ultra/z70ultra.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* [Keyboard] Update MOJO75 to support multi version and Update the LED's
ID of RGB Matrix
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Diffstat (limited to 'keyboards/melgeek')
| -rw-r--r-- | keyboards/melgeek/mojo75/config.h | 33 | ||||
| -rw-r--r-- | keyboards/melgeek/mojo75/rev1/config.h | 32 | ||||
| -rw-r--r-- | keyboards/melgeek/mojo75/rev1/rev1.c | 105 | ||||
| -rw-r--r-- | keyboards/melgeek/mojo75/rev1/rules.mk | 2 |
4 files changed, 88 insertions, 84 deletions
diff --git a/keyboards/melgeek/mojo75/config.h b/keyboards/melgeek/mojo75/config.h index 452b1c872..c1a8083f1 100644 --- a/keyboards/melgeek/mojo75/config.h +++ b/keyboards/melgeek/mojo75/config.h | |||
| @@ -17,3 +17,36 @@ | |||
| 17 | #pragma once | 17 | #pragma once |
| 18 | 18 | ||
| 19 | #include "config_common.h" | 19 | #include "config_common.h" |
| 20 | |||
| 21 | /* USB Device descriptor parameter */ | ||
| 22 | #define VENDOR_ID 0xEDED | ||
| 23 | #define PRODUCT_ID 0x7075 | ||
| 24 | #define DEVICE_VER 0x0001 | ||
| 25 | #define MANUFACTURER MelGeek | ||
| 26 | #define PRODUCT MOJO75 | ||
| 27 | |||
| 28 | /* key matrix size */ | ||
| 29 | #define MATRIX_ROWS 6 | ||
| 30 | #define MATRIX_COLS 16 | ||
| 31 | |||
| 32 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | ||
| 33 | #define DEBOUNCE 3 | ||
| 34 | |||
| 35 | /* disable these deprecated features by default */ | ||
| 36 | #define NO_ACTION_MACRO | ||
| 37 | #define NO_ACTION_FUNCTION | ||
| 38 | |||
| 39 | #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects | ||
| 40 | #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended | ||
| 41 | #define RGB_MATRIX_KEYPRESSES | ||
| 42 | #define RGB_MATRIX_LED_PROCESS_LIMIT 4 | ||
| 43 | #define RGB_MATRIX_LED_FLUSH_LIMIT 26 | ||
| 44 | #define DISABLE_RGB_MATRIX_SPLASH | ||
| 45 | #define DISABLE_RGB_MATRIX_MULTISPLASH | ||
| 46 | #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH | ||
| 47 | //#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR | ||
| 48 | #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL | ||
| 49 | //#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE | ||
| 50 | #define DRIVER_ADDR_1 0b0110000 | ||
| 51 | #define DRIVER_ADDR_2 0b0110000 // this is here for compliancy reasons. | ||
| 52 | #define DRIVER_COUNT 1 | ||
diff --git a/keyboards/melgeek/mojo75/rev1/config.h b/keyboards/melgeek/mojo75/rev1/config.h index bc5758db2..c841c96fd 100644 --- a/keyboards/melgeek/mojo75/rev1/config.h +++ b/keyboards/melgeek/mojo75/rev1/config.h | |||
| @@ -16,17 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #pragma once | 17 | #pragma once |
| 18 | 18 | ||
| 19 | /* USB Device descriptor parameter */ | ||
| 20 | #define VENDOR_ID 0xEDED | ||
| 21 | #define PRODUCT_ID 0x7075 | ||
| 22 | #define DEVICE_VER 0x0001 | ||
| 23 | #define MANUFACTURER MelGeek | ||
| 24 | #define PRODUCT MOJO75 | ||
| 25 | |||
| 26 | /* key matrix size */ | ||
| 27 | #define MATRIX_ROWS 6 | ||
| 28 | #define MATRIX_COLS 16 | ||
| 29 | |||
| 30 | /* | 19 | /* |
| 31 | * Keyboard Matrix Assignments | 20 | * Keyboard Matrix Assignments |
| 32 | * | 21 | * |
| @@ -45,27 +34,6 @@ | |||
| 45 | /* COL2ROW, ROW2COL*/ | 34 | /* COL2ROW, ROW2COL*/ |
| 46 | #define DIODE_DIRECTION COL2ROW | 35 | #define DIODE_DIRECTION COL2ROW |
| 47 | 36 | ||
| 48 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | ||
| 49 | #define DEBOUNCE 3 | ||
| 50 | |||
| 51 | /* disable these deprecated features by default */ | ||
| 52 | #define NO_ACTION_MACRO | ||
| 53 | #define NO_ACTION_FUNCTION | ||
| 54 | |||
| 55 | #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects | ||
| 56 | #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended | ||
| 57 | #define RGB_MATRIX_KEYPRESSES | ||
| 58 | #define RGB_MATRIX_LED_PROCESS_LIMIT 4 | ||
| 59 | #define RGB_MATRIX_LED_FLUSH_LIMIT 26 | ||
| 60 | #define DISABLE_RGB_MATRIX_SPLASH | ||
| 61 | #define DISABLE_RGB_MATRIX_MULTISPLASH | ||
| 62 | #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH | ||
| 63 | //#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR | ||
| 64 | #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL | ||
| 65 | //#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE | ||
| 66 | #define DRIVER_ADDR_1 0b0110000 | ||
| 67 | #define DRIVER_ADDR_2 0b0110000 // this is here for compliancy reasons. | ||
| 68 | #define DRIVER_COUNT 1 | ||
| 69 | #define DRIVER_1_LED_TOTAL 92 | 37 | #define DRIVER_1_LED_TOTAL 92 |
| 70 | #define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL | 38 | #define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL |
| 71 | #define DRIVER_INDICATOR_LED_TOTAL 0 | 39 | #define DRIVER_INDICATOR_LED_TOTAL 0 |
diff --git a/keyboards/melgeek/mojo75/rev1/rev1.c b/keyboards/melgeek/mojo75/rev1/rev1.c index 0e79fdb70..670116fcd 100644 --- a/keyboards/melgeek/mojo75/rev1/rev1.c +++ b/keyboards/melgeek/mojo75/rev1/rev1.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include "mojo75.h" | 17 | #include "mojo75.h" |
| 18 | 18 | ||
| 19 | #ifdef RGB_MATRIX_ENABLE | 19 | #ifdef RGB_MATRIX_ENABLE |
| 20 | |||
| 20 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | 21 | const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { |
| 21 | {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB1 */ | 22 | {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB1 */ |
| 22 | {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB2 */ | 23 | {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB2 */ |
| @@ -27,6 +28,13 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 27 | {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* RGB7 */ | 28 | {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* RGB7 */ |
| 28 | {0, CS6_SW8, CS5_SW8, CS4_SW8}, /* RGB8 */ | 29 | {0, CS6_SW8, CS5_SW8, CS4_SW8}, /* RGB8 */ |
| 29 | {0, CS6_SW9, CS5_SW9, CS4_SW9}, /* RGB9 */ | 30 | {0, CS6_SW9, CS5_SW9, CS4_SW9}, /* RGB9 */ |
| 31 | {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB55 */ | ||
| 32 | {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB56 */ | ||
| 33 | {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB57 */ | ||
| 34 | {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB58 */ | ||
| 35 | {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB59 */ | ||
| 36 | {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB60 */ | ||
| 37 | {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB61 */ | ||
| 30 | {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB10 */ | 38 | {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB10 */ |
| 31 | {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB11 */ | 39 | {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB11 */ |
| 32 | {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB12 */ | 40 | {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB12 */ |
| @@ -36,6 +44,14 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 36 | {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB16 */ | 44 | {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB16 */ |
| 37 | {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB17 */ | 45 | {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB17 */ |
| 38 | {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB18 */ | 46 | {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB18 */ |
| 47 | {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB62 */ | ||
| 48 | {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB63 */ | ||
| 49 | {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB64 */ | ||
| 50 | {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB65 */ | ||
| 51 | {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB66 */ | ||
| 52 | {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB67 */ | ||
| 53 | {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB68 */ | ||
| 54 | {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB69 */ | ||
| 39 | {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB19 */ | 55 | {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB19 */ |
| 40 | {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB20 */ | 56 | {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB20 */ |
| 41 | {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB21 */ | 57 | {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB21 */ |
| @@ -45,6 +61,12 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 45 | {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB25 */ | 61 | {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB25 */ |
| 46 | {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB26 */ | 62 | {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB26 */ |
| 47 | {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB27 */ | 63 | {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB27 */ |
| 64 | {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB70 */ | ||
| 65 | {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB71 */ | ||
| 66 | {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB72 */ | ||
| 67 | {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB86 */ | ||
| 68 | {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB73 */ | ||
| 69 | {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB74 */ | ||
| 48 | {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB28 */ | 70 | {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB28 */ |
| 49 | {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB29 */ | 71 | {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB29 */ |
| 50 | {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB30 */ | 72 | {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB30 */ |
| @@ -54,6 +76,13 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 54 | {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB34 */ | 76 | {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB34 */ |
| 55 | {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB35 */ | 77 | {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB35 */ |
| 56 | {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB36 */ | 78 | {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB36 */ |
| 79 | {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB75 */ | ||
| 80 | {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB76 */ | ||
| 81 | {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB77 */ | ||
| 82 | {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB78 */ | ||
| 83 | {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB79 */ | ||
| 84 | {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB80 */ | ||
| 85 | {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB91 */ | ||
| 57 | {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB37 */ | 86 | {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB37 */ |
| 58 | {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB38 */ | 87 | {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB38 */ |
| 59 | {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB39 */ | 88 | {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB39 */ |
| @@ -63,6 +92,13 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 63 | {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB43 */ | 92 | {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB43 */ |
| 64 | {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB44 */ | 93 | {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB44 */ |
| 65 | {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB45 */ | 94 | {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB45 */ |
| 95 | {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB84 */ | ||
| 96 | {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB83 */ | ||
| 97 | {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB82 */ | ||
| 98 | {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */ | ||
| 99 | {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB81 */ | ||
| 100 | {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB87 */ | ||
| 101 | {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB89 */ | ||
| 66 | {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB46 */ | 102 | {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB46 */ |
| 67 | {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB47 */ | 103 | {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB47 */ |
| 68 | {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB48 */ | 104 | {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB48 */ |
| @@ -72,69 +108,34 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { | |||
| 72 | {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB52 */ | 108 | {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB52 */ |
| 73 | {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB53 */ | 109 | {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB53 */ |
| 74 | {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB54 */ | 110 | {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB54 */ |
| 75 | {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB55 */ | ||
| 76 | {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB56 */ | ||
| 77 | {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB57 */ | ||
| 78 | {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB58 */ | ||
| 79 | {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB59 */ | ||
| 80 | {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB60 */ | ||
| 81 | {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB61 */ | ||
| 82 | {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB62 */ | ||
| 83 | {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB63 */ | ||
| 84 | {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB64 */ | ||
| 85 | {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB65 */ | ||
| 86 | {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB66 */ | ||
| 87 | {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB67 */ | ||
| 88 | {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB68 */ | ||
| 89 | {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB69 */ | ||
| 90 | {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB70 */ | ||
| 91 | {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB71 */ | ||
| 92 | {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB72 */ | ||
| 93 | {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB73 */ | ||
| 94 | {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB74 */ | ||
| 95 | {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB75 */ | ||
| 96 | {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB76 */ | ||
| 97 | {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB77 */ | ||
| 98 | {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB78 */ | ||
| 99 | {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB79 */ | ||
| 100 | {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB80 */ | ||
| 101 | {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB81 */ | ||
| 102 | {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB82 */ | ||
| 103 | {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB83 */ | ||
| 104 | {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB84 */ | ||
| 105 | {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */ | ||
| 106 | {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB86 */ | ||
| 107 | {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB87 */ | ||
| 108 | {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB89 */ | ||
| 109 | {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB88 */ | 111 | {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB88 */ |
| 110 | {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB90 */ | ||
| 111 | {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB91 */ | ||
| 112 | {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB92 */ | 112 | {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB92 */ |
| 113 | {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB90 */ | ||
| 113 | }; | 114 | }; |
| 114 | 115 | ||
| 115 | led_config_t g_led_config = { | 116 | led_config_t g_led_config = { |
| 116 | { | 117 | { |
| 117 | /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15 */ | 118 | /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15 */ |
| 118 | { 0, 1, 2, 3, 4, 5, 6, 7, 8, 54, 55, 56, 57, 58, 59, 60 }, /* R0 */ | 119 | { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, /* R0 */ |
| 119 | { 9, 10, 11, 12, 13, 14, 15, 16, 17, 61, 62, 63, 64, 66, 67, 68 }, /* R1 */ | 120 | { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 30, NO_LED, 32 }, /* R1 */ |
| 120 | { 18, 19, 20, 21, 22, 23, 24, 25, 26, 69, 70, 71, 85, 72, 65,/*?*/ 73 }, /* R2 */ | 121 | { 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, NO_LED, 47 }, /* R2 */ |
| 121 | { 27, 28, 29, 30, 31, 32, 33, 34, 35, 74, 75, 76, 77, 78, 79, 90 }, /* R3 */ | 122 | { 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, NO_LED, 61, NO_LED, 63 }, /* R3 */ |
| 122 | { 36, 37, 38, 39, 40, 41, 42, 43, 44, 83, 82, 81, 84, 80, 86, 88 }, /* R4 */ | 123 | { 65, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, NO_LED, 77, NO_LED, 78, 79 }, /* R4 */ |
| 123 | { 45, 46, 47, 48, 49, NO_LED, NO_LED, 50, NO_LED, NO_LED, 51, 52, 53, 87, 91, 89 }, /* R5 */ | 124 | { 80, 81, 82, NO_LED, NO_LED, 84, NO_LED, NO_LED, NO_LED, 86, 87, NO_LED, 88, 89, 90, 91 }, /* R5 */ |
| 124 | }, { | 125 | }, { |
| 125 | {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}, | 126 | {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}, |
| 126 | {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}, {224, 16}, {240, 16}, | 127 | {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}, {224, 16}, {240, 16}, {255, 16}, |
| 127 | {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}, {240, 32}, | 128 | {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}, |
| 128 | {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}, | 129 | {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}, |
| 129 | {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, {160, 64}, {176, 64}, {192, 64}, {208, 64}, {224, 64}, {240, 64}, | 130 | {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, {160, 64}, {176, 64}, {192, 64}, {208, 64}, {224, 64}, {240, 64}, |
| 130 | {0, 80}, {16, 80}, {32, 80}, {48, 80}, {64, 80}, {80, 80}, {96, 80}, {112, 80}, {128, 80}, {144, 80}, {160, 80}, {176, 80}, | 131 | {0, 80}, {16, 80}, {32, 80}, {48, 80}, {64, 80}, {80, 80}, {96, 80}, {112, 80}, {128, 80}, {144, 80}, {160, 80}, {176, 80}, |
| 131 | }, { | 132 | }, { |
| 132 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, | 133 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, |
| 133 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, | 134 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, |
| 134 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, | 135 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, |
| 135 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, | 136 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, |
| 136 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, | 137 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, |
| 137 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, | 138 | 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, |
| 138 | } | 139 | } |
| 139 | }; | 140 | }; |
| 140 | 141 | ||
diff --git a/keyboards/melgeek/mojo75/rev1/rules.mk b/keyboards/melgeek/mojo75/rev1/rules.mk index 12c66f05a..5822103ca 100644 --- a/keyboards/melgeek/mojo75/rev1/rules.mk +++ b/keyboards/melgeek/mojo75/rev1/rules.mk | |||
| @@ -19,3 +19,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth | |||
| 19 | RGB_MATRIX_ENABLE = yes # Use RGB matrix | 19 | RGB_MATRIX_ENABLE = yes # Use RGB matrix |
| 20 | RGB_MATRIX_DRIVER = IS31FL3741 | 20 | RGB_MATRIX_DRIVER = IS31FL3741 |
| 21 | NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in | 21 | NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in |
| 22 | |||
| 23 | LAYOUTS = 75_ansi | ||
