qmk_firmware

commit 8c8f4b3c0631544d41d7b99f6b7bd1778a49843d
parent 55e1acec07271382653e2ba2288ca7a2d5667cf3
Author: QMK Bot <hello@qmk.fm>
Date:   Mon, 23 Jun 2025 09:19:23 +0000

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

Diffstat:
M
keyboards/inland/kb83/keyboard.json
 | 
2
+-
M
keyboards/inland/kb83/keymaps/default/keymap.c
 | 
8
++++----
A
keyboards/inland/kb83/keymaps/default/rules.mk
 | 
1
+

3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/keyboards/inland/kb83/keyboard.json b/keyboards/inland/kb83/keyboard.json
@@ -60,7 +60,7 @@
     },
     "encoder": {
         "rotary": [
-            {"pin_a": "B14", "pin_b": "B13", "resolution": 4}
+            {"pin_a": "B13", "pin_b": "B14", "resolution": 4}
         ]
     },
     "qmk": {
diff --git a/keyboards/inland/kb83/keymaps/default/keymap.c b/keyboards/inland/kb83/keymaps/default/keymap.c
@@ -64,10 +64,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
-    [WIN_FN] = { ENCODER_CCW_CW(RM_SATU, RM_SATD) },
-    [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
-    [MAC_FN] = { ENCODER_CCW_CW(RM_SATU, RM_SATD) },
+    [WIN_B] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [WIN_FN] = { ENCODER_CCW_CW(RM_SATD, RM_SATU) },
+    [MAC_B] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [MAC_FN] = { ENCODER_CCW_CW(RM_SATD, RM_SATU) },
 };
 #endif
 
diff --git a/keyboards/inland/kb83/keymaps/default/rules.mk b/keyboards/inland/kb83/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes