summaryrefslogtreecommitdiff
path: root/keyboards/gmmk
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/gmmk')
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c4
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk19
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c6
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c4
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c6
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c4
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c4
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c6
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.c2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c4
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.c2
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c8
-rw-r--r--keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c8
13 files changed, 48 insertions, 29 deletions
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
index 8d34d82f64..c7c183e33c 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
@@ -296,7 +296,7 @@ bool rgb_matrix_indicators_user(void) {
return false;
}
-static void start_effects() {
+static void start_effects(void) {
effect_started_time = sync_timer_read();
if (!rgb_matrix_is_enabled()) {
/* Turn it ON, signal the cause (EFFECTS) */
@@ -319,7 +319,7 @@ static void start_effects() {
// 87, led 07 88, led 18
// 91, led 08 92, led 19
-static void set_rgb_caps_leds() {
+static void set_rgb_caps_leds(void) {
rgb_matrix_set_color(0, 0xFF, 0x0, 0x0); // ESC
rgb_matrix_set_color(6, 0xFF, 0x0, 0x0); // F1
rgb_matrix_set_color(12, 0xFF, 0x0, 0x0); // F2
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk
index 8983ba87c3..d5942a2e90 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk
@@ -2,3 +2,22 @@
# Disabling MouseKey because it breaks my KVM switch
MOUSEKEY_ENABLE = no
+
+# Cherry MX-style switches and diodes are not susceptible to noise, no need for noise-resistant algorithms.
+# This significantly reduces latency.
+#
+# The matrix scan frequency seems to be around 1820 Hz, so even sym_defer_g would perform ok,
+# but the "defer" part would mean we would wait DEBOUNCE ms before sending any events.
+# Using "asym_eager_defer_pk" does not seem to benefit us in anything.
+# The GMMK Pro has more then enough system resources for a per-key algorithm.
+# Using an "eager" algorithm leads to extremely low latency while also reducing the chances of chattering
+# due to it's "post-event" debouncing (of sorts).
+#
+# I have observed zero chattering or double-keypress issues on my Gateron Yellow switches.
+# Most chattering issues on the GMMK Pro seem to be related to its proprietary hot-swap sockets anyway.
+DEBOUNCE_TYPE = sym_eager_pk
+
+# Useful for debugging
+# CONSOLE_ENABLE = yes
+# DEBUG_MATRIX_SCAN_RATE_ENABLE = yes
+# DEBUG_MATRIX_SCAN_RATE = yes
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
index b0d75a378a..b54f7f404c 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
@@ -81,7 +81,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
static void set_rgb_caps_leds(void);
-static void set_rgb_caps_leds() {
+static void set_rgb_caps_leds(void) {
rgb_matrix_set_color(73, 0xFF, 0x77, 0x77); // Left side LED 3
rgb_matrix_set_color(74, 0xFF, 0x77, 0x77); // Right side LED 3
rgb_matrix_set_color(76, 0xFF, 0x77, 0x77); // Left side LED 4
@@ -97,14 +97,14 @@ static void set_rgb_nlck_notset_leds(void);
static void set_rgb_wlck_leds(void);
-static void set_rgb_nlck_notset_leds() {
+static void set_rgb_nlck_notset_leds(void) {
rgb_matrix_set_color(67, 0x77, 0x77, 0xFF); // Left side LED 1
rgb_matrix_set_color(68, 0x77, 0x77, 0xFF); // Right side LED 1
rgb_matrix_set_color(70, 0x77, 0x77, 0xFF); // Left side LED 2
rgb_matrix_set_color(71, 0x77, 0x77, 0xFF); // Right side LED 2
}
-static void set_rgb_wlck_leds() {
+static void set_rgb_wlck_leds(void) {
rgb_matrix_set_color(87, 0x77, 0xFF, 0x77); // Left side LED 7
rgb_matrix_set_color(88, 0x77, 0xFF, 0x77); // Right side LED 7
rgb_matrix_set_color(91, 0x77, 0xFF, 0x77); // Left side LED 8
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c
index b71d18d481..49e2050ea0 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c
@@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include QMK_KEYBOARD_H
-void dance_media(qk_tap_dance_state_t *state, void *user_data) {
+void dance_media(tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code(KC_MPLY);
} else if (state->count == 2) {
@@ -29,7 +29,7 @@ void dance_media(qk_tap_dance_state_t *state, void *user_data) {
}
}
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
// Tap once for shift, twice for Caps Lock
[0] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),
[1] = ACTION_TAP_DANCE_FN(dance_media)};
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
index aa1558fd07..3b378ba572 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
@@ -220,7 +220,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
-bool rgb_matrix_indicators_user() {
+bool rgb_matrix_indicators_user(void) {
#if RGB_CONFIRMATION_BLINKING_TIME > 0
if (effect_started_time > 0) {
/* Render blinking EFFECTS */
@@ -262,7 +262,7 @@ bool rgb_matrix_indicators_user() {
}
#if RGB_CONFIRMATION_BLINKING_TIME > 0
-static void start_effects() {
+static void start_effects(void) {
effect_started_time = sync_timer_read();
if (!rgb_matrix_is_enabled()) {
/* Turn it ON, signal the cause (EFFECTS) */
@@ -286,7 +286,7 @@ static void start_effects() {
// 87, led 07 88, led 18
// 91, led 08 92, led 19
-static void set_rgb_caps_leds() {
+static void set_rgb_caps_leds(void) {
rgb_matrix_set_color(67, 0xFF, 0x0, 0x0); // Left side LED 1
rgb_matrix_set_color(68, 0xFF, 0x0, 0x0); // Right side LED 1
rgb_matrix_set_color(70, 0xFF, 0x0, 0x0); // Left side LED 2
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
index 46e0a128f9..83ef8c765a 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
@@ -73,14 +73,14 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
static void set_rgb_side_leds(void);
-static void set_rgb_side_leds() {
+static void set_rgb_side_leds(void) {
rgb_matrix_set_color(67, RGB_WHITE); // Left side LED 1
rgb_matrix_set_color(68, RGB_WHITE); // Right side LED 1
rgb_matrix_set_color(91, RGB_WHITE); // Left side LED 8
rgb_matrix_set_color(92, RGB_WHITE); // Right side LED 8
}
-bool rgb_matrix_indicators_user() {
+bool rgb_matrix_indicators_user(void) {
rgb_matrix_set_color_all(0x0, 0x0, 0x0);
if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
rgb_matrix_set_color(3, RGB_WHITE); // CAPS
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
index 8740bfe89c..50a2ac6ca3 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
@@ -414,7 +414,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
}
#if RGB_CONFIRMATION_BLINKING_TIME > 0
- static void start_effects() {
+ static void start_effects(void) {
effect_started_time = sync_timer_read();
if (!rgb_matrix_is_enabled()) {
/* Turn it ON, signal the cause (EFFECTS) */
@@ -427,7 +427,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
}
#endif // RGB_CONFIRMATION_BLINKING_TIME > 0
- static void set_rgb_caps_leds() {
+ static void set_rgb_caps_leds(void) {
rgb_matrix_set_color(67, 0xFF, 0x0, 0x0); // Left side LED 1
rgb_matrix_set_color(68, 0xFF, 0x0, 0x0); // Right side LED 1
rgb_matrix_set_color(70, 0xFF, 0x0, 0x0); // Left side LED 2
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c
index 43ed195fbb..c912806217 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c
@@ -36,9 +36,9 @@ const encoder_callback encoder_mapping[][2] = {
// clang-format on
-void volume_up() { tap_code(KC_VOLU); }
+void volume_up(void) { tap_code(KC_VOLU); }
-void volume_down() { tap_code(KC_VOLD); }
+void volume_down(void) { tap_code(KC_VOLD); }
bool encoder_update_user(uint8_t index, bool clockwise) {
dprintf("current encoder state is: %d\n", state);
@@ -65,7 +65,7 @@ void handle_rgb_key(bool pressed) {
static KeyPressState *rgb_state;
-void keyboard_post_init_encoder() {
+void keyboard_post_init_encoder(void) {
rgb_state = NewKeyPressState(handle_rgb_key);
}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.c
index ac0164e73f..a21b58a36c 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.c
@@ -116,4 +116,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
process_record_fun(keycode, record);
}
-void keyboard_post_init_user() { keyboard_post_init_encoder(); }
+void keyboard_post_init_user(void) { keyboard_post_init_encoder(); }
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
index 0106d80c14..b213abc998 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
@@ -58,12 +58,12 @@ void set_layer_rgb(uint8_t led_min, uint8_t led_max, int layer) {
}
}
-void rgb_matrix_layers_enable() {
+void rgb_matrix_layers_enable(void) {
dprintf("ledmaps are enabled\n");
enabled = true;
}
-void rgb_matrix_layers_disable() {
+void rgb_matrix_layers_disable(void) {
dprintf("ledmaps are disabled\n");
enabled = false;
}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.c
index 35ae20b126..009e826423 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.c
@@ -15,7 +15,7 @@
*/
#include "utils.h"
-void store_rgb_state_to_eeprom() {
+void store_rgb_state_to_eeprom(void) {
uint8_t mode = rgb_matrix_get_mode();
uint8_t speed = rgb_matrix_get_speed();
HSV color = rgb_matrix_get_hsv();
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
index 6ba850b3e5..9a3123a0a7 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
@@ -247,7 +247,7 @@ bool rgb_matrix_indicators_user(void) {
// 87, led 07 88, led 18
// 91, led 08 92, led 19
-static void set_rgb_caps_leds_on() {
+static void set_rgb_caps_leds_on(void) {
rgb_matrix_set_color(0, 255, 0, 0); //Escape Key
rgb_matrix_set_color(3, 255, 0, 0); //capslock key
rgb_matrix_set_color(5, 255, 0, 0); //Left CTRL key
@@ -269,7 +269,7 @@ static void set_rgb_caps_leds_on() {
rgb_matrix_set_color(92, 255, 255, 255); //Right LED 19
}
-static void set_rgb_caps_leds_off() {
+static void set_rgb_caps_leds_off(void) {
rgb_matrix_set_color(0, 0, 0, 0); //Escape Key
rgb_matrix_set_color(3, 0, 0, 0); //capslock key
rgb_matrix_set_color(5, 0, 0, 0); //Left CTRL key
@@ -291,11 +291,11 @@ static void set_rgb_caps_leds_off() {
rgb_matrix_set_color(92, 0, 0, 0); //Right LED 19
}
-static void set_rgb_scroll_leds_on() {
+static void set_rgb_scroll_leds_on(void) {
rgb_matrix_set_color(72, 255, 255, 255); // Under Rotary (HOME)
}
-static void set_rgb_scroll_leds_off() {
+static void set_rgb_scroll_leds_off(void) {
rgb_matrix_set_color(72, 0, 0, 0); // Under Rotary (HOME)
}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c
index 8d425cdf1e..303861c676 100644
--- a/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/trwnh/keymap.c
@@ -62,7 +62,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
static void set_rgb_caps_leds_off(void);
static void set_rgb_scroll_leds_off(void);
- static void set_rgb_caps_leds_on() {
+ static void set_rgb_caps_leds_on(void) {
// Set alpha and capslock to red
rgb_matrix_set_color( 3, 255, 0, 0); // Caps
@@ -97,7 +97,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
rgb_matrix_set_color(43, 255, 0, 0); // M
}
- static void set_rgb_caps_leds_off() {
+ static void set_rgb_caps_leds_off(void) {
// Set alpha and capslock to black
rgb_matrix_set_color( 3, 0, 0, 0); // Caps
@@ -132,11 +132,11 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
rgb_matrix_set_color(43, 0, 0, 0); // M
}
- static void set_rgb_scroll_leds_on() {
+ static void set_rgb_scroll_leds_on(void) {
rgb_matrix_set_color(72, 255, 255, 255); // Under Rotary (HOME)
}
- static void set_rgb_scroll_leds_off() {
+ static void set_rgb_scroll_leds_off(void) {
rgb_matrix_set_color(72, 0, 0, 0); // Under Rotary (HOME)
}