diff options
| author | Drashna Jael're <drashna@live.com> | 2022-11-20 09:20:46 -0800 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2022-11-20 09:20:46 -0800 |
| commit | 4597e01061f0fe160ddcf67103f427dd4bc5fee3 (patch) | |
| tree | 73bba3cc4bcd0f737ffb39e41d93deefa9e8c864 /keyboards/atreyu | |
| parent | 6c40a4605793d29d1bae07401006287300c8349d (diff) | |
| parent | 6f8bbb16329d87eacb5bc4091b11a127630bdb06 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/atreyu')
| -rw-r--r-- | keyboards/atreyu/rev1/info.json | 2 | ||||
| -rw-r--r-- | keyboards/atreyu/rev1/rev1.c | 16 |
2 files changed, 6 insertions, 12 deletions
diff --git a/keyboards/atreyu/rev1/info.json b/keyboards/atreyu/rev1/info.json index d0b3c0eb42..27a5bc2a82 100644 --- a/keyboards/atreyu/rev1/info.json +++ b/keyboards/atreyu/rev1/info.json @@ -70,7 +70,7 @@ {"x":11, "y":4.25}, {"x":12, "y":4.15}, {"x":13, "y":4.125}, - {"x": 14.5, "y": 4.5} + {"x": 15.5, "y": 4.5} ] } } diff --git a/keyboards/atreyu/rev1/rev1.c b/keyboards/atreyu/rev1/rev1.c index 3d6829fbd5..8228f7ede6 100644 --- a/keyboards/atreyu/rev1/rev1.c +++ b/keyboards/atreyu/rev1/rev1.c @@ -14,6 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "rev1.h" + #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { @@ -28,18 +30,10 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { } } if (index == 0) { - if (IS_LAYER_ON(_LOWER)) { - if (clockwise) { - tap_code(KC_WH_U); - } else { - tap_code(KC_WH_D); - } + if (clockwise) { + tap_code(KC_WH_U); } else { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } + tap_code(KC_WH_D); } } return true; |