diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
| commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
| tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/work_louder/micro | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/work_louder/micro')
| -rw-r--r-- | keyboards/work_louder/micro/config.h | 6 | ||||
| -rw-r--r-- | keyboards/work_louder/micro/info.json | 6 | ||||
| -rw-r--r-- | keyboards/work_louder/micro/keymaps/via/keymap.c | 6 | ||||
| -rw-r--r-- | keyboards/work_louder/micro/micro.h | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/keyboards/work_louder/micro/config.h b/keyboards/work_louder/micro/config.h index cb11d27955..bfe04592ac 100644 --- a/keyboards/work_louder/micro/config.h +++ b/keyboards/work_louder/micro/config.h @@ -3,7 +3,6 @@ #pragma once -#include "config_common.h" /* * Feature disable options @@ -81,11 +80,6 @@ //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT -#define ENCODERS_PAD_A \ - { D4, B0 } -#define ENCODERS_PAD_B \ - { D6, B1 } - #define WORK_LOUDER_LED_PIN_1 B6 #define WORK_LOUDER_LED_PIN_2 B7 #define WORK_LOUDER_LED_PIN_3 B5 diff --git a/keyboards/work_louder/micro/info.json b/keyboards/work_louder/micro/info.json index b3bfcd6a13..3627122102 100644 --- a/keyboards/work_louder/micro/info.json +++ b/keyboards/work_louder/micro/info.json @@ -45,6 +45,12 @@ "pid": "0xE6E3", "vid": "0x574C" }, + "encoder": { + "rotary": [ + {"pin_a": "D4", "pin_b": "D6"}, + {"pin_a": "B0", "pin_b": "B1"} + ] + }, "build": { "lto": true }, diff --git a/keyboards/work_louder/micro/keymaps/via/keymap.c b/keyboards/work_louder/micro/keymaps/via/keymap.c index 8cc41e1e50..514aae2aa0 100644 --- a/keyboards/work_louder/micro/keymaps/via/keymap.c +++ b/keyboards/work_louder/micro/keymaps/via/keymap.c @@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - USER00, USER01, USER03, USER05, - XXXXXXX, USER02, USER04, USER06, + QK_KB_0, QK_KB_1, QK_KB_3, QK_KB_5, + XXXXXXX, QK_KB_2, QK_KB_4, QK_KB_6, XXXXXXX, XXXXXXX, XXXXXXX, TO(0) ) }; @@ -53,7 +53,7 @@ work_louder_config_t work_louder_config; bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case USER09: + case QK_KB_9: if (record->event.pressed) { work_louder_config.led_level++; if (work_louder_config.led_level > 4) { diff --git a/keyboards/work_louder/micro/micro.h b/keyboards/work_louder/micro/micro.h index 1d25b91c80..0873cff893 100644 --- a/keyboards/work_louder/micro/micro.h +++ b/keyboards/work_louder/micro/micro.h @@ -1,6 +1,8 @@ // Copyright 2022 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> // SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + #include "quantum.h" extern void work_louder_micro_led_1_on(void); |