diff options
author | Joel Challis <[email protected]> | 2024-04-03 23:14:03 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2024-04-03 23:14:03 +0100 |
commit | f29daff9b6ed178d1d9c3bdb5d504ca8782f8d5a (patch) | |
tree | c09e608c552688dbf358dad42470a7369edeedc3 /keyboards/melgeek | |
parent | 62af50ceeff95a49f381130008ed03fdb0cc9362 (diff) | |
download | qmk_firmware-f29daff9b6ed178d1d9c3bdb5d504ca8782f8d5a.tar.gz qmk_firmware-f29daff9b6ed178d1d9c3bdb5d504ca8782f8d5a.zip |
Miscellaneous keyboard.json migrations (#23378)
Diffstat (limited to 'keyboards/melgeek')
-rw-r--r-- | keyboards/melgeek/mj65/rev3/config.h (renamed from keyboards/melgeek/mj65/config.h) | 0 | ||||
-rw-r--r-- | keyboards/melgeek/mj65/rev3/keyboard.json (renamed from keyboards/melgeek/mj65/info.json) | 7 | ||||
-rw-r--r-- | keyboards/melgeek/mj65/rev3/rules.mk | 13 | ||||
-rwxr-xr-x | keyboards/melgeek/mojo68/rev1/config.h | 3 | ||||
-rwxr-xr-x | keyboards/melgeek/mojo68/rev1/keyboard.json (renamed from keyboards/melgeek/mojo68/info.json) | 0 | ||||
-rwxr-xr-x | keyboards/melgeek/mojo68/rev1/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/melgeek/mojo75/rev1/config.h (renamed from keyboards/melgeek/mojo75/config.h) | 0 | ||||
-rw-r--r-- | keyboards/melgeek/mojo75/rev1/keyboard.json (renamed from keyboards/melgeek/mojo75/info.json) | 0 | ||||
-rw-r--r-- | keyboards/melgeek/mojo75/rev1/rules.mk | 1 | ||||
-rwxr-xr-x | keyboards/melgeek/tegic/config.h | 20 | ||||
-rwxr-xr-x | keyboards/melgeek/tegic/rev1/config.h (renamed from keyboards/melgeek/mojo68/config.h) | 0 | ||||
-rw-r--r-- | keyboards/melgeek/tegic/rev1/keyboard.json (renamed from keyboards/melgeek/tegic/info.json) | 0 | ||||
-rwxr-xr-x | keyboards/melgeek/tegic/rev1/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/melgeek/z70ultra/rev1/config.h (renamed from keyboards/melgeek/z70ultra/config.h) | 0 | ||||
-rw-r--r-- | keyboards/melgeek/z70ultra/rev1/keyboard.json (renamed from keyboards/melgeek/z70ultra/info.json) | 0 | ||||
-rw-r--r-- | keyboards/melgeek/z70ultra/rev1/rev1.c (renamed from keyboards/melgeek/z70ultra/z70ultra.c) | 0 | ||||
-rw-r--r-- | keyboards/melgeek/z70ultra/rev1/rules.mk | 1 |
17 files changed, 10 insertions, 37 deletions
diff --git a/keyboards/melgeek/mj65/config.h b/keyboards/melgeek/mj65/rev3/config.h index 010e035e2e..010e035e2e 100644 --- a/keyboards/melgeek/mj65/config.h +++ b/keyboards/melgeek/mj65/rev3/config.h diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/rev3/keyboard.json index 773c9a3198..adf0ef94bc 100644 --- a/keyboards/melgeek/mj65/info.json +++ b/keyboards/melgeek/mj65/rev3/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/melgeek/mj65/rev3/rules.mk b/keyboards/melgeek/mj65/rev3/rules.mk index 7a3d7020d9..8b7f40c50b 100644 --- a/keyboards/melgeek/mj65/rev3/rules.mk +++ b/keyboards/melgeek/mj65/rev3/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -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 -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Use RGB matrix - RGB_MATRIX_SUPPORTED = yes RGBLIGHT_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/melgeek/mojo68/rev1/config.h b/keyboards/melgeek/mojo68/rev1/config.h index 960bf58c52..829eb63fe6 100755 --- a/keyboards/melgeek/mojo68/rev1/config.h +++ b/keyboards/melgeek/mojo68/rev1/config.h @@ -16,4 +16,7 @@ #pragma once +#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND +#define IS31FL3741_SDB_PIN B7 + #define DRIVER_INDICATOR_LED_TOTAL 3 diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/rev1/keyboard.json index b97de4fbd2..b97de4fbd2 100755 --- a/keyboards/melgeek/mojo68/info.json +++ b/keyboards/melgeek/mojo68/rev1/keyboard.json diff --git a/keyboards/melgeek/mojo68/rev1/rules.mk b/keyboards/melgeek/mojo68/rev1/rules.mk deleted file mode 100755 index 6e7633bfe0..0000000000 --- a/keyboards/melgeek/mojo68/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/mojo75/config.h b/keyboards/melgeek/mojo75/rev1/config.h index 010e035e2e..010e035e2e 100644 --- a/keyboards/melgeek/mojo75/config.h +++ b/keyboards/melgeek/mojo75/rev1/config.h diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/rev1/keyboard.json index a1b93afb69..a1b93afb69 100644 --- a/keyboards/melgeek/mojo75/info.json +++ b/keyboards/melgeek/mojo75/rev1/keyboard.json diff --git a/keyboards/melgeek/mojo75/rev1/rules.mk b/keyboards/melgeek/mojo75/rev1/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/melgeek/mojo75/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/tegic/config.h b/keyboards/melgeek/tegic/config.h deleted file mode 100755 index 68088ba745..0000000000 --- a/keyboards/melgeek/tegic/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek <[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/>. - */ - -#pragma once - -#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND -#define IS31FL3741_SDB_PIN B7 diff --git a/keyboards/melgeek/mojo68/config.h b/keyboards/melgeek/tegic/rev1/config.h index 68088ba745..68088ba745 100755 --- a/keyboards/melgeek/mojo68/config.h +++ b/keyboards/melgeek/tegic/rev1/config.h diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/rev1/keyboard.json index 0a2e9306f6..0a2e9306f6 100644 --- a/keyboards/melgeek/tegic/info.json +++ b/keyboards/melgeek/tegic/rev1/keyboard.json diff --git a/keyboards/melgeek/tegic/rev1/rules.mk b/keyboards/melgeek/tegic/rev1/rules.mk deleted file mode 100755 index 6e7633bfe0..0000000000 --- a/keyboards/melgeek/tegic/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/rev1/config.h index 5d5ce04668..5d5ce04668 100644 --- a/keyboards/melgeek/z70ultra/config.h +++ b/keyboards/melgeek/z70ultra/rev1/config.h diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/rev1/keyboard.json index de1b1df646..de1b1df646 100644 --- a/keyboards/melgeek/z70ultra/info.json +++ b/keyboards/melgeek/z70ultra/rev1/keyboard.json diff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/rev1/rev1.c index 1cb46df643..1cb46df643 100644 --- a/keyboards/melgeek/z70ultra/z70ultra.c +++ b/keyboards/melgeek/z70ultra/rev1/rev1.c diff --git a/keyboards/melgeek/z70ultra/rev1/rules.mk b/keyboards/melgeek/z70ultra/rev1/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/melgeek/z70ultra/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank |