Merge remote-tracking branch 'origin/master' into develop

2026-06-22 17:28:58 +00:00 · 2026-06-22 17:28:58 +00:00 · aae4189aa4
commit aae4189aa4
parent fd624d016b 198026cf27
1 changed files with 2 additions and 2 deletions
--- a/keyboards/ploopyco/common/opt_encoder_tiny.c
+++ b/keyboards/ploopyco/common/opt_encoder_tiny.c
@ -78,9 +78,9 @@ typedef enum {
    UP_BEGIN_MID,
    STATE_MASK    = 0xf, /* 0b1111 */
    EMIT_UP       = 0x10,
-    EMIT_UP_MID   = EMIT_UP & START_MID,
+    EMIT_UP_MID   = EMIT_UP | START_MID,
    EMIT_DOWN     = 0x80,
-    EMIT_DOWN_MID = EMIT_DOWN & START_MID,
+    EMIT_DOWN_MID = EMIT_DOWN | START_MID,
    EMIT_MASK     = 0xf0
 } encoder_state_t;