summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-12-10 20:46:56 +0000
committerQMK Bot <hello@qmk.fm>2022-12-10 20:46:56 +0000
commit0435381c917273aade61ff6733f81367dedc4750 (patch)
treeb0499f0b86ae2986df1dfcbf984b82aa33b19319
parent1dd3e4633683688e7492e4212a608c418753ffab (diff)
parent143b7a3c3dc3bb3474222119054a5f1979832862 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/keebio/bdn9/keymaps/lickel/keymap.c14
-rw-r--r--keyboards/keebio/bdn9/keymaps/lickel/readme.md4
-rw-r--r--keyboards/keebio/bdn9/keymaps/lickel/rules.mk1
-rw-r--r--keyboards/keebio/sinc/keymaps/lickel/keymap.c29
-rw-r--r--keyboards/keebio/sinc/keymaps/lickel/readme.md4
-rw-r--r--keyboards/keebio/sinc/keymaps/lickel/rules.mk1
6 files changed, 33 insertions, 20 deletions
diff --git a/keyboards/keebio/bdn9/keymaps/lickel/keymap.c b/keyboards/keebio/bdn9/keymaps/lickel/keymap.c
index 7067b12d87..67a1642f37 100644
--- a/keyboards/keebio/bdn9/keymaps/lickel/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/lickel/keymap.c
@@ -103,6 +103,19 @@ layer_state_t layer_state_set_user(layer_state_t state) {
return state;
}
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+ [_MEDIA] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+ [_XCODE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+#else
+ [_MEDIA] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
+ [_XCODE] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
+#endif
+ [_CUST1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
+ [_CUST2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
+};
+#else
bool encoder_update_user(uint8_t index, bool clockwise) {
uint8_t layer = get_highest_layer(layer_state);
@@ -155,3 +168,4 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
return true;
}
+#endif
diff --git a/keyboards/keebio/bdn9/keymaps/lickel/readme.md b/keyboards/keebio/bdn9/keymaps/lickel/readme.md
index 973cfb4a6d..72170ce452 100644
--- a/keyboards/keebio/bdn9/keymaps/lickel/readme.md
+++ b/keyboards/keebio/bdn9/keymaps/lickel/readme.md
@@ -12,6 +12,10 @@
## Changelog
+### 2022-12-09 - 1.1
+
+- Add ENCODER_MAP_ENABLE from default VIA definition
+
### 2022-01-17 - 1.0
- Initial release
diff --git a/keyboards/keebio/bdn9/keymaps/lickel/rules.mk b/keyboards/keebio/bdn9/keymaps/lickel/rules.mk
index c44f74d53a..ec89cb662f 100644
--- a/keyboards/keebio/bdn9/keymaps/lickel/rules.mk
+++ b/keyboards/keebio/bdn9/keymaps/lickel/rules.mk
@@ -3,3 +3,4 @@ LTO_ENABLE = yes
MOUSEKEY_ENABLE = yes
CONSOLE_ENABLE = no
COMMAND_ENABLE = no
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keebio/sinc/keymaps/lickel/keymap.c b/keyboards/keebio/sinc/keymaps/lickel/keymap.c
index e6d5291ae7..11656a755c 100644
--- a/keyboards/keebio/sinc/keymaps/lickel/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/lickel/keymap.c
@@ -62,30 +62,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- )
+ ),
};
// clang-format on
-bool encoder_update_user(uint8_t index, bool clockwise) {
- if (index == 0) {
- if (clockwise) {
- tap_code(KC_PGDN);
- } else {
- tap_code(KC_PGUP);
- }
- return false;
- } else if (index == 1) {
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- return false;
- } else {
- return true;
- }
-}
+#ifdef ENCODER_MAP_ENABLE
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [0] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
+ [1] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(KC_MNXT, KC_MPRV) },
+ [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
+ [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
+};
+#endif
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
diff --git a/keyboards/keebio/sinc/keymaps/lickel/readme.md b/keyboards/keebio/sinc/keymaps/lickel/readme.md
index 7be7baae29..faf130dec5 100644
--- a/keyboards/keebio/sinc/keymaps/lickel/readme.md
+++ b/keyboards/keebio/sinc/keymaps/lickel/readme.md
@@ -13,6 +13,10 @@
## Changelog
+### 2022-12-09 - 1.2
+
+- Add ENCODER_MAP_ENABLE from default VIA definition
+
### 2022-03-04 - 1.1
- Correct function row to change LED backlights, not underglow
diff --git a/keyboards/keebio/sinc/keymaps/lickel/rules.mk b/keyboards/keebio/sinc/keymaps/lickel/rules.mk
index 36b7ba9cbc..1189f4ad19 100644
--- a/keyboards/keebio/sinc/keymaps/lickel/rules.mk
+++ b/keyboards/keebio/sinc/keymaps/lickel/rules.mk
@@ -1,2 +1,3 @@
VIA_ENABLE = yes
LTO_ENABLE = yes
+ENCODER_MAP_ENABLE = yes