summaryrefslogtreecommitdiff
path: root/keyboards/edc40
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/edc40')
-rw-r--r--keyboards/edc40/config.h17
-rw-r--r--keyboards/edc40/edc40.c16
-rw-r--r--keyboards/edc40/edc40.h32
-rw-r--r--keyboards/edc40/info.json84
4 files changed, 46 insertions, 103 deletions
diff --git a/keyboards/edc40/config.h b/keyboards/edc40/config.h
index 01faa55149..55d7cb23a7 100644
--- a/keyboards/edc40/config.h
+++ b/keyboards/edc40/config.h
@@ -15,22 +15,5 @@
*/
#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 { D4, D6, D7, F7 }
- #define MATRIX_COL_PINS { B0, B1, B2, B3, D0, D1, D2, D3, D5, B4, B5 }
-
- #define DIODE_DIRECTION COL2ROW
-
#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE
-#define RGB_DI_PIN C6
diff --git a/keyboards/edc40/edc40.c b/keyboards/edc40/edc40.c
deleted file mode 100644
index 96746d4f35..0000000000
--- a/keyboards/edc40/edc40.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 OJtheTiny
- *
- * 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 "edc40.h"
diff --git a/keyboards/edc40/edc40.h b/keyboards/edc40/edc40.h
deleted file mode 100644
index 1dca7f4019..0000000000
--- a/keyboards/edc40/edc40.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2020 OJtheTiny
- *
- * 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/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K19, K0A, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K29, K1A, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K2A, \
- K30, K31, K35, K38, K3A \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A }, \
- { K30, K31, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, K38, KC_NO, K3A }, \
-}
-
diff --git a/keyboards/edc40/info.json b/keyboards/edc40/info.json
index 43314e1d82..ccd1b12a0d 100644
--- a/keyboards/edc40/info.json
+++ b/keyboards/edc40/info.json
@@ -8,52 +8,60 @@
"pid": "0x0002",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "B4", "B5"],
+ "rows": ["D4", "D6", "D7", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "ws2812": {
+ "pin": "C6"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0},
- {"x": 5, "y": 0},
- {"x": 6, "y": 0},
- {"x": 7, "y": 0},
- {"x": 8, "y": 0},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0},
- {"x": 11, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [1, 9], "x": 10, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0},
- {"x": 0, "y": 1, "w":1.25},
- {"x": 1.25, "y": 1},
- {"x": 2.25, "y": 1},
- {"x": 3.25, "y": 1},
- {"x": 4.25, "y": 1},
- {"x": 5.25, "y": 1},
- {"x": 6.25, "y": 1},
- {"x": 7.25, "y": 1},
- {"x": 8.25, "y": 1},
- {"x": 9.25, "y": 1},
- {"x": 10.25, "y": 1, "w":1.75},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [2, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},
- {"x": 0, "y": 2, "w":1.75},
- {"x": 1.75, "y": 2},
- {"x": 2.75, "y": 2},
- {"x": 3.75, "y": 2},
- {"x": 4.75, "y": 2},
- {"x": 5.75, "y": 2},
- {"x": 6.75, "y": 2},
- {"x": 7.75, "y": 2},
- {"x": 8.75, "y": 2},
- {"x": 9.75, "y": 2, "w":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 2.25},
- {"x": 0, "y": 3, "w":1.25},
- {"x": 1.25, "y": 3, "w":1.25},
- {"x": 2.5, "y": 3, "w":7},
- {"x": 9.5, "y": 3, "w":1.25},
- {"x": 10.75, "y": 3, "w":1.25}
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 5], "x": 2.5, "y": 3, "w": 7},
+ {"matrix": [3, 8], "x": 9.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25}
]
}
}