LailaTheElf/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2025-06-23 09:19:23 +00:00
commit 8c8f4b3c06
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/inland/kb83/keyboard.json
View File

@ -60,7 +60,7 @@
}, },
"encoder": { "encoder": {
"rotary": [ "rotary": [
{"pin_a": "B14", "pin_b": "B13", "resolution": 4} {"pin_a": "B13", "pin_b": "B14", "resolution": 4}
] ]
}, },
"qmk": { "qmk": {

8
keyboards/inland/kb83/keymaps/default/keymap.c
View File

@ -64,10 +64,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE) #if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [WIN_B] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[WIN_FN] = { ENCODER_CCW_CW(RM_SATU, RM_SATD) }, [WIN_FN] = { ENCODER_CCW_CW(RM_SATD, RM_SATU) },
[MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [MAC_B] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[MAC_FN] = { ENCODER_CCW_CW(RM_SATU, RM_SATD) }, [MAC_FN] = { ENCODER_CCW_CW(RM_SATD, RM_SATU) },
}; };
#endif #endif

1
keyboards/inland/kb83/keymaps/default/rules.mk Normal file
View File

@ -0,0 +1 @@
ENCODER_MAP_ENABLE = yes