summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-06-29 03:31:16 +0000
committerQMK Bot <hello@qmk.fm>2021-06-29 03:31:16 +0000
commit8b919aa5d61ccfa4cf3d79d271a615d27374f760 (patch)
tree3a6a84e99f10143b117a24629648e831b525a816
parent3f813f87cd7d2ae73e05c9918f44658d1350076f (diff)
parentde8939aa5efb1dea9c048c3254b0462f6e21e822 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c3
-rw-r--r--keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c3
-rw-r--r--keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c3
-rw-r--r--keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c3
4 files changed, 8 insertions, 4 deletions
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c b/keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c
index c55c4aed68..4abf503ddf 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c
+++ b/keyboards/ramonimbao/squishytkl/keymaps/default/keymap.c
@@ -26,10 +26,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-void encoder_update_user(uint8_t index, bool clockwise) {
+bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
+ return true;
}
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c b/keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c
index 4caf9e8b5b..cfa6240f54 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c
+++ b/keyboards/ramonimbao/squishytkl/keymaps/iso/keymap.c
@@ -26,10 +26,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-void encoder_update_user(uint8_t index, bool clockwise) {
+bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
+ return true;
}
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c b/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c
index dc0d1d5bad..d8debc9cc0 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c
+++ b/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c
@@ -28,10 +28,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
-void encoder_update_user(uint8_t index, bool clockwise) {
+bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
+ return true;
}
diff --git a/keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c b/keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c
index fa7214149e..f671d45c58 100644
--- a/keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c
+++ b/keyboards/ramonimbao/squishytkl/keymaps/via/keymap.c
@@ -51,7 +51,7 @@ void matrix_scan_user(void) {
}
}
-void encoder_update_user(uint8_t index, bool clockwise) {
+bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
encoder_cw.pressed = true;
encoder_cw.time = (timer_read() | 1);
@@ -61,4 +61,5 @@ void encoder_update_user(uint8_t index, bool clockwise) {
encoder_ccw.time = (timer_read() | 1);
action_exec(encoder_ccw);
}
+ return true;
}