summaryrefslogtreecommitdiff
path: root/keyboards/edda
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2023-02-28 11:22:29 +1100
committerNick Brassel <nick@tzarc.org>2023-02-28 11:22:29 +1100
commitbacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch)
treed4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/edda
parentd70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff)
parentb865b9e1706ad28ae4882bd2e0331e98808295fa (diff)
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/edda')
-rw-r--r--keyboards/edda/config.h11
-rw-r--r--keyboards/edda/info.json3
-rw-r--r--keyboards/edda/rules.mk8
3 files changed, 3 insertions, 19 deletions
diff --git a/keyboards/edda/config.h b/keyboards/edda/config.h
index 33030c2fb6..3e71d942d3 100644
--- a/keyboards/edda/config.h
+++ b/keyboards/edda/config.h
@@ -13,11 +13,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 5
-#define MATRIX_COLS 16
// ROWS: Top to bottom, COLS: Left to right
@@ -27,12 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* 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
-
// Indicators
#define INDICATOR_PIN_0 B2
#define INDICATOR_PIN_1 B1
diff --git a/keyboards/edda/info.json b/keyboards/edda/info.json
index c9cdd45dbe..9b3c6c733a 100644
--- a/keyboards/edda/info.json
+++ b/keyboards/edda/info.json
@@ -8,6 +8,9 @@
"pid": "0x4544",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "qmk-dfu",
+ "community_layouts": ["alice", "alice_split_bs"],
"layouts": {
"LAYOUT_alice_split_bs": {
"layout": [
diff --git a/keyboards/edda/rules.mk b/keyboards/edda/rules.mk
index fe1bebb5b2..ab2c49da70 100644
--- a/keyboards/edda/rules.mk
+++ b/keyboards/edda/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = qmk-dfu
-
# Build Options
# change yes to no to disable
#
@@ -16,5 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-
-LAYOUTS = alice alice_split_bs