poz/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
QMK Bot 2022-12-10 20:46:56 +00:00
commit 0435381c91
6 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
keyboards/keebio/bdn9/keymaps/lickel/keymap.c
View file

@ -103,6 +103,19 @@ layer_state_t layer_state_set_user(layer_state_t state) {
return 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) { bool encoder_update_user(uint8_t index, bool clockwise) {
uint8_t layer = get_highest_layer(layer_state); uint8_t layer = get_highest_layer(layer_state);
@ -155,3 +168,4 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
} }
return true; return true;
} }
#endif

4
keyboards/keebio/bdn9/keymaps/lickel/readme.md
View file

@ -12,6 +12,10 @@
## Changelog ## Changelog
### 2022-12-09 - 1.1
- Add ENCODER_MAP_ENABLE from default VIA definition
### 2022-01-17 - 1.0 ### 2022-01-17 - 1.0
- Initial release - Initial release

1
keyboards/keebio/bdn9/keymaps/lickel/rules.mk
View file

@ -3,3 +3,4 @@ LTO_ENABLE = yes
MOUSEKEY_ENABLE = yes MOUSEKEY_ENABLE = yes
CONSOLE_ENABLE = no CONSOLE_ENABLE = no
COMMAND_ENABLE = no COMMAND_ENABLE = no
ENCODER_MAP_ENABLE = yes

29
keyboards/keebio/sinc/keymaps/lickel/keymap.c
View file

@ -62,30 +62,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
) ),
}; };
// clang-format on // clang-format on
bool encoder_update_user(uint8_t index, bool clockwise) { #ifdef ENCODER_MAP_ENABLE
if (index == 0) { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
if (clockwise) { [0] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
tap_code(KC_PGDN); [1] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(KC_MNXT, KC_MPRV) },
} else { [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
tap_code(KC_PGUP); [3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
} };
return false; #endif
} else if (index == 1) {
if (clockwise) {
tap_code(KC_VOLU);
} else {
tap_code(KC_VOLD);
}
return false;
} else {
return true;
}
}
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {

4
keyboards/keebio/sinc/keymaps/lickel/readme.md
View file

@ -13,6 +13,10 @@
## Changelog ## Changelog
### 2022-12-09 - 1.2
- Add ENCODER_MAP_ENABLE from default VIA definition
### 2022-03-04 - 1.1 ### 2022-03-04 - 1.1
- Correct function row to change LED backlights, not underglow - Correct function row to change LED backlights, not underglow

1
keyboards/keebio/sinc/keymaps/lickel/rules.mk
View file

@ -1,2 +1,3 @@
VIA_ENABLE = yes VIA_ENABLE = yes
LTO_ENABLE = yes LTO_ENABLE = yes
ENCODER_MAP_ENABLE = yes