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/hifumi | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/hifumi')
-rw-r--r-- | keyboards/hifumi/config.h | 8 | ||||
-rw-r--r-- | keyboards/hifumi/info.json | 2 | ||||
-rw-r--r-- | keyboards/hifumi/rules.mk | 6 |
3 files changed, 2 insertions, 14 deletions
diff --git a/keyboards/hifumi/config.h b/keyboards/hifumi/config.h index 43786161bb..4f7e1e89ec 100644 --- a/keyboards/hifumi/config.h +++ b/keyboards/hifumi/config.h @@ -16,11 +16,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 3 /* * Keyboard Matrix Assignments @@ -36,9 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_COL_PINS { F4, F5, F6 } #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* ws2812 RGB LED */ #define RGB_DI_PIN D3 #define RGBLED_NUM 6 diff --git a/keyboards/hifumi/info.json b/keyboards/hifumi/info.json index 5f9821a7d8..f345bf7f3c 100644 --- a/keyboards/hifumi/info.json +++ b/keyboards/hifumi/info.json @@ -8,6 +8,8 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [{"label":"F5", "x":0, "y":0}, {"label":"Up", "x":1, "y":0}, {"label":"PrSc", "x":2, "y":0}, {"label":"Left", "x":0, "y":1}, {"label":"Down", "x":1, "y":1}, {"label":"Right", "x":2, "y":1}] diff --git a/keyboards/hifumi/rules.mk b/keyboards/hifumi/rules.mk index 2e57c8520c..da7ffbbc48 100644 --- a/keyboards/hifumi/rules.mk +++ b/keyboards/hifumi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # |