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/evyd13/ta65 | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/evyd13/ta65')
-rw-r--r-- | keyboards/evyd13/ta65/config.h | 21 | ||||
-rw-r--r-- | keyboards/evyd13/ta65/info.json | 13 | ||||
-rw-r--r-- | keyboards/evyd13/ta65/rules.mk | 8 |
3 files changed, 13 insertions, 29 deletions
diff --git a/keyboards/evyd13/ta65/config.h b/keyboards/evyd13/ta65/config.h index ed8e5fd3c6..ef8948786b 100644 --- a/keyboards/evyd13/ta65/config.h +++ b/keyboards/evyd13/ta65/config.h @@ -17,32 +17,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 // ROWS: Top to bottom, COLS: Left to right #define MATRIX_ROW_PINS {B4,D7,D6,D4,B3} #define MATRIX_COL_PINS {D2,D1,D0,D3,D5,C7,C6,B6,B5,F0,F1,F4,F5,F6,F7,B0} -#define ENCODERS_PAD_A { B2 } -#define ENCODERS_PAD_B { B1 } - -/* Uncomment if your encoder doesn't react to every turn or skips */ -//#define ENCODER_RESOLUTION 2 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ @@ -62,7 +45,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 8 - -#define QMK_ESC_OUTPUT D2 // usually COL -#define QMK_ESC_INPUT B4 // usually ROW -#define QMK_LED E6 diff --git a/keyboards/evyd13/ta65/info.json b/keyboards/evyd13/ta65/info.json index f24f599df1..da501c6756 100644 --- a/keyboards/evyd13/ta65/info.json +++ b/keyboards/evyd13/ta65/info.json @@ -8,6 +8,19 @@ "pid": "0x7465", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "B2", "pin_b": "B1"} + ] + }, + "qmk_lufa_bootloader": { + "esc_input": "B4", + "esc_output": "D2", + "led": "E6" + }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", + "community_layouts": ["65_ansi", "65_iso"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/evyd13/ta65/rules.mk b/keyboards/evyd13/ta65/rules.mk index 6d60f1ca7e..27132e6747 100644 --- a/keyboards/evyd13/ta65/rules.mk +++ b/keyboards/evyd13/ta65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = qmk-dfu - # Build Options # change yes to no to disable # @@ -17,5 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes - -LAYOUTS = 65_ansi 65_iso |