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/manyboard | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/manyboard')
| -rw-r--r-- | keyboards/manyboard/macro/config.h | 12 | ||||
| -rw-r--r-- | keyboards/manyboard/macro/info.json | 7 | ||||
| -rw-r--r-- | keyboards/manyboard/macro/rules.mk | 6 |
3 files changed, 7 insertions, 18 deletions
diff --git a/keyboards/manyboard/macro/config.h b/keyboards/manyboard/macro/config.h index 6b49e670ba..1839a1091d 100644 --- a/keyboards/manyboard/macro/config.h +++ b/keyboards/manyboard/macro/config.h @@ -16,20 +16,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 4 /* key matrix pins */ #define MATRIX_ROW_PINS { D0, D1, D2, D3 } #define MATRIX_COL_PINS { D4, D5, D6, D7 } -/*Encoder Pins*/ -#define ENCODERS_PAD_A { C6 } -#define ENCODERS_PAD_B { C7 } - /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION ROW2COL @@ -37,6 +28,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGB_DI_PIN B6 #define RGBLED_NUM 2 #define RGBLIGHT_LIMIT_VAL 10 - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/info.json index 47eb066f49..cdf40f6801 100644 --- a/keyboards/manyboard/macro/info.json +++ b/keyboards/manyboard/macro/info.json @@ -8,6 +8,13 @@ "pid": "0x0015", "device_version": "1.0.3" }, + "encoder": { + "rotary": [ + {"pin_a": "C6", "pin_b": "C7"} + ] + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x4": { "layout": [ diff --git a/keyboards/manyboard/macro/rules.mk b/keyboards/manyboard/macro/rules.mk index 9999ddafff..51c7b089b0 100644 --- a/keyboards/manyboard/macro/rules.mk +++ b/keyboards/manyboard/macro/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |