summaryrefslogtreecommitdiff
path: root/keyboards/jels
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/jels')
-rw-r--r--keyboards/jels/jels60/config.h8
-rw-r--r--keyboards/jels/jels60/info.json15
-rw-r--r--keyboards/jels/jels60/jels60.c21
-rw-r--r--keyboards/jels/jels88/config.h10
-rw-r--r--keyboards/jels/jels88/info.json7
5 files changed, 16 insertions, 45 deletions
diff --git a/keyboards/jels/jels60/config.h b/keyboards/jels/jels60/config.h
index b03ceffba8..d78952f261 100644
--- a/keyboards/jels/jels60/config.h
+++ b/keyboards/jels/jels60/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/*Define Matrix Pins */
-#define MATRIX_ROW_PINS {B3, D2, F0, F4, F1}
-#define MATRIX_COL_PINS {E6, C7, B4, D7, D6, D4, D5, D3, F5, F6, F7, C6, B6, B5}
-
-/* COL2ROW or 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 */
diff --git a/keyboards/jels/jels60/info.json b/keyboards/jels/jels60/info.json
index 3d3b59ca7e..418410c3ff 100644
--- a/keyboards/jels/jels60/info.json
+++ b/keyboards/jels/jels60/info.json
@@ -8,6 +8,11 @@
"pid": "0x0060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["E6", "C7", "B4", "D7", "D6", "D4", "D5", "D3", "F5", "F6", "F7", "C6", "B6", "B5"],
+ "rows": ["B3", "D2", "F0", "F4", "F1"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B7"
},
@@ -76,7 +81,7 @@
{ "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
{ "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
{ "x": 3.75, "y": 4, "w": 2.75 },
- { "x": 6.5, "y": 4, "w": 1 },
+ { "x": 6.5, "y": 4 },
{ "x": 7.5, "y": 4, "w": 2.5 },
{ "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 11.25, "y": 4, "w": 1.25 },
@@ -208,13 +213,13 @@
{ "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
{ "x": 14, "y": 3 },
{ "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 },
- { "label": "Win", "x": 1.5, "y": 4, "w": 1 },
+ { "label": "Win", "x": 1.5, "y": 4 },
{ "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 },
{ "x": 4, "y": 4, "w": 2.75 },
{ "x": 6.75, "y": 4, "w": 1.5 },
{ "x": 8.25, "y": 4, "w": 2.75 },
{ "label": "Alt", "x": 11, "y": 4, "w": 1.5 },
- { "label": "Win", "x": 12.5, "y": 4, "w": 1 },
+ { "label": "Win", "x": 12.5, "y": 4 },
{ "label": "Ctrl", "x": 13.5, "y": 4, "w": 1.5 }
]
},
@@ -276,11 +281,11 @@
{ "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
{ "x": 14, "y": 3 },
{ "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 },
- { "label": "Win", "x": 1.5, "y": 4, "w": 1 },
+ { "label": "Win", "x": 1.5, "y": 4 },
{ "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 },
{ "x": 4, "y": 4, "w": 7 },
{ "label": "Alt", "x": 11, "y": 4, "w": 1.5 },
- { "label": "Win", "x": 12.5, "y": 4, "w": 1 },
+ { "label": "Win", "x": 12.5, "y": 4 },
{ "label": "Ctrl", "x": 13.5, "y": 4, "w": 1.5 }
]
},
diff --git a/keyboards/jels/jels60/jels60.c b/keyboards/jels/jels60/jels60.c
deleted file mode 100644
index 6e8fd58da8..0000000000
--- a/keyboards/jels/jels60/jels60.c
+++ /dev/null
@@ -1,21 +0,0 @@
- /* Copyright 2022 Joah Nelson (Jels)
- *
- * 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 "jels60.h"
-
-
-
-
diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h
index b655834c02..3eec23b214 100644
--- a/keyboards/jels/jels88/config.h
+++ b/keyboards/jels/jels88/config.h
@@ -16,13 +16,6 @@
#pragma once
-
-/*Define Matrix Pins */
-#define MATRIX_ROW_PINS \
- { B3, B2, D1, D0, E6, B0, F0, F1, B5, B4, D7, D6 }
-#define MATRIX_COL_PINS \
- { C7, C6, F7, F6, F5, F4, B1, D2, D3 }
-
/* ws2812b RGB LEDs */
#define RGB_DI_PIN B6
@@ -43,9 +36,6 @@
#define RGBLIGHT_LIMIT_VAL 225 // keep PCB under 500mA
#endif
-/* COL2ROW or 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 */
diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json
index fed2fe9f4c..6542e29a08 100644
--- a/keyboards/jels/jels88/info.json
+++ b/keyboards/jels/jels88/info.json
@@ -8,6 +8,11 @@
"pid": "0x0088",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C7", "C6", "F7", "F6", "F5", "F4", "B1", "D2", "D3"],
+ "rows": ["B3", "B2", "D1", "D0", "E6", "B0", "F0", "F1", "B5", "B4", "D7", "D6"]
+ },
+ "diode_direction": "COL2ROW",
"bootmagic": {
"matrix": [1, 0]
},
@@ -269,7 +274,7 @@
{ "label": "L", "x": 9.75, "y": 3.25 },
{ "label": ":", "x": 10.75, "y": 3.25 },
{ "label": "\"", "x": 11.75, "y": 3.25 },
- { "label": "|", "x": 12.75, "y": 3.25, "w": 1 },
+ { "label": "|", "x": 12.75, "y": 3.25 },
{ "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
{ "label": "|", "x": 1.25, "y": 4.25 },
{ "label": "Z", "x": 2.25, "y": 4.25 },