aboutsummaryrefslogtreecommitdiff
path: root/keyboards/gmmk
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/gmmk')
-rw-r--r--keyboards/gmmk/gmmk2/p65/ansi/keyboard.json (renamed from keyboards/gmmk/gmmk2/p65/ansi/info.json)9
-rw-r--r--keyboards/gmmk/gmmk2/p65/ansi/rules.mk13
-rw-r--r--keyboards/gmmk/gmmk2/p65/iso/keyboard.json (renamed from keyboards/gmmk/gmmk2/p65/iso/info.json)9
-rw-r--r--keyboards/gmmk/gmmk2/p65/iso/rules.mk13
-rw-r--r--keyboards/gmmk/gmmk2/p96/ansi/ansi.c6
-rw-r--r--keyboards/gmmk/gmmk2/p96/ansi/keyboard.json (renamed from keyboards/gmmk/gmmk2/p96/ansi/info.json)9
-rw-r--r--keyboards/gmmk/gmmk2/p96/ansi/rules.mk13
-rw-r--r--keyboards/gmmk/gmmk2/p96/iso/iso.c6
-rw-r--r--keyboards/gmmk/gmmk2/p96/iso/keyboard.json (renamed from keyboards/gmmk/gmmk2/p96/iso/info.json)9
-rw-r--r--keyboards/gmmk/gmmk2/p96/iso/rules.mk13
-rw-r--r--keyboards/gmmk/numpad/keyboard.json (renamed from keyboards/gmmk/numpad/info.json)17
-rw-r--r--keyboards/gmmk/numpad/matrix.c21
-rw-r--r--keyboards/gmmk/numpad/numpad.c4
-rw-r--r--keyboards/gmmk/numpad/rules.mk20
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keyboard.json (renamed from keyboards/gmmk/pro/rev1/ansi/info.json)10
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/rules.mk14
-rw-r--r--keyboards/gmmk/pro/rev1/iso/keyboard.json (renamed from keyboards/gmmk/pro/rev1/iso/info.json)10
-rw-r--r--keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c2
-rw-r--r--keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c2
-rw-r--r--keyboards/gmmk/pro/rev1/iso/rules.mk14
-rw-r--r--keyboards/gmmk/pro/rev2/ansi/keyboard.json (renamed from keyboards/gmmk/pro/rev2/ansi/info.json)10
-rw-r--r--keyboards/gmmk/pro/rev2/ansi/rules.mk14
-rw-r--r--keyboards/gmmk/pro/rev2/iso/keyboard.json (renamed from keyboards/gmmk/pro/rev2/iso/info.json)10
-rw-r--r--keyboards/gmmk/pro/rev2/iso/rules.mk17
26 files changed, 113 insertions, 156 deletions
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/keyboard.json
index 2d2230a3b9..a5c4c92552 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p65/ansi/keyboard.json
@@ -11,6 +11,15 @@
"qmk": {
"tap_keycode_delay": 10
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
"rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"]
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk b/keyboards/gmmk/gmmk2/p65/ansi/rules.mk
deleted file mode 100644
index 2d2e9895fd..0000000000
--- a/keyboards/gmmk/gmmk2/p65/ansi/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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 NKRO Rollover.
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality.
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow.
-AUDIO_ENABLE = no # Audio output.
-RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
diff --git a/keyboards/gmmk/gmmk2/p65/iso/info.json b/keyboards/gmmk/gmmk2/p65/iso/keyboard.json
index aa31b50f61..a4576c8c7f 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p65/iso/keyboard.json
@@ -11,6 +11,15 @@
"qmk": {
"tap_keycode_delay": 10
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
"rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8"]
diff --git a/keyboards/gmmk/gmmk2/p65/iso/rules.mk b/keyboards/gmmk/gmmk2/p65/iso/rules.mk
deleted file mode 100644
index 2d2e9895fd..0000000000
--- a/keyboards/gmmk/gmmk2/p65/iso/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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 NKRO Rollover.
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality.
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow.
-AUDIO_ENABLE = no # Audio output.
-RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
index d60b9e2254..5b2b5893f7 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
@@ -317,9 +317,9 @@ void spi_init(void) {
is_initialised = true;
// Try releasing special pins for a short time
- setPinInput(SPI_SCK_PIN);
- setPinInput(SPI_MOSI_PIN);
- setPinInput(SPI_MISO_PIN);
+ gpio_set_pin_input(SPI_SCK_PIN);
+ gpio_set_pin_input(SPI_MOSI_PIN);
+ gpio_set_pin_input(SPI_MISO_PIN);
chThdSleepMilliseconds(10);
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/keyboard.json
index d7e0e38ceb..8fd81ba1a0 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/info.json
+++ b/keyboards/gmmk/gmmk2/p96/ansi/keyboard.json
@@ -11,6 +11,15 @@
"qmk": {
"tap_keycode_delay": 10
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
"rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"]
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/rules.mk b/keyboards/gmmk/gmmk2/p96/ansi/rules.mk
deleted file mode 100644
index 2d2e9895fd..0000000000
--- a/keyboards/gmmk/gmmk2/p96/ansi/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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 NKRO Rollover.
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality.
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow.
-AUDIO_ENABLE = no # Audio output.
-RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
diff --git a/keyboards/gmmk/gmmk2/p96/iso/iso.c b/keyboards/gmmk/gmmk2/p96/iso/iso.c
index af2ee17c4a..9a5c357307 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/iso.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/iso.c
@@ -313,9 +313,9 @@ void spi_init(void) {
is_initialised = true;
// Try releasing special pins for a short time
- setPinInput(SPI_SCK_PIN);
- setPinInput(SPI_MOSI_PIN);
- setPinInput(SPI_MISO_PIN);
+ gpio_set_pin_input(SPI_SCK_PIN);
+ gpio_set_pin_input(SPI_MOSI_PIN);
+ gpio_set_pin_input(SPI_MISO_PIN);
chThdSleepMilliseconds(10);
diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/keyboard.json
index c5079a22dd..040b6f9c6f 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/info.json
+++ b/keyboards/gmmk/gmmk2/p96/iso/keyboard.json
@@ -11,6 +11,15 @@
"qmk": {
"tap_keycode_delay": 10
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
"rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B11", "B12", "B13"]
diff --git a/keyboards/gmmk/gmmk2/p96/iso/rules.mk b/keyboards/gmmk/gmmk2/p96/iso/rules.mk
deleted file mode 100644
index 2d2e9895fd..0000000000
--- a/keyboards/gmmk/gmmk2/p96/iso/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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 NKRO Rollover.
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality.
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow.
-AUDIO_ENABLE = no # Audio output.
-RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/keyboard.json
index 63ae544ad3..70e2d3e679 100644
--- a/keyboards/gmmk/numpad/info.json
+++ b/keyboards/gmmk/numpad/keyboard.json
@@ -6,7 +6,10 @@
"usb": {
"vid": "0x320F",
"pid": "0x5088",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "shared_endpoint": {
+ "keyboard": true
+ }
},
"eeprom": {
"driver": "wear_leveling",
@@ -70,6 +73,18 @@
},
"processor": "WB32F3G71",
"bootloader": "wb32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "encoder": true,
+ "midi": true
+ },
+ "build": {
+ "lto": true
+ },
"diode_direction": "ROW2COL",
"matrix_pins": {
"rows": ["A3", "A4", "A5", "A6", "A7"],
diff --git a/keyboards/gmmk/numpad/matrix.c b/keyboards/gmmk/numpad/matrix.c
index 99adb38f18..4ec41bdb73 100644
--- a/keyboards/gmmk/numpad/matrix.c
+++ b/keyboards/gmmk/numpad/matrix.c
@@ -4,15 +4,12 @@
/*
* scan matrix
*/
-#include <stdint.h>
-#include <stdbool.h>
+#include "matrix.h"
+#include <string.h>
+#include "atomic_util.h"
#include "wait.h"
#include "print.h"
#include "debug.h"
-#include "util.h"
-#include "matrix.h"
-#include "debounce.h"
-#include "quantum.h"
/* matrix state(1:on, 0:off) */
extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values
@@ -24,27 +21,27 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
static inline void setPinOutput_writeLow(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
- setPinOutput(pin);
- writePinLow(pin);
+ gpio_set_pin_output(pin);
+ gpio_write_pin_low(pin);
}
}
static inline void setPinOutput_writeHigh(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
- setPinOutput(pin);
- writePinHigh(pin);
+ gpio_set_pin_output(pin);
+ gpio_write_pin_high(pin);
}
}
static inline void setPinInputHigh_atomic(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
- setPinInputHigh(pin);
+ gpio_set_pin_input_high(pin);
}
}
static inline uint8_t readMatrixPin(pin_t pin) {
if (pin != NO_PIN) {
- return readPin(pin);
+ return gpio_read_pin(pin);
} else {
return 1;
}
diff --git a/keyboards/gmmk/numpad/numpad.c b/keyboards/gmmk/numpad/numpad.c
index 5a2bbdb1f6..cdbc4b871a 100644
--- a/keyboards/gmmk/numpad/numpad.c
+++ b/keyboards/gmmk/numpad/numpad.c
@@ -111,8 +111,8 @@ led_config_t g_led_config = {{
void keyboard_pre_init_user(void) {
wait_ms(2000);
- setPinOutput(AW20216S_PW_EN_PIN);
- writePinHigh(AW20216S_PW_EN_PIN);
+ gpio_set_pin_output(AW20216S_PW_EN_PIN);
+ gpio_write_pin_high(AW20216S_PW_EN_PIN);
}
# endif
diff --git a/keyboards/gmmk/numpad/rules.mk b/keyboards/gmmk/numpad/rules.mk
index d289eb81a4..752b0ce9d0 100644
--- a/keyboards/gmmk/numpad/rules.mk
+++ b/keyboards/gmmk/numpad/rules.mk
@@ -1,23 +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
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-KEYBOARD_SHARED_EP = yes
-MIDI_ENABLE = yes
-
-RGB_MATRIX_ENABLE = yes
-
-LTO_ENABLE = yes
-
ANALOG_DRIVER_REQUIRED = yes
SRC += matrix.c
diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/keyboard.json
index 533a379656..867f7e1d02 100644
--- a/keyboards/gmmk/pro/rev1/ansi/info.json
+++ b/keyboards/gmmk/pro/rev1/ansi/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x5044",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
"rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
index d3c00ad364..95f82d9a3d 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT(
_______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
_______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
+ _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
_______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, RGB_MOD, _______,
_______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c
index 663c827439..f60369ad38 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT(
_______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
_______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
+ _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
_______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, RGB_MOD, _______,
_______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
diff --git a/keyboards/gmmk/pro/rev1/ansi/rules.mk b/keyboards/gmmk/pro/rev1/ansi/rules.mk
deleted file mode 100644
index 6d23fe350a..0000000000
--- a/keyboards/gmmk/pro/rev1/ansi/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/keyboard.json
index 90f66171aa..6eabec96fe 100644
--- a/keyboards/gmmk/pro/rev1/iso/info.json
+++ b/keyboards/gmmk/pro/rev1/iso/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x5044",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
"rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c
index cd0861309a..49752bf6a0 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT(
_______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
- _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
+ _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
_______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, RGB_MOD, _______,
diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c
index bc2134e3de..45625ef85c 100644
--- a/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT(
_______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
- _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
+ _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
_______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, RGB_MOD, _______,
diff --git a/keyboards/gmmk/pro/rev1/iso/rules.mk b/keyboards/gmmk/pro/rev1/iso/rules.mk
deleted file mode 100644
index 6d23fe350a..0000000000
--- a/keyboards/gmmk/pro/rev1/iso/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/keyboard.json
index 5615044316..21bc7df7fb 100644
--- a/keyboards/gmmk/pro/rev2/ansi/info.json
+++ b/keyboards/gmmk/pro/rev2/ansi/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x5044",
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
"rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
diff --git a/keyboards/gmmk/pro/rev2/ansi/rules.mk b/keyboards/gmmk/pro/rev2/ansi/rules.mk
deleted file mode 100644
index 6d23fe350a..0000000000
--- a/keyboards/gmmk/pro/rev2/ansi/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/keyboard.json
index 3b7c0ca544..83d1fd3028 100644
--- a/keyboards/gmmk/pro/rev2/iso/info.json
+++ b/keyboards/gmmk/pro/rev2/iso/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x5044",
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
"rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10"]
diff --git a/keyboards/gmmk/pro/rev2/iso/rules.mk b/keyboards/gmmk/pro/rev2/iso/rules.mk
deleted file mode 100644
index 46eda64be7..0000000000
--- a/keyboards/gmmk/pro/rev2/iso/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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
-# 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
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes