summaryrefslogtreecommitdiff
path: root/keyboards/abacus
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/abacus')
-rw-r--r--keyboards/abacus/abacus.c17
-rw-r--r--keyboards/abacus/config.h16
-rw-r--r--keyboards/abacus/info.json81
3 files changed, 43 insertions, 71 deletions
diff --git a/keyboards/abacus/abacus.c b/keyboards/abacus/abacus.c
deleted file mode 100644
index aef62aa921..0000000000
--- a/keyboards/abacus/abacus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 nickolaij
- *
- * 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 "abacus.h"
diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h
index 2e28b792a1..e579dea057 100644
--- a/keyboards/abacus/config.h
+++ b/keyboards/abacus/config.h
@@ -17,24 +17,8 @@ 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 { D3, D2, D4, C6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7, B3, E6, B2, B4, B6, B5}
-
#define DIP_SWITCH_PINS { D0 }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
#define RGB_DI_PIN D1
#ifdef RGB_DI_PIN
diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json
index 132187db26..b2fd151cec 100644
--- a/keyboards/abacus/info.json
+++ b/keyboards/abacus/info.json
@@ -8,6 +8,11 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "B5"],
+ "rows": ["D3", "D2", "D4", "C6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F1", "pin_b": "F0"}
@@ -18,54 +23,54 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"k00", "x":0, "y":0, "w":1},
- {"label":"k01", "x":1, "y":0, "w":1},
- {"label":"k02", "x":2, "y":0, "w":1},
- {"label":"k03", "x":3, "y":0, "w":1},
- {"label":"k04", "x":4, "y":0, "w":1},
- {"label":"k05", "x":5, "y":0, "w":1},
- {"label":"k06", "x":6, "y":0, "w":1},
- {"label":"k07", "x":7, "y":0, "w":1},
- {"label":"k08", "x":8, "y":0, "w":1},
- {"label":"k09", "x":9, "y":0, "w":1},
- {"label":"k0a", "x":10, "y":0, "w":1},
+ {"label":"k00", "x":0, "y":0},
+ {"label":"k01", "x":1, "y":0},
+ {"label":"k02", "x":2, "y":0},
+ {"label":"k03", "x":3, "y":0},
+ {"label":"k04", "x":4, "y":0},
+ {"label":"k05", "x":5, "y":0},
+ {"label":"k06", "x":6, "y":0},
+ {"label":"k07", "x":7, "y":0},
+ {"label":"k08", "x":8, "y":0},
+ {"label":"k09", "x":9, "y":0},
+ {"label":"k0a", "x":10, "y":0},
{"label":"k0b", "x":11, "y":0, "w":1.75},
{"label":"k10", "x":0, "y":1, "w":1.25},
- {"label":"k11", "x":1.25, "y":1, "w":1},
- {"label":"k12", "x":2.25, "y":1, "w":1},
- {"label":"k13", "x":3.25, "y":1, "w":1},
- {"label":"k14", "x":4.25, "y":1, "w":1},
- {"label":"k15", "x":5.25, "y":1, "w":1},
- {"label":"k16", "x":6.25, "y":1, "w":1},
- {"label":"k17", "x":7.25, "y":1, "w":1},
- {"label":"k18", "x":8.25, "y":1, "w":1},
- {"label":"k19", "x":9.25, "y":1, "w":1},
- {"label":"k1a", "x":10.25, "y":1, "w":1},
+ {"label":"k11", "x":1.25, "y":1},
+ {"label":"k12", "x":2.25, "y":1},
+ {"label":"k13", "x":3.25, "y":1},
+ {"label":"k14", "x":4.25, "y":1},
+ {"label":"k15", "x":5.25, "y":1},
+ {"label":"k16", "x":6.25, "y":1},
+ {"label":"k17", "x":7.25, "y":1},
+ {"label":"k18", "x":8.25, "y":1},
+ {"label":"k19", "x":9.25, "y":1},
+ {"label":"k1a", "x":10.25, "y":1},
{"label":"k1b", "x":11.25, "y":1, "w":1.5},
{"label":"k20", "x":0, "y":2, "w":1.75},
- {"label":"k21", "x":1.75, "y":2, "w":1},
- {"label":"k22", "x":2.75, "y":2, "w":1},
- {"label":"k23", "x":3.75, "y":2, "w":1},
- {"label":"k24", "x":4.75, "y":2, "w":1},
- {"label":"k25", "x":5.75, "y":2, "w":1},
- {"label":"k26", "x":6.75, "y":2, "w":1},
- {"label":"k27", "x":7.75, "y":2, "w":1},
- {"label":"k28", "x":8.75, "y":2, "w":1},
- {"label":"k29", "x":9.75, "y":2, "w":1},
- {"label":"k2a", "x":10.75, "y":2, "w":1},
- {"label":"k2b", "x":11.75, "y":2, "w":1},
+ {"label":"k21", "x":1.75, "y":2},
+ {"label":"k22", "x":2.75, "y":2},
+ {"label":"k23", "x":3.75, "y":2},
+ {"label":"k24", "x":4.75, "y":2},
+ {"label":"k25", "x":5.75, "y":2},
+ {"label":"k26", "x":6.75, "y":2},
+ {"label":"k27", "x":7.75, "y":2},
+ {"label":"k28", "x":8.75, "y":2},
+ {"label":"k29", "x":9.75, "y":2},
+ {"label":"k2a", "x":10.75, "y":2},
+ {"label":"k2b", "x":11.75, "y":2},
{"label":"k30", "x":0, "y":3, "w":1.25},
- {"label":"k31", "x":1.25, "y":3, "w":1},
- {"label":"k32", "x":2.25, "y":3, "w":1},
+ {"label":"k31", "x":1.25, "y":3},
+ {"label":"k32", "x":2.25, "y":3},
{"label":"k33", "x":3.25, "y":3, "w":2.75},
{"label":"k34", "x":6, "y":3, "w":2.75},
- {"label":"k35", "x":8.75, "y":3, "w":1},
- {"label":"k36", "x":9.75, "y":3, "w":1},
- {"label":"k37", "x":10.75, "y":3, "w":1},
- {"label":"k38", "x":11.75, "y":3, "w":1}
+ {"label":"k35", "x":8.75, "y":3},
+ {"label":"k36", "x":9.75, "y":3},
+ {"label":"k37", "x":10.75, "y":3},
+ {"label":"k38", "x":11.75, "y":3}
]
}
}