summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2023-05-24 18:48:31 +0000
committerQMK Bot <hello@qmk.fm>2023-05-24 18:48:31 +0000
commit6d93d8b56ae54b5d5b4e346664fac2724162a006 (patch)
tree6984bbdce4ad69d3a9ed1098a13bbe95e401d440 /keyboards
parenta12c1e0bcfc9874c6dc8a5fbaadb940054e413d0 (diff)
parentf9c32974ef0c8cde29c3676007a5addee0caf7ea (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/keebio/foldkb/keymaps/via/keymap.c9
-rw-r--r--keyboards/keebio/foldkb/keymaps/via/rules.mk1
-rw-r--r--keyboards/keebio/foldkb/rev1/info.json2
3 files changed, 11 insertions, 1 deletions
diff --git a/keyboards/keebio/foldkb/keymaps/via/keymap.c b/keyboards/keebio/foldkb/keymaps/via/keymap.c
index 288716acd5..7aaface3b8 100644
--- a/keyboards/keebio/foldkb/keymaps/via/keymap.c
+++ b/keyboards/keebio/foldkb/keymaps/via/keymap.c
@@ -46,3 +46,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
+
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
+ [2] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) },
+ [3] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
+};
+#endif
diff --git a/keyboards/keebio/foldkb/keymaps/via/rules.mk b/keyboards/keebio/foldkb/keymaps/via/rules.mk
index eec3596d0d..0cac9ad1ff 100644
--- a/keyboards/keebio/foldkb/keymaps/via/rules.mk
+++ b/keyboards/keebio/foldkb/keymaps/via/rules.mk
@@ -1,3 +1,4 @@
VIA_ENABLE = yes
CONSOLE_ENABLE = no
LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json
index 92df98ffed..e17389cc2c 100644
--- a/keyboards/keebio/foldkb/rev1/info.json
+++ b/keyboards/keebio/foldkb/rev1/info.json
@@ -5,7 +5,7 @@
"maintainer": "nooges",
"usb": {
"vid": "0xCB10",
- "pid": "0x1258",
+ "pid": "0x1358",
"device_version": "1.0.0"
},
"matrix_pins": {