summaryrefslogtreecommitdiff
path: root/keyboards/lefty
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/lefty')
-rw-r--r--keyboards/lefty/config.h6
-rw-r--r--keyboards/lefty/info.json68
-rw-r--r--keyboards/lefty/lefty.c2
-rw-r--r--keyboards/lefty/lefty.h37
-rw-r--r--keyboards/lefty/rev1/config.h22
-rw-r--r--keyboards/lefty/rev1/info.json7
-rw-r--r--keyboards/lefty/rev1/rev1.c17
-rw-r--r--keyboards/lefty/rev2/config.h21
-rw-r--r--keyboards/lefty/rev2/info.json7
-rw-r--r--keyboards/lefty/rev2/rev2.c17
10 files changed, 51 insertions, 153 deletions
diff --git a/keyboards/lefty/config.h b/keyboards/lefty/config.h
index 313e12eb2c..b1432e4d87 100644
--- a/keyboards/lefty/config.h
+++ b/keyboards/lefty/config.h
@@ -16,12 +16,6 @@
#pragma once
-
-/* key matrix pins are in subfolders v1/v2 */
-
-/* Diode direction */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/lefty/info.json b/keyboards/lefty/info.json
index ac48f157aa..b964980d7d 100644
--- a/keyboards/lefty/info.json
+++ b/keyboards/lefty/info.json
@@ -13,38 +13,42 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"F1", "x":0.5, "y":0},
- {"label":"Escape", "x":2, "y":0},
- {"label":"1", "x":3, "y":0},
- {"label":"2", "x":4, "y":0},
- {"label":"3", "x":5, "y":0},
- {"label":"4", "x":6, "y":0},
- {"label":"5", "x":7, "y":0},
- {"label":"6", "x":8, "y":0},
- {"label":"F2", "x":0.25, "y":1},
- {"label":"Tab", "x":1.75, "y":1, "w":1.5},
- {"label":"Q", "x":3.25, "y":1},
- {"label":"W", "x":4.25, "y":1},
- {"label":"E", "x":5.25, "y":1},
- {"label":"R", "x":6.25, "y":1},
- {"label":"T", "x":7.25, "y":1},
- {"label":"F3", "x":0, "y":2},
- {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
- {"label":"A", "x":3.25, "y":2},
- {"label":"S", "x":4.25, "y":2},
- {"label":"D", "x":5.25, "y":2},
- {"label":"F", "x":6.25, "y":2},
- {"label":"G", "x":7.25, "y":2},
- {"label":"Shift", "x":1.25, "y":3, "w":2.25},
- {"label":"Z", "x":3.5, "y":3},
- {"label":"X", "x":4.5, "y":3},
- {"label":"C", "x":5.5, "y":3},
- {"label":"V", "x":6.5, "y":3},
- {"label":"B", "x":7.5, "y":3},
- {"label":"Control", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":4.5, "y":4, "w":1.25},
- {"label":"Layer2", "x":5.75, "y":4, "w":2},
- {"label":"Layer3", "x":7.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0.5, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6, "y": 0},
+ {"matrix": [0, 6], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.25, "y": 1},
+ {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3.25, "y": 1},
+ {"matrix": [1, 3], "x": 4.25, "y": 1},
+ {"matrix": [1, 4], "x": 5.25, "y": 1},
+ {"matrix": [1, 5], "x": 6.25, "y": 1},
+ {"matrix": [1, 6], "x": 7.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 2},
+ {"matrix": [2, 6], "x": 7.25, "y": 2},
+
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.5, "y": 3},
+ {"matrix": [3, 3], "x": 4.5, "y": 3},
+ {"matrix": [3, 4], "x": 5.5, "y": 3},
+ {"matrix": [3, 5], "x": 6.5, "y": 3},
+ {"matrix": [3, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2},
+ {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25}
]
}
}
diff --git a/keyboards/lefty/lefty.c b/keyboards/lefty/lefty.c
index a3e5301ea1..b1bea424b0 100644
--- a/keyboards/lefty/lefty.c
+++ b/keyboards/lefty/lefty.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "lefty.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
bool oled_task_kb(void) {
diff --git a/keyboards/lefty/lefty.h b/keyboards/lefty/lefty.h
deleted file mode 100644
index 2466552353..0000000000
--- a/keyboards/lefty/lefty.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* 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"
-
-// keymap
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, \
- K10, K11, K12, K13, K14, K15, K16, \
- K20, K21, K22, K23, K24, K25, K26, \
- K31, K32, K33, K34, K35, K36, \
- K41, K43, K44, K46 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, K16, KC_NO }, \
- { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \
- { KC_NO, K31, K32, K33, K34, K35, K36, KC_NO }, \
- { KC_NO, K41, KC_NO, K43, K44, KC_NO, K46, KC_NO } \
-}
-
-#define LAYOUT LAYOUT
diff --git a/keyboards/lefty/rev1/config.h b/keyboards/lefty/rev1/config.h
deleted file mode 100644
index fa70eeb359..0000000000
--- a/keyboards/lefty/rev1/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* 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
-
-/* key matrix pins */
-
-#define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 }
-#define MATRIX_COL_PINS { D4, B5, F5, F6, F7, B1, B3, F4 }
diff --git a/keyboards/lefty/rev1/info.json b/keyboards/lefty/rev1/info.json
new file mode 100644
index 0000000000..0a3e44c86f
--- /dev/null
+++ b/keyboards/lefty/rev1/info.json
@@ -0,0 +1,7 @@
+{
+ "matrix_pins": {
+ "cols": ["D4", "B5", "F5", "F6", "F7", "B1", "B3", "F4"],
+ "rows": ["F0", "F1", "C7", "D5", "B7"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/lefty/rev1/rev1.c b/keyboards/lefty/rev1/rev1.c
deleted file mode 100644
index 81734fd7fc..0000000000
--- a/keyboards/lefty/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* 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 "lefty.h"
diff --git a/keyboards/lefty/rev2/config.h b/keyboards/lefty/rev2/config.h
deleted file mode 100644
index 8289418728..0000000000
--- a/keyboards/lefty/rev2/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* 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
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B2, B6, D7, E6, B4 }
-#define MATRIX_COL_PINS { D4, B5, F5, F6, F7, B1, B3, F4 }
diff --git a/keyboards/lefty/rev2/info.json b/keyboards/lefty/rev2/info.json
new file mode 100644
index 0000000000..9b8578c0db
--- /dev/null
+++ b/keyboards/lefty/rev2/info.json
@@ -0,0 +1,7 @@
+{
+ "matrix_pins": {
+ "cols": ["D4", "B5", "F5", "F6", "F7", "B1", "B3", "F4"],
+ "rows": ["B2", "B6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW"
+}
diff --git a/keyboards/lefty/rev2/rev2.c b/keyboards/lefty/rev2/rev2.c
deleted file mode 100644
index 81734fd7fc..0000000000
--- a/keyboards/lefty/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Smoll Chungus (@smollchungus)
-*
-* 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 "lefty.h"