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/aidansmithdotdev/fine40 | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/aidansmithdotdev/fine40')
| -rw-r--r-- | keyboards/aidansmithdotdev/fine40/config.h | 6 | ||||
| -rw-r--r-- | keyboards/aidansmithdotdev/fine40/fine40.c | 2 | ||||
| -rw-r--r-- | keyboards/aidansmithdotdev/fine40/fine40.h | 3 | ||||
| -rw-r--r-- | keyboards/aidansmithdotdev/fine40/info.json | 5 |
4 files changed, 6 insertions, 10 deletions
diff --git a/keyboards/aidansmithdotdev/fine40/config.h b/keyboards/aidansmithdotdev/fine40/config.h index 43ac1e5dda..a39d7fef7d 100644 --- a/keyboards/aidansmithdotdev/fine40/config.h +++ b/keyboards/aidansmithdotdev/fine40/config.h @@ -3,10 +3,4 @@ #pragma once -#include "config_common.h" - -#define ENCODER_RESOLUTION 2 -#define ENCODERS_PAD_A { D5 } -#define ENCODERS_PAD_B { B7 } - #define OLED_DISPLAY_128X64 //Comment this out to change the screen size diff --git a/keyboards/aidansmithdotdev/fine40/fine40.c b/keyboards/aidansmithdotdev/fine40/fine40.c index cc4024136e..73c453b6c0 100644 --- a/keyboards/aidansmithdotdev/fine40/fine40.c +++ b/keyboards/aidansmithdotdev/fine40/fine40.c @@ -1,6 +1,6 @@ // Copyright 2022 Aidan Smith (@Aidan-OS) // SPDX-License-Identifier: GPL-2.0-or-later -#include "fine40.h" +#include "quantum.h" enum keyboard_layers { _MAIN, diff --git a/keyboards/aidansmithdotdev/fine40/fine40.h b/keyboards/aidansmithdotdev/fine40/fine40.h deleted file mode 100644 index dd675cf3ad..0000000000 --- a/keyboards/aidansmithdotdev/fine40/fine40.h +++ /dev/null @@ -1,3 +0,0 @@ -// Copyright 2022 Aidan Smith (@Aidan-OS) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "quantum.h"
\ No newline at end of file diff --git a/keyboards/aidansmithdotdev/fine40/info.json b/keyboards/aidansmithdotdev/fine40/info.json index c2e1afd84c..c41557a920 100644 --- a/keyboards/aidansmithdotdev/fine40/info.json +++ b/keyboards/aidansmithdotdev/fine40/info.json @@ -25,6 +25,11 @@ "pid": "0x4564", "vid": "0xA059" }, + "encoder": { + "rotary": [ + {"pin_a": "D5", "pin_b": "B7", "resolution": 2} + ] + }, "layouts": { "LAYOUT_2u_single_space": { "layout": [ |