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/nightly_boards/octopadplus | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/nightly_boards/octopadplus')
| -rw-r--r-- | keyboards/nightly_boards/octopadplus/config.h | 18 | ||||
| -rw-r--r-- | keyboards/nightly_boards/octopadplus/info.json | 8 | ||||
| -rw-r--r-- | keyboards/nightly_boards/octopadplus/rules.mk | 6 |
3 files changed, 8 insertions, 24 deletions
diff --git a/keyboards/nightly_boards/octopadplus/config.h b/keyboards/nightly_boards/octopadplus/config.h index 3b2a7cea1a..5936e812c8 100644 --- a/keyboards/nightly_boards/octopadplus/config.h +++ b/keyboards/nightly_boards/octopadplus/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 6 /* * Keyboard Matrix Assignments @@ -39,20 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -/* Encoders */ - -#define ENCODERS 2 -#define ENCODERS_PAD_A { F0, D1 } -#define ENCODERS_PAD_B { F1, D0 } #define TAP_CODE_DELAY 10 -#define ENCODER_RESOLUTION 5 - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/nightly_boards/octopadplus/info.json b/keyboards/nightly_boards/octopadplus/info.json index c4ae8b5200..0dbd1dee70 100644 --- a/keyboards/nightly_boards/octopadplus/info.json +++ b/keyboards/nightly_boards/octopadplus/info.json @@ -8,6 +8,14 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "F0", "pin_b": "F1", "resolution": 5}, + {"pin_a": "D1", "pin_b": "D0", "resolution": 5} + ] + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "rgblight": { "animations": { "alternating": true, diff --git a/keyboards/nightly_boards/octopadplus/rules.mk b/keyboards/nightly_boards/octopadplus/rules.mk index 08b58953c2..89c0d63d8b 100644 --- a/keyboards/nightly_boards/octopadplus/rules.mk +++ b/keyboards/nightly_boards/octopadplus/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |