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/clueboard/2x1800/2021 | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/clueboard/2x1800/2021')
| -rw-r--r-- | keyboards/clueboard/2x1800/2021/config.h | 8 | ||||
| -rw-r--r-- | keyboards/clueboard/2x1800/2021/font.h | 2 | ||||
| -rw-r--r-- | keyboards/clueboard/2x1800/2021/info.json | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/keyboards/clueboard/2x1800/2021/config.h b/keyboards/clueboard/2x1800/2021/config.h index eccede6a41..eb4fd4bbf6 100644 --- a/keyboards/clueboard/2x1800/2021/config.h +++ b/keyboards/clueboard/2x1800/2021/config.h @@ -17,20 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" /* audio support */ #define AUDIO_PIN_ALT B7 #define AUDIO_PIN C4 #define AUDIO_CLICKY -/* - * Encoder Assignments - */ -#define ENCODERS_PAD_A { D0, C5 } -#define ENCODERS_PAD_B { D1, C6 } -#define ENCODER_RESOLUTION 4 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/clueboard/2x1800/2021/font.h b/keyboards/clueboard/2x1800/2021/font.h index 5ddcbfba56..191d11dcee 100644 --- a/keyboards/clueboard/2x1800/2021/font.h +++ b/keyboards/clueboard/2x1800/2021/font.h @@ -24,6 +24,8 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#pragma once + // Top row of keyboard, when shift held #define CHR_TILDE {0b00110000, 0b01000000, 0b00110000, 0b00001000, 0b00110000, 0b00000000} #define CHR_BANG {0b00000000, 0b00000000, 0b11111010, 0b10000000, 0b00000000, 0b00000000} diff --git a/keyboards/clueboard/2x1800/2021/info.json b/keyboards/clueboard/2x1800/2021/info.json index 088ce343db..44842c0e16 100644 --- a/keyboards/clueboard/2x1800/2021/info.json +++ b/keyboards/clueboard/2x1800/2021/info.json @@ -3,7 +3,6 @@ "keyboard_name": "Clueboard 2x1800 2021", "maintainer": "skullydazed", "bootloader": "halfkay", - "debounce": 5, "diode_direction": "ROW2COL", "features": { "audio": true, @@ -27,6 +26,12 @@ "usb": { "pid": "0x23A0" }, + "encoder": { + "rotary": [ + {"pin_a": "D0", "pin_b": "D1"}, + {"pin_a": "C5", "pin_b": "C6"} + ] + }, "layout_aliases": { "LAYOUT": "LAYOUT_all" }, |