summaryrefslogtreecommitdiff
path: root/keyboards/eason
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/eason')
-rw-r--r--keyboards/eason/aeroboard/aeroboard.c4
-rw-r--r--keyboards/eason/aeroboard/config.h4
-rw-r--r--keyboards/eason/aeroboard/info.json5
-rw-r--r--keyboards/eason/capsule65/capsule65.c17
-rw-r--r--keyboards/eason/capsule65/config.h16
-rw-r--r--keyboards/eason/capsule65/info.json5
-rw-r--r--keyboards/eason/greatsword80/config.h6
-rw-r--r--keyboards/eason/greatsword80/info.json5
8 files changed, 15 insertions, 47 deletions
diff --git a/keyboards/eason/aeroboard/aeroboard.c b/keyboards/eason/aeroboard/aeroboard.c
deleted file mode 100644
index 091fcf2fac..0000000000
--- a/keyboards/eason/aeroboard/aeroboard.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Eason
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "aeroboard.h"
diff --git a/keyboards/eason/aeroboard/config.h b/keyboards/eason/aeroboard/config.h
index 3c23bce9be..c8c69d2ee0 100644
--- a/keyboards/eason/aeroboard/config.h
+++ b/keyboards/eason/aeroboard/config.h
@@ -3,10 +3,6 @@
#pragma once
-#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12, A5, A4 }
-#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 }
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/eason/aeroboard/info.json b/keyboards/eason/aeroboard/info.json
index 73ef41d221..26f5309847 100644
--- a/keyboards/eason/aeroboard/info.json
+++ b/keyboards/eason/aeroboard/info.json
@@ -8,6 +8,11 @@
"pid": "0x8870",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "B11", "A15", "A10", "A9", "B14", "B13", "B12", "A5", "A4"],
+ "rows": ["B10", "B1", "B0", "A7", "A6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F103",
"bootloader": "stm32duino",
"layouts": {
diff --git a/keyboards/eason/capsule65/capsule65.c b/keyboards/eason/capsule65/capsule65.c
deleted file mode 100644
index c04abea9e4..0000000000
--- a/keyboards/eason/capsule65/capsule65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 EASON <xiaoxuxk@yeah.net>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "capsule65.h"
diff --git a/keyboards/eason/capsule65/config.h b/keyboards/eason/capsule65/config.h
index 176ccc1689..0048707fd2 100644
--- a/keyboards/eason/capsule65/config.h
+++ b/keyboards/eason/capsule65/config.h
@@ -16,22 +16,6 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, D1, B7, D0, F5 }
-#define MATRIX_COL_PINS { D5, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7, E2, B3, B1, B0, B2 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN F7
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/eason/capsule65/info.json b/keyboards/eason/capsule65/info.json
index 4c49f6feef..9935a33134 100644
--- a/keyboards/eason/capsule65/info.json
+++ b/keyboards/eason/capsule65/info.json
@@ -8,6 +8,11 @@
"pid": "0x6E6E",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D5", "D2", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "B3", "B1", "B0", "B2"],
+ "rows": ["F4", "D1", "B7", "D0", "F5"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "F6"
},
diff --git a/keyboards/eason/greatsword80/config.h b/keyboards/eason/greatsword80/config.h
index 73347f77df..9a0ee7ab72 100644
--- a/keyboards/eason/greatsword80/config.h
+++ b/keyboards/eason/greatsword80/config.h
@@ -16,11 +16,5 @@
#pragma once
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, C6, C7, E2, F7, F6, F5, F4, B0, B1, B2, B3 }
-
-
-#define DIODE_DIRECTION COL2ROW
-
#define LED_CAPS_LOCK_PIN F0
#define LED_PIN_ON_STATE 0
diff --git a/keyboards/eason/greatsword80/info.json b/keyboards/eason/greatsword80/info.json
index 69e4bc7ef2..b3a448ef1b 100644
--- a/keyboards/eason/greatsword80/info.json
+++ b/keyboards/eason/greatsword80/info.json
@@ -8,6 +8,11 @@
"pid": "0x998F",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "F7", "F6", "F5", "F4", "B0", "B1", "B2", "B3"],
+ "rows": ["D0", "D1", "D2", "D3", "D5", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {