From 445ea646991a0ee49f9cd698054584d0774d2409 Mon Sep 17 00:00:00 2001 From: MelGeek <65591833+melgeek001365@users.noreply.github.com> Date: Fri, 5 Feb 2021 14:19:30 +0800 Subject: [Keyboard] Fix the LED's ID of ISSI for MJ64 REV2 (#11760) * Add Z70Ultra which is a Hotsawp RGB 65% keyboard * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: Ryan * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: Ryan * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: Ryan * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan * Update keyboards/melgeek/z70ultra/readme.md Co-authored-by: Ryan * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: Ryan * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: Ryan * 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 * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: Ryan * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: Ryan * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: Ryan * 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 * Update keyboards/melgeek/z70ultra/config.h Co-authored-by: Ryan * 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 * [Keyboard] Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Drashna Jaelre * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Drashna Jaelre * [Keyboard] MJ61 Add license header for files and the link for readme * Update keyboards/melgeek/mj61/readme.md Co-authored-by: Ryan * Update keyboards/melgeek/mj61/rev1/config.h Co-authored-by: Ryan * Update keyboards/melgeek/mj61/rev1/rules.mk Co-authored-by: Ryan * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Ryan * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Ryan * 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 * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre * Fix the LED's ID of ISSI for MJ64 REV2 Co-authored-by: Ryan Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre --- keyboards/melgeek/mj64/rev2/rev2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/melgeek') diff --git a/keyboards/melgeek/mj64/rev2/rev2.c b/keyboards/melgeek/mj64/rev2/rev2.c index c5334d4487..d5486b9086 100644 --- a/keyboards/melgeek/mj64/rev2/rev2.c +++ b/keyboards/melgeek/mj64/rev2/rev2.c @@ -56,7 +56,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */ {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */ {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */ - {1, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */ + {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 */ -- cgit v1.2.3