summaryrefslogtreecommitdiff
path: root/keyboards/gmmk/pro/rev1
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/gmmk/pro/rev1')
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/ansi.c2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/config.h22
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/info.json3
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/config.h2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/config.h2
-rw-r--r--keyboards/gmmk/pro/rev1/iso/config.h22
-rw-r--r--keyboards/gmmk/pro/rev1/iso/info.json3
-rw-r--r--keyboards/gmmk/pro/rev1/iso/iso.c2
15 files changed, 11 insertions, 61 deletions
diff --git a/keyboards/gmmk/pro/rev1/ansi/ansi.c b/keyboards/gmmk/pro/rev1/ansi/ansi.c
index a06594cb88..ff6382625a 100644
--- a/keyboards/gmmk/pro/rev1/ansi/ansi.c
+++ b/keyboards/gmmk/pro/rev1/ansi/ansi.c
@@ -136,7 +136,7 @@ led_config_t g_led_config = {{
4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
}};
-const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
{0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, ESC, k13
{0, CS4_SW1, CS5_SW1, CS6_SW1}, // 1, ~, k16
{0, CS7_SW1, CS8_SW1, CS9_SW1}, // 2, Tab, k11
diff --git a/keyboards/gmmk/pro/rev1/ansi/config.h b/keyboards/gmmk/pro/rev1/ansi/config.h
deleted file mode 100644
index 9f21a6bf71..0000000000
--- a/keyboards/gmmk/pro/rev1/ansi/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Gigahawk
- *
- * 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 DRIVER_1_LED_TOTAL 66
-#define DRIVER_2_LED_TOTAL 32
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json
index fc2197a0d7..533a379656 100644
--- a/keyboards/gmmk/pro/rev1/ansi/info.json
+++ b/keyboards/gmmk/pro/rev1/ansi/info.json
@@ -8,9 +8,6 @@
"pid": "0x5044",
"device_version": "0.0.1"
},
- "rgb_matrix": {
- "driver": "aw20216s"
- },
"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/andrebrait/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
index 18271fb4d2..80b75eed52 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
@@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_TIMEOUT 1200000 // 20 minutes (20 * 60 * 1000ms)
-# define RGB_DISABLE_WHEN_USB_SUSPENDED
+# define RGB_MATRIX_SLEEP
#endif
// A debounce of 8 represents a minimum key press time of just under 1 refresh at 120Hz
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h
index dc3dfefab0..af4e385727 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h
@@ -18,7 +18,7 @@
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
#define RGBLIGHT_DEFAULT_SAT 0
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_SLEEP
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h
index 845262b7e8..e5c100f82c 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h
@@ -18,5 +18,5 @@
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_TIMEOUT 1200000 // 20 minutes (20 * 60 * 1000ms)
- #define RGB_DISABLE_WHEN_USB_SUSPENDED
+ #define RGB_MATRIX_SLEEP
#endif
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/config.h
index 74c018f7f1..94248fdf38 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/config.h
@@ -16,4 +16,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define RGB_DISABLE_WHEN_USB_SUSPENDED \ No newline at end of file
+#define RGB_MATRIX_SLEEP \ No newline at end of file
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h
index f37ff59c44..16918492fb 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h
@@ -23,7 +23,7 @@
// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
// Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state
- #define RGB_DISABLE_WHEN_USB_SUSPENDED
+ #define RGB_MATRIX_SLEEP
// Effects
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h
index ece08ecfee..e8f906c1c1 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h
@@ -17,7 +17,7 @@
#define COMBO_TERM 100
#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_SLEEP
#define RGB_MATRIX_TIMEOUT 90000
#define MACRO_TIMER 5
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h
index 8d8c35af49..0f4687fb71 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h
@@ -18,7 +18,7 @@
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
-# define RGB_DISABLE_WHEN_USB_SUSPENDED
+# define RGB_MATRIX_SLEEP
#endif
#define FORCE_NKRO
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h
index 91d731faca..585032c245 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h
@@ -25,7 +25,7 @@
// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR
// Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state
- #define RGB_DISABLE_WHEN_USB_SUSPENDED
+ #define RGB_MATRIX_SLEEP
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain
#define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/config.h
index 1cc3cdf228..7a35f5e0c6 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/config.h
@@ -3,7 +3,7 @@
#pragma once
#ifdef RGB_MATRIX_ENABLE
- #define RGB_DISABLE_WHEN_USB_SUSPENDED
+ #define RGB_MATRIX_SLEEP
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain
#define RGB_MATRIX_KEYPRESSES // REACTIVE, SPLASH modes
diff --git a/keyboards/gmmk/pro/rev1/iso/config.h b/keyboards/gmmk/pro/rev1/iso/config.h
deleted file mode 100644
index 8ed1802803..0000000000
--- a/keyboards/gmmk/pro/rev1/iso/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Jasper Chan
- *
- * 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 DRIVER_1_LED_TOTAL 66
-#define DRIVER_2_LED_TOTAL 33
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json
index 492a5cf486..90f66171aa 100644
--- a/keyboards/gmmk/pro/rev1/iso/info.json
+++ b/keyboards/gmmk/pro/rev1/iso/info.json
@@ -8,9 +8,6 @@
"pid": "0x5044",
"device_version": "0.0.1"
},
- "rgb_matrix": {
- "driver": "aw20216s"
- },
"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/iso.c b/keyboards/gmmk/pro/rev1/iso/iso.c
index 9744447587..68165dd27f 100644
--- a/keyboards/gmmk/pro/rev1/iso/iso.c
+++ b/keyboards/gmmk/pro/rev1/iso/iso.c
@@ -137,7 +137,7 @@ led_config_t g_led_config = {{
2, 4, 2, 2, 4, 4, 2, 2, 4, 2, 2, 4, 4, 2, 2, 4, 4, 2, 2, 4, 4, 4, 4, 4
}};
-const aw20216s_led_t g_aw20216s_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
{0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, ESC, k13
{0, CS4_SW1, CS5_SW1, CS6_SW1}, // 1, ~, k16
{0, CS7_SW1, CS8_SW1, CS9_SW1}, // 2, Tab, k11
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 19:27:12 +0000