summaryrefslogtreecommitdiff
path: root/keyboards/ash_xiix
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ash_xiix')
-rw-r--r--keyboards/ash_xiix/ash_xiix.c2
-rw-r--r--keyboards/ash_xiix/ash_xiix.h51
-rw-r--r--keyboards/ash_xiix/config.h17
-rw-r--r--keyboards/ash_xiix/info.json652
4 files changed, 126 insertions, 596 deletions
diff --git a/keyboards/ash_xiix/ash_xiix.c b/keyboards/ash_xiix/ash_xiix.c
index 56e6f48d03..64be362f93 100644
--- a/keyboards/ash_xiix/ash_xiix.c
+++ b/keyboards/ash_xiix/ash_xiix.c
@@ -13,7 +13,7 @@
* 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 "ash_xiix.h"
+#include "quantum.h"
bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) {
diff --git a/keyboards/ash_xiix/ash_xiix.h b/keyboards/ash_xiix/ash_xiix.h
deleted file mode 100644
index 48f9a31a26..0000000000
--- a/keyboards/ash_xiix/ash_xiix.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2020 sh_xguitar
- *
- * 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_all( \
- k00, k01, k02, k03, k60, k61, k62, k63, k04, k05, k06, k07, k08, k54, k55, k56, k57, \
- k64, k65, k66, k67, \
- k10, k11, k12, k13, k70, k71, k72, k73, k14, k15, k16, k17, k18, k19, k74, k75, k76, k77, \
- k20, k21, k22, k23, k80, k81, k82, k83, k24, k25, k26, k27, k28, k29, k84, k85, k86, k87, \
- k30, k31, k32, k33, k90, k91, k92, k93, k34, k35, k36, k37, k38, k94, k95, k96, k97, \
- k40, k41, k42, k43, ka0, ka1, ka2, ka3, k44, k45, k46, k47, k48, ka9, ka4, ka5, ka6, ka7, \
- k50, k51, k52, k53, kb4, kb7, ka8, kb8, kb9, kb5, kb6 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, KC_NO }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, KC_NO }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, KC_NO }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, KC_NO, KC_NO }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, KC_NO, KC_NO }, \
- { k70, k71, k72, k73, k74, k75, k76, k77, KC_NO, KC_NO }, \
- { k80, k81, k82, k83, k84, k85, k86, k87, KC_NO, KC_NO }, \
- { k90, k91, k92, k93, k94, k95, k96, k97, KC_NO, KC_NO }, \
- { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8, ka9 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, kb4, kb5, kb6, kb7, kb8, kb9 } \
-}
-
diff --git a/keyboards/ash_xiix/config.h b/keyboards/ash_xiix/config.h
index e21327b99c..8f81c450eb 100644
--- a/keyboards/ash_xiix/config.h
+++ b/keyboards/ash_xiix/config.h
@@ -14,27 +14,10 @@ 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 { C6, B6, B5, B4, D7, D0, D1, D2, D3, D5, D4, D6 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, B0, B2, B1, B3, B7, C7 }
-
#define NUM_LOCK_LED_PIN E6
#define CAPS_LOCK_LED_PIN F0
#define SCROLL_LOCK_LED_PIN F7
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/ash_xiix/info.json b/keyboards/ash_xiix/info.json
index 4bc7fb1987..69155f55c1 100644
--- a/keyboards/ash_xiix/info.json
+++ b/keyboards/ash_xiix/info.json
@@ -8,538 +8,136 @@
"pid": "0x14BC",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
+ "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [
- {
- "label": "Esc",
- "x": 0,
- "y": 0
- },
- {
- "label": "F1",
- "x": 1.25,
- "y": 0
- },
- {
- "label": "F2",
- "x": 2.25,
- "y": 0
- },
- {
- "label": "F3",
- "x": 3.25,
- "y": 0
- },
- {
- "label": "F4",
- "x": 4.25,
- "y": 0
- },
- {
- "label": "F5",
- "x": 5.5,
- "y": 0
- },
- {
- "label": "F6",
- "x": 6.5,
- "y": 0
- },
- {
- "label": "F7",
- "x": 7.5,
- "y": 0
- },
- {
- "label": "F8",
- "x": 8.5,
- "y": 0
- },
- {
- "label": "F9",
- "x": 9.75,
- "y": 0
- },
- {
- "label": "F10",
- "x": 10.75,
- "y": 0
- },
- {
- "label": "F11",
- "x": 11.75,
- "y": 0
- },
- {
- "label": "F12",
- "x": 12.75,
- "y": 0
- },
- {
- "label": "Insert",
- "x": 15.5,
- "y": 0
- },
- {
- "label": "Home",
- "x": 16.5,
- "y": 0
- },
- {
- "label": "PgUp",
- "x": 17.5,
- "y": 0
- },
- {
- "label": "PrtSc",
- "x": 18.5,
- "y": 0
- },
- {
- "label": "Del",
- "x": 15.5,
- "y": 1
- },
- {
- "label": "End",
- "x": 16.5,
- "y": 1
- },
- {
- "label": "PgDn",
- "x": 17.5,
- "y": 1
- },
- {
- "label": "Scroll Lock",
- "x": 18.5,
- "y": 1
- },
- {
- "label": "~",
- "x": 0,
- "y": 2
- },
- {
- "label": "!",
- "x": 1,
- "y": 2
- },
- {
- "label": "@",
- "x": 2,
- "y": 2
- },
- {
- "label": "#",
- "x": 3,
- "y": 2
- },
- {
- "label": "$",
- "x": 4,
- "y": 2
- },
- {
- "label": "%",
- "x": 5,
- "y": 2
- },
- {
- "label": "^",
- "x": 6,
- "y": 2
- },
- {
- "label": "&",
- "x": 7,
- "y": 2
- },
- {
- "label": "",
- "x": 8,
- "y": 2
- },
- {
- "label": "(",
- "x": 9,
- "y": 2
- },
- {
- "label": ")",
- "x": 10,
- "y": 2
- },
- {
- "label": "_",
- "x": 11,
- "y": 2
- },
- {
- "label": "+",
- "x": 12,
- "y": 2
- },
- {
- "label": "Backspace",
- "x": 13,
- "y": 2,
- "w": 2
- },
- {
- "label": "Num Lock",
- "x": 15.5,
- "y": 2
- },
- {
- "label": "/",
- "x": 16.5,
- "y": 2
- },
- {
- "x": 17.5,
- "y": 2
- },
- {
- "label": "Pause",
- "x": 18.5,
- "y": 2
- },
- {
- "label": "Tab",
- "x": 0,
- "y": 3,
- "w": 1.5
- },
- {
- "label": "Q",
- "x": 1.5,
- "y": 3
- },
- {
- "label": "W",
- "x": 2.5,
- "y": 3
- },
- {
- "label": "E",
- "x": 3.5,
- "y": 3
- },
- {
- "label": "R",
- "x": 4.5,
- "y": 3
- },
- {
- "label": "T",
- "x": 5.5,
- "y": 3
- },
- {
- "label": "Y",
- "x": 6.5,
- "y": 3
- },
- {
- "label": "U",
- "x": 7.5,
- "y": 3
- },
- {
- "label": "I",
- "x": 8.5,
- "y": 3
- },
- {
- "label": "O",
- "x": 9.5,
- "y": 3
- },
- {
- "label": "P",
- "x": 10.5,
- "y": 3
- },
- {
- "label": "{",
- "x": 11.5,
- "y": 3
- },
- {
- "label": "}",
- "x": 12.5,
- "y": 3
- },
- {
- "label": "|",
- "x": 13.5,
- "y": 3,
- "w": 1.5
- },
- {
- "label": "7",
- "x": 15.5,
- "y": 3
- },
- {
- "label": "8",
- "x": 16.5,
- "y": 3
- },
- {
- "label": "9",
- "x": 17.5,
- "y": 3
- },
- {
- "label": "-",
- "x": 18.5,
- "y": 3
- },
- {
- "label": "Caps Lock",
- "x": 0,
- "y": 4,
- "w": 1.75
- },
- {
- "label": "A",
- "x": 1.75,
- "y": 4
- },
- {
- "label": "S",
- "x": 2.75,
- "y": 4
- },
- {
- "label": "D",
- "x": 3.75,
- "y": 4
- },
- {
- "label": "F",
- "x": 4.75,
- "y": 4
- },
- {
- "label": "G",
- "x": 5.75,
- "y": 4
- },
- {
- "label": "H",
- "x": 6.75,
- "y": 4
- },
- {
- "label": "J",
- "x": 7.75,
- "y": 4
- },
- {
- "label": "K",
- "x": 8.75,
- "y": 4
- },
- {
- "label": "L",
- "x": 9.75,
- "y": 4
- },
- {
- "label": ":",
- "x": 10.75,
- "y": 4
- },
- {
- "label": "\"",
- "x": 11.75,
- "y": 4
- },
- {
- "label": "Enter",
- "x": 12.75,
- "y": 4,
- "w": 2.25
- },
- {
- "label": "4",
- "x": 15.5,
- "y": 4
- },
- {
- "label": "5",
- "x": 16.5,
- "y": 4
- },
- {
- "label": "6",
- "x": 17.5,
- "y": 4
- },
- {
- "label": "+",
- "x": 18.5,
- "y": 4
- },
- {
- "label": "Shift",
- "x": 0,
- "y": 5,
- "w": 1.25
- },
- {
- "label": "ISO1",
- "x": 1.25,
- "y": 5
- },
- {
- "label": "Z",
- "x": 2.25,
- "y": 5
- },
- {
- "label": "X",
- "x": 3.25,
- "y": 5
- },
- {
- "label": "C",
- "x": 4.25,
- "y": 5
- },
- {
- "label": "V",
- "x": 5.25,
- "y": 5
- },
- {
- "label": "B",
- "x": 6.25,
- "y": 5
- },
- {
- "label": "N",
- "x": 7.25,
- "y": 5
- },
- {
- "label": "M",
- "x": 8.25,
- "y": 5
- },
- {
- "label": "<",
- "x": 9.25,
- "y": 5
- },
- {
- "label": ">",
- "x": 10.25,
- "y": 5
- },
- {
- "label": "?",
- "x": 11.25,
- "y": 5
- },
- {
- "label": "Shift",
- "x": 12.25,
- "y": 5,
- "w": 1.75
- },
- {
- "label": "up",
- "x": 14.25,
- "y": 5.25
- },
- {
- "label": "1",
- "x": 15.5,
- "y": 5
- },
- {
- "label": "2",
- "x": 16.5,
- "y": 5
- },
- {
- "label": "3",
- "x": 17.5,
- "y": 5
- },
- {
- "label": "Enter",
- "x": 18.5,
- "y": 5,
- "h": 2
- },
- {
- "label": "Ctrl",
- "x": 0,
- "y": 6,
- "w": 1.25
- },
- {
- "label": "OS",
- "x": 1.25,
- "y": 6,
- "w": 1.25
- },
- {
- "label": "Alt",
- "x": 2.5,
- "y": 6,
- "w": 1.25
- },
- {
- "x": 3.75,
- "y": 6,
- "w": 6.25
- },
- {
- "label": "Alt",
- "x": 10,
- "y": 6,
- "w": 1.5
- },
- {
- "label": "Ctrl",
- "x": 11.5,
- "y": 6,
- "w": 1.5
- },
- {
- "label": "left",
- "x": 13.25,
- "y": 6.25
- },
- {
- "label": "down",
- "x": 14.25,
- "y": 6.25
- },
- {
- "label": "right",
- "x": 15.25,
- "y": 6.25
- },
- {
- "label": "0",
- "x": 16.5,
- "y": 6
- },
- {
- "label": ".",
- "x": 17.5,
- "y": 6
- }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [6, 0], "x": 4.25, "y": 0},
+
+ {"matrix": [6, 1], "x": 5.5, "y": 0},
+ {"matrix": [6, 2], "x": 6.5, "y": 0},
+ {"matrix": [6, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 5], "x": 9.75, "y": 0},
+ {"matrix": [0, 6], "x": 10.75, "y": 0},
+ {"matrix": [0, 7], "x": 11.75, "y": 0},
+ {"matrix": [0, 8], "x": 12.75, "y": 0},
+
+ {"matrix": [5, 4], "x": 15.5, "y": 0},
+ {"matrix": [5, 5], "x": 16.5, "y": 0},
+ {"matrix": [5, 6], "x": 17.5, "y": 0},
+ {"matrix": [5, 7], "x": 18.5, "y": 0},
+
+ {"matrix": [6, 4], "x": 15.5, "y": 1},
+ {"matrix": [6, 5], "x": 16.5, "y": 1},
+ {"matrix": [6, 6], "x": 17.5, "y": 1},
+ {"matrix": [6, 7], "x": 18.5, "y": 1},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 2},
+ {"matrix": [7, 0], "x": 4, "y": 2},
+ {"matrix": [7, 1], "x": 5, "y": 2},
+ {"matrix": [7, 2], "x": 6, "y": 2},
+ {"matrix": [7, 3], "x": 7, "y": 2},
+ {"matrix": [1, 4], "x": 8, "y": 2},
+ {"matrix": [1, 5], "x": 9, "y": 2},
+ {"matrix": [1, 6], "x": 10, "y": 2},
+ {"matrix": [1, 7], "x": 11, "y": 2},
+ {"matrix": [1, 8], "x": 12, "y": 2},
+ {"matrix": [1, 9], "x": 13, "y": 2, "w": 2},
+
+ {"matrix": [7, 4], "x": 15.5, "y": 2},
+ {"matrix": [7, 5], "x": 16.5, "y": 2},
+ {"matrix": [7, 6], "x": 17.5, "y": 2},
+ {"matrix": [7, 7], "x": 18.5, "y": 2},
+
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 3},
+ {"matrix": [2, 2], "x": 2.5, "y": 3},
+ {"matrix": [2, 3], "x": 3.5, "y": 3},
+ {"matrix": [8, 0], "x": 4.5, "y": 3},
+ {"matrix": [8, 1], "x": 5.5, "y": 3},
+ {"matrix": [8, 2], "x": 6.5, "y": 3},
+ {"matrix": [8, 3], "x": 7.5, "y": 3},
+ {"matrix": [2, 4], "x": 8.5, "y": 3},
+ {"matrix": [2, 5], "x": 9.5, "y": 3},
+ {"matrix": [2, 6], "x": 10.5, "y": 3},
+ {"matrix": [2, 7], "x": 11.5, "y": 3},
+ {"matrix": [2, 8], "x": 12.5, "y": 3},
+ {"matrix": [2, 9], "x": 13.5, "y": 3, "w": 1.5},
+
+ {"matrix": [8, 4], "x": 15.5, "y": 3},
+ {"matrix": [8, 5], "x": 16.5, "y": 3},
+ {"matrix": [8, 6], "x": 17.5, "y": 3},
+ {"matrix": [8, 7], "x": 18.5, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 4},
+ {"matrix": [3, 2], "x": 2.75, "y": 4},
+ {"matrix": [3, 3], "x": 3.75, "y": 4},
+ {"matrix": [9, 0], "x": 4.75, "y": 4},
+ {"matrix": [9, 1], "x": 5.75, "y": 4},
+ {"matrix": [9, 2], "x": 6.75, "y": 4},
+ {"matrix": [9, 3], "x": 7.75, "y": 4},
+ {"matrix": [3, 4], "x": 8.75, "y": 4},
+ {"matrix": [3, 5], "x": 9.75, "y": 4},
+ {"matrix": [3, 6], "x": 10.75, "y": 4},
+ {"matrix": [3, 7], "x": 11.75, "y": 4},
+ {"matrix": [3, 8], "x": 12.75, "y": 4, "w": 2.25},
+
+ {"matrix": [9, 4], "x": 15.5, "y": 4},
+ {"matrix": [9, 5], "x": 16.5, "y": 4},
+ {"matrix": [9, 6], "x": 17.5, "y": 4},
+ {"matrix": [9, 7], "x": 18.5, "y": 4},
+
+ {"matrix": [4, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 5},
+ {"matrix": [4, 2], "x": 2.25, "y": 5},
+ {"matrix": [4, 3], "x": 3.25, "y": 5},
+ {"matrix": [10, 0], "x": 4.25, "y": 5},
+ {"matrix": [10, 1], "x": 5.25, "y": 5},
+ {"matrix": [10, 2], "x": 6.25, "y": 5},
+ {"matrix": [10, 3], "x": 7.25, "y": 5},
+ {"matrix": [4, 4], "x": 8.25, "y": 5},
+ {"matrix": [4, 5], "x": 9.25, "y": 5},
+ {"matrix": [4, 6], "x": 10.25, "y": 5},
+ {"matrix": [4, 7], "x": 11.25, "y": 5},
+ {"matrix": [4, 8], "x": 12.25, "y": 5, "w": 1.75},
+
+ {"matrix": [10, 9], "x": 14.25, "y": 5.25},
+
+ {"matrix": [10, 4], "x": 15.5, "y": 5},
+ {"matrix": [10, 5], "x": 16.5, "y": 5},
+ {"matrix": [10, 6], "x": 17.5, "y": 5},
+ {"matrix": [10, 7], "x": 18.5, "y": 5, "h": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 6, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 6, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 6, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.75, "y": 6, "w": 6.25},
+ {"matrix": [11, 4], "x": 10, "y": 6, "w": 1.5},
+ {"matrix": [11, 7], "x": 11.5, "y": 6, "w": 1.5},
+
+ {"matrix": [10, 8], "x": 13.25, "y": 6.25},
+ {"matrix": [11, 8], "x": 14.25, "y": 6.25},
+ {"matrix": [11, 9], "x": 15.25, "y": 6.25},
+
+ {"matrix": [11, 5], "x": 16.5, "y": 6},
+ {"matrix": [11, 6], "x": 17.5, "y": 6}
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 23:44:52 +0000