summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-12-08 17:39:29 +0000
committerQMK Bot <hello@qmk.fm>2021-12-08 17:39:29 +0000
commit108684351e9f947c79f0a0c55f327daac3c1ab0f (patch)
tree9e73f3db6718e0249820ba43890dd0ecf3bcd63a /keyboards
parentaf936c6ae6b88e451dd1ec8a3a835d83d5e376ba (diff)
parentc09837e092ff3c8e74dde8567ef9eb3e7a343805 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ramonimbao/herringbone/pro/config.h4
-rw-r--r--keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/keyboards/ramonimbao/herringbone/pro/config.h b/keyboards/ramonimbao/herringbone/pro/config.h
index 20f92282b0..4aab52fcb5 100644
--- a/keyboards/ramonimbao/herringbone/pro/config.h
+++ b/keyboards/ramonimbao/herringbone/pro/config.h
@@ -48,8 +48,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DIODE_DIRECTION COL2ROW
/* Encoder pin assignment */
-#define ENCODERS_PAD_A { C2 }
-#define ENCODERS_PAD_B { C3 }
+#define ENCODERS_PAD_A { C3 }
+#define ENCODERS_PAD_B { C2 }
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c b/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c
index fceca1a8bd..8acc017679 100644
--- a/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c
+++ b/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c
@@ -88,12 +88,14 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
encoder_cw.pressed = true;
encoder_cw.time = (timer_read() | 1);
action_exec(encoder_cw);
+ wait_ms(20);
anim_sleep = timer_read32();
oled_on();
} else {
encoder_ccw.pressed = true;
encoder_ccw.time = (timer_read() | 1);
action_exec(encoder_ccw);
+ wait_ms(20);
anim_sleep = timer_read32();
oled_on();
}