summaryrefslogtreecommitdiff
path: root/keyboards/edi
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/edi')
-rw-r--r--keyboards/edi/hardlight/mk1/config.h19
-rw-r--r--keyboards/edi/hardlight/mk1/info.json141
-rw-r--r--keyboards/edi/hardlight/mk1/mk1.c18
-rw-r--r--keyboards/edi/hardlight/mk1/mk1.h41
-rw-r--r--keyboards/edi/hardlight/mk2/config.h5
-rw-r--r--keyboards/edi/hardlight/mk2/info.json140
-rw-r--r--keyboards/edi/hardlight/mk2/mk2.c18
-rw-r--r--keyboards/edi/hardlight/mk2/mk2.h37
-rw-r--r--keyboards/edi/hardlight/mk2/rules.mk1
-rw-r--r--keyboards/edi/standaside/config.h19
-rw-r--r--keyboards/edi/standaside/info.json136
-rw-r--r--keyboards/edi/standaside/standaside.c1
-rw-r--r--keyboards/edi/standaside/standaside.h23
13 files changed, 224 insertions, 375 deletions
diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h
index 5d074c2e4a..6677c4587e 100644
--- a/keyboards/edi/hardlight/mk1/config.h
+++ b/keyboards/edi/hardlight/mk1/config.h
@@ -17,24 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 { B0, B1, B2, B3, D4, D6, D7, B4 }
-#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B5 }
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
@@ -43,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/*
* Enable RGB Underlighting
*/
-#define RGB_DI_PIN C7
#define RGBLED_NUM 15
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/edi/hardlight/mk1/info.json b/keyboards/edi/hardlight/mk1/info.json
index 7849eae7ca..d7275dfa70 100644
--- a/keyboards/edi/hardlight/mk1/info.json
+++ b/keyboards/edi/hardlight/mk1/info.json
@@ -6,75 +6,86 @@
"pid": "0x2401",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5"],
+ "rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "ws2812": {
+ "pin": "C7"
+ },
"processor": "atmega32u4",
- "bootloader": "atmel-dfu"
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_ortho_4x16": {
"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 },
- { "x": 12, "y": 0 },
- { "x": 13, "y": 0 },
- { "x": 14, "y": 0 },
- { "x": 15, "y": 0 },
- { "x": 0, "y": 1 },
- { "x": 1, "y": 1 },
- { "x": 2, "y": 1 },
- { "x": 3, "y": 1 },
- { "x": 4, "y": 1 },
- { "x": 5, "y": 1 },
- { "x": 6, "y": 1 },
- { "x": 7, "y": 1 },
- { "x": 8, "y": 1 },
- { "x": 9, "y": 1 },
- { "x": 10, "y": 1 },
- { "x": 11, "y": 1 },
- { "x": 12, "y": 1 },
- { "x": 13, "y": 1 },
- { "x": 14, "y": 1 },
- { "x": 15, "y": 1 },
- { "x": 0, "y": 2 },
- { "x": 1, "y": 2 },
- { "x": 2, "y": 2 },
- { "x": 3, "y": 2 },
- { "x": 4, "y": 2 },
- { "x": 5, "y": 2 },
- { "x": 6, "y": 2 },
- { "x": 7, "y": 2 },
- { "x": 8, "y": 2 },
- { "x": 9, "y": 2 },
- { "x": 10, "y": 2 },
- { "x": 11, "y": 2 },
- { "x": 12, "y": 2 },
- { "x": 13, "y": 2 },
- { "x": 14, "y": 2 },
- { "x": 15, "y": 2 },
- { "x": 0, "y": 3 },
- { "x": 1, "y": 3 },
- { "x": 2, "y": 3 },
- { "x": 3, "y": 3 },
- { "x": 4, "y": 3 },
- { "x": 5, "y": 3 },
- { "x": 6, "y": 3 },
- { "x": 7, "y": 3 },
- { "x": 8, "y": 3 },
- { "x": 9, "y": 3 },
- { "x": 10, "y": 3 },
- { "x": 11, "y": 3 },
- { "x": 12, "y": 3 },
- { "x": 13, "y": 3 },
- { "x": 14, "y": 3 },
- { "x": 15, "y": 3 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [0, 7], "x": 14, "y": 0},
+ {"matrix": [1, 7], "x": 15, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [3, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [2, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+ {"matrix": [2, 6], "x": 12, "y": 1},
+ {"matrix": [3, 6], "x": 13, "y": 1},
+ {"matrix": [2, 7], "x": 14, "y": 1},
+ {"matrix": [3, 7], "x": 15, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2, "y": 2},
+ {"matrix": [5, 1], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [5, 2], "x": 5, "y": 2},
+ {"matrix": [4, 3], "x": 6, "y": 2},
+ {"matrix": [5, 3], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [5, 4], "x": 9, "y": 2},
+ {"matrix": [4, 5], "x": 10, "y": 2},
+ {"matrix": [5, 5], "x": 11, "y": 2},
+ {"matrix": [4, 6], "x": 12, "y": 2},
+ {"matrix": [5, 6], "x": 13, "y": 2},
+ {"matrix": [4, 7], "x": 14, "y": 2},
+ {"matrix": [5, 7], "x": 15, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [6, 1], "x": 2, "y": 3},
+ {"matrix": [7, 1], "x": 3, "y": 3},
+ {"matrix": [6, 2], "x": 4, "y": 3},
+ {"matrix": [7, 2], "x": 5, "y": 3},
+ {"matrix": [6, 3], "x": 6, "y": 3},
+ {"matrix": [7, 3], "x": 7, "y": 3},
+ {"matrix": [6, 4], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [6, 5], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
+ {"matrix": [6, 6], "x": 12, "y": 3},
+ {"matrix": [7, 6], "x": 13, "y": 3},
+ {"matrix": [6, 7], "x": 14, "y": 3},
+ {"matrix": [7, 7], "x": 15, "y": 3}
]
}
}
diff --git a/keyboards/edi/hardlight/mk1/mk1.c b/keyboards/edi/hardlight/mk1/mk1.c
deleted file mode 100644
index 5a1e0bbb19..0000000000
--- a/keyboards/edi/hardlight/mk1/mk1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
-
-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 3 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 "mk1.h"
diff --git a/keyboards/edi/hardlight/mk1/mk1.h b/keyboards/edi/hardlight/mk1/mk1.h
deleted file mode 100644
index e8ef9777a4..0000000000
--- a/keyboards/edi/hardlight/mk1/mk1.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
-
-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 3 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"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_ortho_4x16( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, \
- K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, K31, \
- K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, \
- K48, K49, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K60, K61, K62, K63 \
-) \
-{ \
- { K00, K02, K04, K06, K08, K10, K12, K14 }, \
- { K01, K03, K05, K07, K09, K11, K13, K15 }, \
- { K16, K18, K20, K22, K24, K26, K28, K30 }, \
- { K17, K19, K21, K23, K25, K27, K29, K31 }, \
- { K32, K34, K36, K38, K40, K42, K44, K46 }, \
- { K33, K35, K37, K39, K41, K43, K45, K47 }, \
- { K48, K50, K52, K54, K56, K58, K60, K62 }, \
- { K49, K51, K53, K55, K57, K59, K61, K63 } \
-}
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
index c140a7bad5..3ea34c53ee 100644
--- a/keyboards/edi/hardlight/mk2/config.h
+++ b/keyboards/edi/hardlight/mk2/config.h
@@ -17,17 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B2, B6, B5, F1, F0, C15, C14, C13 }
-#define MATRIX_ROW_PINS { B10, B11, A14, A15, A3, A0, A2, A1 }
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
/* RGB Underglow */
-#define RGB_DI_PIN A10
#define RGBLED_NUM 32
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/info.json
index aff84f1e32..63ca3aa15d 100644
--- a/keyboards/edi/hardlight/mk2/info.json
+++ b/keyboards/edi/hardlight/mk2/info.json
@@ -6,76 +6,88 @@
"pid": "0x2408",
"device_version": "0.0.7"
},
+ "ws2812": {
+ "pin": "A10",
+ "driver": "pwm"
+ },
+ "matrix_pins": {
+ "cols": ["B2", "B6", "B5", "F1", "F0", "C15", "C14", "C13"],
+ "rows": ["B10", "B11", "A14", "A15", "A3", "A0", "A2", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"community_layouts": ["ortho_4x16"],
"layouts": {
"LAYOUT_ortho_4x16": {
"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 },
- { "x": 12, "y": 0 },
- { "x": 13, "y": 0 },
- { "x": 14, "y": 0 },
- { "x": 15, "y": 0 },
- { "x": 0, "y": 1 },
- { "x": 1, "y": 1 },
- { "x": 2, "y": 1 },
- { "x": 3, "y": 1 },
- { "x": 4, "y": 1 },
- { "x": 5, "y": 1 },
- { "x": 6, "y": 1 },
- { "x": 7, "y": 1 },
- { "x": 8, "y": 1 },
- { "x": 9, "y": 1 },
- { "x": 10, "y": 1 },
- { "x": 11, "y": 1 },
- { "x": 12, "y": 1 },
- { "x": 13, "y": 1 },
- { "x": 14, "y": 1 },
- { "x": 15, "y": 1 },
- { "x": 0, "y": 2 },
- { "x": 1, "y": 2 },
- { "x": 2, "y": 2 },
- { "x": 3, "y": 2 },
- { "x": 4, "y": 2 },
- { "x": 5, "y": 2 },
- { "x": 6, "y": 2 },
- { "x": 7, "y": 2 },
- { "x": 8, "y": 2 },
- { "x": 9, "y": 2 },
- { "x": 10, "y": 2 },
- { "x": 11, "y": 2 },
- { "x": 12, "y": 2 },
- { "x": 13, "y": 2 },
- { "x": 14, "y": 2 },
- { "x": 15, "y": 2 },
- { "x": 0, "y": 3 },
- { "x": 1, "y": 3 },
- { "x": 2, "y": 3 },
- { "x": 3, "y": 3 },
- { "x": 4, "y": 3 },
- { "x": 5, "y": 3 },
- { "x": 6, "y": 3 },
- { "x": 7, "y": 3 },
- { "x": 8, "y": 3 },
- { "x": 9, "y": 3 },
- { "x": 10, "y": 3 },
- { "x": 11, "y": 3 },
- { "x": 12, "y": 3 },
- { "x": 13, "y": 3 },
- { "x": 14, "y": 3 },
- { "x": 15, "y": 3 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [0, 7], "x": 14, "y": 0},
+ {"matrix": [1, 7], "x": 15, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [3, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [2, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+ {"matrix": [2, 6], "x": 12, "y": 1},
+ {"matrix": [3, 6], "x": 13, "y": 1},
+ {"matrix": [2, 7], "x": 14, "y": 1},
+ {"matrix": [3, 7], "x": 15, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2, "y": 2},
+ {"matrix": [5, 1], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [5, 2], "x": 5, "y": 2},
+ {"matrix": [4, 3], "x": 6, "y": 2},
+ {"matrix": [5, 3], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [5, 4], "x": 9, "y": 2},
+ {"matrix": [4, 5], "x": 10, "y": 2},
+ {"matrix": [5, 5], "x": 11, "y": 2},
+ {"matrix": [4, 6], "x": 12, "y": 2},
+ {"matrix": [5, 6], "x": 13, "y": 2},
+ {"matrix": [4, 7], "x": 14, "y": 2},
+ {"matrix": [5, 7], "x": 15, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [6, 1], "x": 2, "y": 3},
+ {"matrix": [7, 1], "x": 3, "y": 3},
+ {"matrix": [6, 2], "x": 4, "y": 3},
+ {"matrix": [7, 2], "x": 5, "y": 3},
+ {"matrix": [6, 3], "x": 6, "y": 3},
+ {"matrix": [7, 3], "x": 7, "y": 3},
+ {"matrix": [6, 4], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [6, 5], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
+ {"matrix": [6, 6], "x": 12, "y": 3},
+ {"matrix": [7, 6], "x": 13, "y": 3},
+ {"matrix": [6, 7], "x": 14, "y": 3},
+ {"matrix": [7, 7], "x": 15, "y": 3}
]
}
}
diff --git a/keyboards/edi/hardlight/mk2/mk2.c b/keyboards/edi/hardlight/mk2/mk2.c
deleted file mode 100644
index ab4414e4d2..0000000000
--- a/keyboards/edi/hardlight/mk2/mk2.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
-
-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 3 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 "mk2.h"
diff --git a/keyboards/edi/hardlight/mk2/mk2.h b/keyboards/edi/hardlight/mk2/mk2.h
deleted file mode 100644
index 5065582d65..0000000000
--- a/keyboards/edi/hardlight/mk2/mk2.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
-
-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 3 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_ortho_4x16( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, \
- K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, K31, \
- K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, \
- K48, K49, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K60, K61, K62, K63 \
-) \
-{ \
- { K00, K02, K04, K06, K08, K10, K12, K14 }, \
- { K01, K03, K05, K07, K09, K11, K13, K15 }, \
- { K16, K18, K20, K22, K24, K26, K28, K30 }, \
- { K17, K19, K21, K23, K25, K27, K29, K31 }, \
- { K32, K34, K36, K38, K40, K42, K44, K46 }, \
- { K33, K35, K37, K39, K41, K43, K45, K47 }, \
- { K48, K50, K52, K54, K56, K58, K60, K62 }, \
- { K49, K51, K53, K55, K57, K59, K61, K63 } \
-}
diff --git a/keyboards/edi/hardlight/mk2/rules.mk b/keyboards/edi/hardlight/mk2/rules.mk
index aad4915dd6..69c4b26a9e 100644
--- a/keyboards/edi/hardlight/mk2/rules.mk
+++ b/keyboards/edi/hardlight/mk2/rules.mk
@@ -15,7 +15,6 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
VELOCIKEY_ENABLE = yes
KEY_LOCK_ENABLE = yes
-WS2812_DRIVER = pwm
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/edi/standaside/config.h b/keyboards/edi/standaside/config.h
index df40d532f8..e59dbc15e6 100644
--- a/keyboards/edi/standaside/config.h
+++ b/keyboards/edi/standaside/config.h
@@ -2,24 +2,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 { D1, F4, F6, F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { F5, D0, D4, C6, D7, E6, B4, B5 }
-
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
@@ -28,7 +10,6 @@
/*
* Enable RGB Underlighting
*/
-#define RGB_DI_PIN C7
#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/edi/standaside/info.json b/keyboards/edi/standaside/info.json
index 95d3e6d6ee..0c8bb289b0 100644
--- a/keyboards/edi/standaside/info.json
+++ b/keyboards/edi/standaside/info.json
@@ -8,78 +8,86 @@
"pid": "0x0412",
"device_version": "0.0.3"
},
+ "matrix_pins": {
+ "cols": ["F5", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["D1", "F4", "F6", "F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
+ "ws2812": {
+ "pin": "C7"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_ortho_4x16": {
"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},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+ {"matrix": [0, 3], "x": 6, "y": 0},
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 4], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+ {"matrix": [0, 7], "x": 14, "y": 0},
+ {"matrix": [1, 7], "x": 15, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
- {"x":10, "y":1},
- {"x":11, "y":1},
- {"x":12, "y":1},
- {"x":13, "y":1},
- {"x":14, "y":1},
- {"x":15, "y":1},
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [3, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [3, 3], "x": 7, "y": 1},
+ {"matrix": [2, 4], "x": 8, "y": 1},
+ {"matrix": [3, 4], "x": 9, "y": 1},
+ {"matrix": [2, 5], "x": 10, "y": 1},
+ {"matrix": [3, 5], "x": 11, "y": 1},
+ {"matrix": [2, 6], "x": 12, "y": 1},
+ {"matrix": [3, 6], "x": 13, "y": 1},
+ {"matrix": [2, 7], "x": 14, "y": 1},
+ {"matrix": [3, 7], "x": 15, "y": 1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
- {"x":12, "y":2},
- {"x":13, "y":2},
- {"x":14, "y":2},
- {"x":15, "y":2},
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2, "y": 2},
+ {"matrix": [5, 1], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+ {"matrix": [5, 2], "x": 5, "y": 2},
+ {"matrix": [4, 3], "x": 6, "y": 2},
+ {"matrix": [5, 3], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [5, 4], "x": 9, "y": 2},
+ {"matrix": [4, 5], "x": 10, "y": 2},
+ {"matrix": [5, 5], "x": 11, "y": 2},
+ {"matrix": [4, 6], "x": 12, "y": 2},
+ {"matrix": [5, 6], "x": 13, "y": 2},
+ {"matrix": [4, 7], "x": 14, "y": 2},
+ {"matrix": [5, 7], "x": 15, "y": 2},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3},
- {"x":8, "y":3},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3},
- {"x":12, "y":3},
- {"x":13, "y":3},
- {"x":14, "y":3},
- {"x":15, "y":3}
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [6, 1], "x": 2, "y": 3},
+ {"matrix": [7, 1], "x": 3, "y": 3},
+ {"matrix": [6, 2], "x": 4, "y": 3},
+ {"matrix": [7, 2], "x": 5, "y": 3},
+ {"matrix": [6, 3], "x": 6, "y": 3},
+ {"matrix": [7, 3], "x": 7, "y": 3},
+ {"matrix": [6, 4], "x": 8, "y": 3},
+ {"matrix": [7, 4], "x": 9, "y": 3},
+ {"matrix": [6, 5], "x": 10, "y": 3},
+ {"matrix": [7, 5], "x": 11, "y": 3},
+ {"matrix": [6, 6], "x": 12, "y": 3},
+ {"matrix": [7, 6], "x": 13, "y": 3},
+ {"matrix": [6, 7], "x": 14, "y": 3},
+ {"matrix": [7, 7], "x": 15, "y": 3}
]
}
}
diff --git a/keyboards/edi/standaside/standaside.c b/keyboards/edi/standaside/standaside.c
deleted file mode 100644
index 9f445ec044..0000000000
--- a/keyboards/edi/standaside/standaside.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "standaside.h"
diff --git a/keyboards/edi/standaside/standaside.h b/keyboards/edi/standaside/standaside.h
deleted file mode 100644
index 9601f1257c..0000000000
--- a/keyboards/edi/standaside/standaside.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_ortho_4x16( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47 }, \
- { k50, k51, k52, k53, k54, k55, k56, k57 }, \
- { k60, k61, k62, k63, k64, k65, k66, k67 }, \
- { k70, k71, k72, k73, k74, k75, k76, k77 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 15:36:28 +0000