aboutsummaryrefslogtreecommitdiff
path: root/keyboards/gmmk/pro
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2023-08-29 21:24:43 +1000
committerNick Brassel <[email protected]>2023-08-29 21:24:43 +1000
commit31a91add168c956655ace8ec4cf9750db1e2cfc6 (patch)
tree12cea9b5f8e769f9611a31cbaede9537edad71cc /keyboards/gmmk/pro
parentf07490bc092e365ba03dc685b3fc30ad0bf0b752 (diff)
parentedaf8a87ef3164f8986b0a8eb171d4879b45414c (diff)
downloadqmk_firmware-31a91add168c956655ace8ec4cf9750db1e2cfc6.tar.gz
qmk_firmware-31a91add168c956655ace8ec4cf9750db1e2cfc6.zip
Merge branch 'develop'0.22.0
Diffstat (limited to 'keyboards/gmmk/pro')
-rw-r--r--keyboards/gmmk/pro/config.h4
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/info.json5
-rw-r--r--keyboards/gmmk/pro/rev1/iso/info.json5
-rw-r--r--keyboards/gmmk/pro/rev2/ansi/info.json5
-rw-r--r--keyboards/gmmk/pro/rev2/iso/info.json5
5 files changed, 18 insertions, 6 deletions
diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h
index 8188418469..069823663e 100644
--- a/keyboards/gmmk/pro/config.h
+++ b/keyboards/gmmk/pro/config.h
@@ -16,8 +16,6 @@
#pragma once
-#define TAP_CODE_DELAY 10
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
@@ -35,6 +33,8 @@
#define DRIVER_COUNT 2
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json
index 7a1532424b..7e0adbdb05 100644
--- a/keyboards/gmmk/pro/rev1/ansi/info.json
+++ b/keyboards/gmmk/pro/rev1/ansi/info.json
@@ -9,7 +9,7 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
- "driver": "AW20216"
+ "driver": "aw20216"
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
@@ -21,6 +21,9 @@
{"pin_a": "C15", "pin_b": "C14"}
]
},
+ "qmk": {
+ "tap_keycode_delay": 10
+ },
"bootmagic": {
"matrix": [1, 3]
},
diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json
index 7b78ca5716..52ea4538c8 100644
--- a/keyboards/gmmk/pro/rev1/iso/info.json
+++ b/keyboards/gmmk/pro/rev1/iso/info.json
@@ -9,7 +9,7 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
- "driver": "AW20216"
+ "driver": "aw20216"
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
@@ -21,6 +21,9 @@
{"pin_a": "C15", "pin_b": "C14"}
]
},
+ "qmk": {
+ "tap_keycode_delay": 10
+ },
"bootmagic": {
"matrix": [1, 3]
},
diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json
index ff693e3573..082b5f8656 100644
--- a/keyboards/gmmk/pro/rev2/ansi/info.json
+++ b/keyboards/gmmk/pro/rev2/ansi/info.json
@@ -9,7 +9,7 @@
"device_version": "0.0.2"
},
"rgb_matrix": {
- "driver": "AW20216"
+ "driver": "aw20216"
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
@@ -21,6 +21,9 @@
{"pin_a": "C15", "pin_b": "C14"}
]
},
+ "qmk": {
+ "tap_keycode_delay": 10
+ },
"bootmagic": {
"matrix": [1, 3]
},
diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json
index 972551ec41..a4aef24e65 100644
--- a/keyboards/gmmk/pro/rev2/iso/info.json
+++ b/keyboards/gmmk/pro/rev2/iso/info.json
@@ -9,7 +9,7 @@
"device_version": "0.0.2"
},
"rgb_matrix": {
- "driver": "AW20216"
+ "driver": "aw20216"
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
@@ -21,6 +21,9 @@
{"pin_a": "C15", "pin_b": "C14"}
]
},
+ "qmk": {
+ "tap_keycode_delay": 10
+ },
"bootmagic": {
"matrix": [1, 3]
},