Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
4df24bc05d
@ -1,3 +1,7 @@
|
||||
// Copyright 2019 MechMerlin
|
||||
// Copyright 2020 @ben_roe (keycapsss.com)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include "progmem.h"
|
||||
|
||||
// Corne 8x6 font
|
||||
|
@ -334,11 +334,11 @@ bool oled_task_user(void) {
|
||||
|
||||
#if defined(ENCODER_MAP_ENABLE)
|
||||
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
|
||||
[_QWERTY] = { ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) },
|
||||
[_LOWER] = { ENCODER_CCW_CW(KC_TAB, RGB_HUI), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
|
||||
[_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
|
||||
[_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_HUI, RGB_HUD) },
|
||||
[_QWERTY] = { ENCODER_CCW_CW(KC_DOWN, KC_UP), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) },
|
||||
[_LOWER] = { ENCODER_CCW_CW(RGB_HUI, KC_TAB), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
|
||||
[_RAISE] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) },
|
||||
[_ADJUST] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) },
|
||||
};
|
||||
#endif // ENCODER_MAP_ENABLE
|
||||
#endif // ENCODER_MAP_ENABLE
|
||||
|
||||
|
||||
|
@ -15,11 +15,18 @@
|
||||
"diode_direction": "COL2ROW",
|
||||
"encoder": {
|
||||
"rotary": [
|
||||
{"pin_a": "F4", "pin_b": "F5"}
|
||||
{"pin_a": "F5", "pin_b": "F4"}
|
||||
]
|
||||
},
|
||||
"split": {
|
||||
"soft_serial_pin": "D2"
|
||||
"soft_serial_pin": "D2",
|
||||
"encoder": {
|
||||
"right": {
|
||||
"rotary": [
|
||||
{"pin_a": "F4", "pin_b": "F5"}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"rgblight": {
|
||||
"led_count": 60,
|
||||
|
Loading…
Reference in New Issue
Block a user