summaryrefslogtreecommitdiff
path: root/keyboards/unikeyboard
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/unikeyboard')
-rw-r--r--keyboards/unikeyboard/diverge3/config.h17
-rw-r--r--keyboards/unikeyboard/diverge3/diverge3.c16
-rw-r--r--keyboards/unikeyboard/diverge3/diverge3.h50
-rw-r--r--keyboards/unikeyboard/diverge3/info.json89
-rw-r--r--keyboards/unikeyboard/divergetm2/config.h17
-rw-r--r--keyboards/unikeyboard/divergetm2/divergetm2.c17
-rw-r--r--keyboards/unikeyboard/divergetm2/divergetm2.h8
-rw-r--r--keyboards/unikeyboard/divergetm2/info.json5
-rw-r--r--keyboards/unikeyboard/felix/config.h17
-rw-r--r--keyboards/unikeyboard/felix/felix.c1
-rw-r--r--keyboards/unikeyboard/felix/felix.h19
-rw-r--r--keyboards/unikeyboard/felix/info.json52
12 files changed, 125 insertions, 183 deletions
diff --git a/keyboards/unikeyboard/diverge3/config.h b/keyboards/unikeyboard/diverge3/config.h
index c9a5d49447..b5ed9415d5 100644
--- a/keyboards/unikeyboard/diverge3/config.h
+++ b/keyboards/unikeyboard/diverge3/config.h
@@ -17,23 +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 { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
#ifndef SELECT_SOFT_SERIAL_SPEED
#define SELECT_SOFT_SERIAL_SPEED 3
#endif
diff --git a/keyboards/unikeyboard/diverge3/diverge3.c b/keyboards/unikeyboard/diverge3/diverge3.c
deleted file mode 100644
index 4143b14275..0000000000
--- a/keyboards/unikeyboard/diverge3/diverge3.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 IslandMan93
- *
- * 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 "diverge3.h"
diff --git a/keyboards/unikeyboard/diverge3/diverge3.h b/keyboards/unikeyboard/diverge3/diverge3.h
deleted file mode 100644
index c668bb29ef..0000000000
--- a/keyboards/unikeyboard/diverge3/diverge3.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2017 IslandMan93
- *
- * 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"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, LT0, LT1, LT2, RT2, RT1, RT0, R40, R41, R42, R43, R44 \
-) { \
- { L00, L01, L02, L03, L04, L05, L06, XXX }, \
- { L10, L11, L12, L13, L14, L15, L16, XXX }, \
- { L20, L21, L22, L23, L24, L25, L26, XXX }, \
- { L30, L31, L32, L33, L34, L35, L36, XXX }, \
- { L40, L41, L42, L43, L44, LT0, LT1, LT2 }, \
- { R06, R05, R04, R03, R02, R01, R00, XXX }, \
- { R16, R15, R14, R13, R12, R11, R10, XXX }, \
- { R26, R25, R24, R23, R22, R21, R20, XXX }, \
- { R36, R35, R34, R33, R32, R31, R30, XXX }, \
- { R44, R43, R42, R41, R40, RT0, RT1, RT2 } \
- }
diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json
index c2caaca881..cf7067f629 100644
--- a/keyboards/unikeyboard/diverge3/info.json
+++ b/keyboards/unikeyboard/diverge3/info.json
@@ -8,6 +8,11 @@
"pid": "0x1257",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "C6",
"levels": 5,
@@ -20,7 +25,89 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0.75}, {"x":2, "y":0.25}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0.25}, {"x":6, "y":0.5}, {"x":10, "y":0.5}, {"x":11, "y":0.25}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0.25}, {"x":15, "y":0.75}, {"x":16, "y":0}, {"x":0, "y":1}, {"x":1, "y":1.75}, {"x":2, "y":1.25}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1.25}, {"x":6, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.25}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1.25}, {"x":15, "y":1.75}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2.75}, {"x":2, "y":2.25}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2.25}, {"x":6, "y":2.5}, {"x":10, "y":2.5}, {"x":11, "y":2.25}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2.25}, {"x":15, "y":2.75}, {"x":16, "y":2}, {"x":0, "y":3}, {"x":1, "y":3.75}, {"x":2, "y":3.25}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3.25}, {"x":6, "y":3.5}, {"x":10, "y":3.5}, {"x":11, "y":3.25}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3.25}, {"x":15, "y":3.75}, {"x":16, "y":3}, {"x":0, "y":4}, {"x":1, "y":4.75}, {"x":2, "y":4.25}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4.75, "h":1.25}, {"x":6, "y":5, "h":1.25}, {"x":7, "y":5.25}, {"x":9, "y":5.25}, {"x":10, "y":5, "h":1.25}, {"x":11, "y":4.75, "h":1.25}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4.25}, {"x":15, "y":4.75}, {"x":16, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0.75},
+ {"matrix": [0, 2], "x": 2, "y": 0.25},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.5},
+
+ {"matrix": [5, 6], "x": 10, "y": 0.5},
+ {"matrix": [5, 5], "x": 11, "y": 0.25},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 2], "x": 14, "y": 0.25},
+ {"matrix": [5, 1], "x": 15, "y": 0.75},
+ {"matrix": [5, 0], "x": 16, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1.75},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+
+ {"matrix": [6, 6], "x": 10, "y": 1.5},
+ {"matrix": [6, 5], "x": 11, "y": 1.25},
+ {"matrix": [6, 4], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 2], "x": 14, "y": 1.25},
+ {"matrix": [6, 1], "x": 15, "y": 1.75},
+ {"matrix": [6, 0], "x": 16, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2.75},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.5},
+
+ {"matrix": [7, 6], "x": 10, "y": 2.5},
+ {"matrix": [7, 5], "x": 11, "y": 2.25},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 2], "x": 14, "y": 2.25},
+ {"matrix": [7, 1], "x": 15, "y": 2.75},
+ {"matrix": [7, 0], "x": 16, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3.75},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [3, 6], "x": 6, "y": 3.5},
+
+ {"matrix": [8, 6], "x": 10, "y": 3.5},
+ {"matrix": [8, 5], "x": 11, "y": 3.25},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3},
+ {"matrix": [8, 2], "x": 14, "y": 3.25},
+ {"matrix": [8, 1], "x": 15, "y": 3.75},
+ {"matrix": [8, 0], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4.75},
+ {"matrix": [4, 2], "x": 2, "y": 4.25},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4.75, "h": 1.25},
+ {"matrix": [4, 6], "x": 6, "y": 5, "h": 1.25},
+ {"matrix": [4, 7], "x": 7, "y": 5.25},
+
+ {"matrix": [9, 7], "x": 9, "y": 5.25},
+ {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.25},
+ {"matrix": [9, 5], "x": 11, "y": 4.75, "h": 1.25},
+ {"matrix": [9, 4], "x": 12, "y": 4},
+ {"matrix": [9, 3], "x": 13, "y": 4},
+ {"matrix": [9, 2], "x": 14, "y": 4.25},
+ {"matrix": [9, 1], "x": 15, "y": 4.75},
+ {"matrix": [9, 0], "x": 16, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/unikeyboard/divergetm2/config.h b/keyboards/unikeyboard/divergetm2/config.h
index 7f8054f183..78d133446e 100644
--- a/keyboards/unikeyboard/divergetm2/config.h
+++ b/keyboards/unikeyboard/divergetm2/config.h
@@ -17,23 +17,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 { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
/* 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/unikeyboard/divergetm2/divergetm2.c b/keyboards/unikeyboard/divergetm2/divergetm2.c
deleted file mode 100644
index 61ea45416c..0000000000
--- a/keyboards/unikeyboard/divergetm2/divergetm2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2018 Christon DeWan (xton)
- * Copyright 2017 IslandMan93
- *
- * 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 "divergetm2.h"
diff --git a/keyboards/unikeyboard/divergetm2/divergetm2.h b/keyboards/unikeyboard/divergetm2/divergetm2.h
index 6de48e41c7..c3d9ab650f 100644
--- a/keyboards/unikeyboard/divergetm2/divergetm2.h
+++ b/keyboards/unikeyboard/divergetm2/divergetm2.h
@@ -19,14 +19,6 @@
#include "quantum.h"
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
#ifndef FLIP_HALF
// Standard Keymap
// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
diff --git a/keyboards/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json
index e8a3ac1bb3..d97d10d118 100644
--- a/keyboards/unikeyboard/divergetm2/info.json
+++ b/keyboards/unikeyboard/divergetm2/info.json
@@ -8,6 +8,11 @@
"pid": "0x1256",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "ROW2COL",
"split": {
"soft_serial_pin": "D0"
},
diff --git a/keyboards/unikeyboard/felix/config.h b/keyboards/unikeyboard/felix/config.h
index a3a667d632..7bc78f68d6 100644
--- a/keyboards/unikeyboard/felix/config.h
+++ b/keyboards/unikeyboard/felix/config.h
@@ -1,22 +1,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 { B2, B3, B1, F7, F6 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
/* 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/unikeyboard/felix/felix.c b/keyboards/unikeyboard/felix/felix.c
deleted file mode 100644
index 013360d043..0000000000
--- a/keyboards/unikeyboard/felix/felix.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "felix.h"
diff --git a/keyboards/unikeyboard/felix/felix.h b/keyboards/unikeyboard/felix/felix.h
deleted file mode 100644
index f43a586c8e..0000000000
--- a/keyboards/unikeyboard/felix/felix.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x4( \
- K000, K001, K002, K003, \
- K100, K101, K102, K103, \
- K200, K201, K202, K203, \
- K300, K301, K302, K303, \
- K400, K401, K402, K403 \
-) { \
- { K000, K001, K002, K003 }, \
- { K100, K101, K102, K103 }, \
- { K200, K201, K202, K203 }, \
- { K300, K301, K302, K303 }, \
- { K400, K401, K402, K403 } \
-}
-
-#define LAYOUT LAYOUT_ortho_5x4
diff --git a/keyboards/unikeyboard/felix/info.json b/keyboards/unikeyboard/felix/info.json
index ee74cb134f..7c5a013d8a 100644
--- a/keyboards/unikeyboard/felix/info.json
+++ b/keyboards/unikeyboard/felix/info.json
@@ -8,6 +8,11 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B5", "B4", "E6", "D7"],
+ "rows": ["B2", "B3", "B1", "F7", "F6"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "C6",
"levels": 5
@@ -15,29 +20,36 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_5x4"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_5x4"
+ },
"layouts": {
"LAYOUT_ortho_5x4": {
"layout": [
- {"label":"K000", "x":0, "y":0},
- {"label":"K001", "x":1, "y":0},
- {"label":"K002", "x":2, "y":0},
- {"label":"K003", "x":3, "y":0},
- {"label":"K100", "x":0, "y":1},
- {"label":"K101", "x":1, "y":1},
- {"label":"K102", "x":2, "y":1},
- {"label":"K103", "x":3, "y":1},
- {"label":"K200", "x":0, "y":2},
- {"label":"K201", "x":1, "y":2},
- {"label":"K202", "x":2, "y":2},
- {"label":"K203", "x":3, "y":2},
- {"label":"K300", "x":0, "y":3},
- {"label":"K301", "x":1, "y":3},
- {"label":"K302", "x":2, "y":3},
- {"label":"K303", "x":3, "y":3},
- {"label":"K400", "x":0, "y":4},
- {"label":"K401", "x":1, "y":4},
- {"label":"K402", "x":2, "y":4},
- {"label":"K403", "x":3, "y":4}
+ {"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": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4}
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 00:21:27 +0000