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/ft/mars65 | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/ft/mars65')
| -rw-r--r-- | keyboards/ft/mars65/config.h | 9 | ||||
| -rw-r--r-- | keyboards/ft/mars65/info.json | 5 | ||||
| -rw-r--r-- | keyboards/ft/mars65/rules.mk | 6 |
3 files changed, 5 insertions, 15 deletions
diff --git a/keyboards/ft/mars65/config.h b/keyboards/ft/mars65/config.h index 69efcea1fc..53f33428df 100644 --- a/keyboards/ft/mars65/config.h +++ b/keyboards/ft/mars65/config.h @@ -3,11 +3,6 @@ #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 /* * Keyboard Matrix Assignments @@ -24,10 +19,6 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 3 - #define RGB_DI_PIN E6 #ifdef RGB_DI_PIN #define RGBLED_NUM 24 diff --git a/keyboards/ft/mars65/info.json b/keyboards/ft/mars65/info.json index f2307b60c1..1d1dd840d9 100644 --- a/keyboards/ft/mars65/info.json +++ b/keyboards/ft/mars65/info.json @@ -8,6 +8,11 @@ "pid": "0x422F", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/ft/mars65/rules.mk b/keyboards/ft/mars65/rules.mk index f3e472d0cd..9e327f9e3c 100644 --- a/keyboards/ft/mars65/rules.mk +++ b/keyboards/ft/mars65/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |