summaryrefslogtreecommitdiff
path: root/keyboards/nacly/ua62
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/nacly/ua62')
-rw-r--r--keyboards/nacly/ua62/config.h17
-rw-r--r--keyboards/nacly/ua62/info.json81
-rw-r--r--keyboards/nacly/ua62/ua62.c17
-rw-r--r--keyboards/nacly/ua62/ua62.h41
4 files changed, 79 insertions, 77 deletions
diff --git a/keyboards/nacly/ua62/config.h b/keyboards/nacly/ua62/config.h
index 882bda8ccf..0391f174c9 100644
--- a/keyboards/nacly/ua62/config.h
+++ b/keyboards/nacly/ua62/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 { D3, D2, D1, D0, D4 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* 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/nacly/ua62/info.json b/keyboards/nacly/ua62/info.json
index d7bbd11265..383825414b 100644
--- a/keyboards/nacly/ua62/info.json
+++ b/keyboards/nacly/ua62/info.json
@@ -8,11 +8,88 @@
"pid": "0xFFFF",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["D3", "D2", "D1", "D0", "D4"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.6},
+ {"matrix": [0, 1], "x": 1, "y": 0.6},
+ {"matrix": [0, 2], "x": 2, "y": 0.35},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.35},
+ {"matrix": [0, 5], "x": 5, "y": 0.7},
+
+ {"matrix": [0, 7], "x": 9, "y": 0.7},
+ {"matrix": [0, 8], "x": 10, "y": 0.35},
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0.35},
+ {"matrix": [0, 11], "x": 13, "y": 0.6},
+ {"matrix": [0, 12], "x": 14, "y": 0.6},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.6},
+ {"matrix": [1, 1], "x": 1, "y": 1.6},
+ {"matrix": [1, 2], "x": 2, "y": 1.35},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.35},
+ {"matrix": [1, 5], "x": 5, "y": 1.7},
+
+ {"matrix": [1, 7], "x": 9, "y": 1.7},
+ {"matrix": [1, 8], "x": 10, "y": 1.35},
+ {"matrix": [1, 9], "x": 11, "y": 1},
+ {"matrix": [1, 10], "x": 12, "y": 1.35},
+ {"matrix": [1, 11], "x": 13, "y": 1.6},
+ {"matrix": [1, 12], "x": 14, "y": 1.6},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.6},
+ {"matrix": [2, 1], "x": 1, "y": 2.6},
+ {"matrix": [2, 2], "x": 2, "y": 2.35},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.35},
+ {"matrix": [2, 5], "x": 5, "y": 2.7},
+
+ {"matrix": [2, 7], "x": 9, "y": 2.7},
+ {"matrix": [2, 8], "x": 10, "y": 2.35},
+ {"matrix": [2, 9], "x": 11, "y": 2},
+ {"matrix": [2, 10], "x": 12, "y": 2.35},
+ {"matrix": [2, 11], "x": 13, "y": 2.6},
+ {"matrix": [2, 12], "x": 14, "y": 2.6},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.6},
+ {"matrix": [3, 1], "x": 1, "y": 3.6},
+ {"matrix": [3, 2], "x": 2, "y": 3.35},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.35},
+ {"matrix": [3, 5], "x": 5, "y": 3.7},
+
+ {"matrix": [3, 7], "x": 9, "y": 3.7},
+ {"matrix": [3, 8], "x": 10, "y": 3.35},
+ {"matrix": [3, 9], "x": 11, "y": 3},
+ {"matrix": [3, 10], "x": 12, "y": 3.35},
+ {"matrix": [3, 11], "x": 13, "y": 3.6},
+ {"matrix": [3, 12], "x": 14, "y": 3.6},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.6},
+ {"matrix": [4, 1], "x": 1, "y": 4.6},
+ {"matrix": [4, 2], "x": 2, "y": 4.35},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4.35},
+ {"matrix": [4, 5], "x": 5, "y": 4.7},
+ {"matrix": [4, 6], "x": 6, "y": 3.95, "h": 1.5},
+
+ {"matrix": [3, 6], "x": 8, "y": 3.95, "h": 1.5},
+ {"matrix": [4, 7], "x": 9, "y": 4.7},
+ {"matrix": [4, 8], "x": 10, "y": 4.35},
+ {"matrix": [4, 9], "x": 11, "y": 4},
+ {"matrix": [4, 10], "x": 12, "y": 4.35},
+ {"matrix": [4, 11], "x": 13, "y": 4.6},
+ {"matrix": [4, 12], "x": 14, "y": 4.6}
+ ]
}
}
- }
+}
diff --git a/keyboards/nacly/ua62/ua62.c b/keyboards/nacly/ua62/ua62.c
deleted file mode 100644
index cac45f3fbf..0000000000
--- a/keyboards/nacly/ua62/ua62.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 NaCly
- *
- * 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 "ua62.h"
-
diff --git a/keyboards/nacly/ua62/ua62.h b/keyboards/nacly/ua62/ua62.h
deleted file mode 100644
index 4509bbff3d..0000000000
--- a/keyboards/nacly/ua62/ua62.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2019 NaCly
- *
- * 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"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, KC_NO, k06, k07, k08, k09, k0a, k0b }, \
- { k10, k11, k12, k13, k14, k15, KC_NO, k16, k17, k18, k19, k1a, k1b }, \
- { k20, k21, k22, k23, k24, k25, KC_NO, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, k35, k47, k36, k37, k38, k39, k3a, k3b }, \
- { k40, k41, k42, k43, k44, k45, k46, k48, k49, k4a, k4b, k4c, k4d }, \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 02:31:32 +0000