summaryrefslogtreecommitdiff
path: root/keyboards/nightmare
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/nightmare')
-rw-r--r--keyboards/nightmare/config.h17
-rw-r--r--keyboards/nightmare/info.json637
-rw-r--r--keyboards/nightmare/nightmare.c16
-rw-r--r--keyboards/nightmare/nightmare.h51
4 files changed, 120 insertions, 601 deletions
diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h
index bb1f16afc4..39eec86786 100644
--- a/keyboards/nightmare/config.h
+++ b/keyboards/nightmare/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, C6, D7, E6 }
-#define MATRIX_COL_PINS { B4, B5, D3, D2, D1, D0, F4, F5, F6, F7, B1, B3, B2, B6}
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* 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/nightmare/info.json b/keyboards/nightmare/info.json
index 0e349f1a15..87f0187e59 100644
--- a/keyboards/nightmare/info.json
+++ b/keyboards/nightmare/info.json
@@ -8,6 +8,11 @@
"pid": "0x4E49",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B4", "B5", "D3", "D2", "D1", "D0", "F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"bootmagic": {
"matrix": [0, 1]
},
@@ -16,527 +21,125 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {
- "label": "Home",
- "x": 0,
- "y": 0
- },
- {
- "label": "`",
- "x": 1.25,
- "y": 0
- },
- {
- "label": "Q",
- "x": 2.25,
- "y": 0
- },
- {
- "label": "W",
- "x": 3.25,
- "y": 0
- },
- {
- "label": "E",
- "x": 4.25,
- "y": 0
- },
- {
- "label": "R",
- "x": 5.25,
- "y": 0
- },
- {
- "label": "T",
- "x": 6.25,
- "y": 0
- },
- {
- "label": "Y",
- "x": 7.25,
- "y": 0
- },
- {
- "label": "U",
- "x": 8.25,
- "y": 0
- },
- {
- "label": "I",
- "x": 9.25,
- "y": 0
- },
- {
- "label": "O",
- "x": 10.25,
- "y": 0
- },
- {
- "label": "P",
- "x": 11.25,
- "y": 0
- },
- {
- "label": "{",
- "x": 12.25,
- "y": 0
- },
- {
- "label": "}",
- "x": 13.25,
- "y": 0
- },
- {
- "label": "Bspc",
- "x": 14.25,
- "y": 0
- },
- {
- "label": "End",
- "x": 0,
- "y": 1
- },
- {
- "label": "Tab",
- "x": 1.25,
- "y": 1,
- "w": 1.25
- },
- {
- "label": "A",
- "x": 2.5,
- "y": 1
- },
- {
- "label": "S",
- "x": 3.5,
- "y": 1
- },
- {
- "label": "D",
- "x": 4.5,
- "y": 1
- },
- {
- "label": "F",
- "x": 5.5,
- "y": 1
- },
- {
- "label": "G",
- "x": 6.5,
- "y": 1
- },
- {
- "label": "H",
- "x": 7.5,
- "y": 1
- },
- {
- "label": "J",
- "x": 8.5,
- "y": 1
- },
- {
- "label": "K",
- "x": 9.5,
- "y": 1
- },
- {
- "label": "L",
- "x": 10.5,
- "y": 1
- },
- {
- "label": ":",
- "x": 11.5,
- "y": 1
- },
- {
- "label": "\"",
- "x": 12.5,
- "y": 1
- },
- {
- "label": "Enter",
- "x": 13.5,
- "y": 1,
- "w": 1.75
- },
- {
- "label": "PgUp",
- "x": 0,
- "y": 2
- },
- {
- "label": "Shift",
- "x": 1.25,
- "y": 2,
- "w": 1.75
- },
- {
- "label": "Z",
- "x": 3,
- "y": 2
- },
- {
- "label": "X",
- "x": 4,
- "y": 2
- },
- {
- "label": "C",
- "x": 5,
- "y": 2
- },
- {
- "label": "V",
- "x": 6,
- "y": 2
- },
- {
- "label": "B",
- "x": 7,
- "y": 2
- },
- {
- "label": "N",
- "x": 8,
- "y": 2
- },
- {
- "label": "M",
- "x": 9,
- "y": 2
- },
- {
- "label": "<",
- "x": 10,
- "y": 2
- },
- {
- "label": "<",
- "x": 11,
- "y": 2
- },
- {
- "label": "?",
- "x": 12,
- "y": 2
- },
- {
- "label": "Shift",
- "x": 13,
- "y": 2,
- "w": 1.25
- },
- {
- "label": "MO(1)",
- "x": 14.25,
- "y": 2
- },
- {
- "label": "PgDn",
- "x": 0,
- "y": 3
- },
- {
- "label": "GUI",
- "x": 2.5,
- "y": 3
- },
- {
- "label": "Ctrl",
- "x": 3.5,
- "y": 3,
- "w": 1.25
- },
- {
- "x": 4.75,
- "y": 3,
- "w": 7
- },
- {
- "label": "Ctrl",
- "x": 11.75,
- "y": 3,
- "w": 1.25
- },
- {
- "label": "MO(2)",
- "x": 13,
- "y": 3
- }
+ {"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": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [1, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 13], "x": 14.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2, "w": 1.25},
+ {"matrix": [3, 13], "x": 14.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2.5, "y": 3},
+ {"matrix": [3, 2], "x": 3.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 7], "x": 4.75, "y": 3, "w": 7},
+ {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 12], "x": 13, "y": 3}
]
},
"LAYOUT_split": {
"layout": [
- {
- "label": "Home",
- "x": 0,
- "y": 0
- },
- {
- "label": "`",
- "x": 1.25,
- "y": 0
- },
- {
- "label": "Q",
- "x": 2.25,
- "y": 0
- },
- {
- "label": "W",
- "x": 3.25,
- "y": 0
- },
- {
- "label": "E",
- "x": 4.25,
- "y": 0
- },
- {
- "label": "R",
- "x": 5.25,
- "y": 0
- },
- {
- "label": "T",
- "x": 6.25,
- "y": 0
- },
- {
- "label": "Y",
- "x": 7.25,
- "y": 0
- },
- {
- "label": "U",
- "x": 8.25,
- "y": 0
- },
- {
- "label": "I",
- "x": 9.25,
- "y": 0
- },
- {
- "label": "O",
- "x": 10.25,
- "y": 0
- },
- {
- "label": "P",
- "x": 11.25,
- "y": 0
- },
- {
- "label": "{",
- "x": 12.25,
- "y": 0
- },
- {
- "label": "}",
- "x": 13.25,
- "y": 0
- },
- {
- "label": "Bspc",
- "x": 14.25,
- "y": 0
- },
- {
- "label": "End",
- "x": 0,
- "y": 1
- },
- {
- "label": "Tab",
- "x": 1.25,
- "y": 1,
- "w": 1.25
- },
- {
- "label": "A",
- "x": 2.5,
- "y": 1
- },
- {
- "label": "S",
- "x": 3.5,
- "y": 1
- },
- {
- "label": "D",
- "x": 4.5,
- "y": 1
- },
- {
- "label": "F",
- "x": 5.5,
- "y": 1
- },
- {
- "label": "G",
- "x": 6.5,
- "y": 1
- },
- {
- "label": "H",
- "x": 7.5,
- "y": 1
- },
- {
- "label": "J",
- "x": 8.5,
- "y": 1
- },
- {
- "label": "K",
- "x": 9.5,
- "y": 1
- },
- {
- "label": "L",
- "x": 10.5,
- "y": 1
- },
- {
- "label": ":",
- "x": 11.5,
- "y": 1
- },
- {
- "label": "\"",
- "x": 12.5,
- "y": 1
- },
- {
- "label": "Enter",
- "x": 13.5,
- "y": 1,
- "w": 1.75
- },
- {
- "label": "PgUp",
- "x": 0,
- "y": 2
- },
- {
- "label": "Shift",
- "x": 1.25,
- "y": 2,
- "w": 1.75
- },
- {
- "label": "Z",
- "x": 3,
- "y": 2
- },
- {
- "label": "X",
- "x": 4,
- "y": 2
- },
- {
- "label": "C",
- "x": 5,
- "y": 2
- },
- {
- "label": "V",
- "x": 6,
- "y": 2
- },
- {
- "label": "B",
- "x": 7,
- "y": 2
- },
- {
- "label": "N",
- "x": 8,
- "y": 2
- },
- {
- "label": "M",
- "x": 9,
- "y": 2
- },
- {
- "label": "<",
- "x": 10,
- "y": 2
- },
- {
- "label": "<",
- "x": 11,
- "y": 2
- },
- {
- "label": "?",
- "x": 12,
- "y": 2
- },
- {
- "label": "Shift",
- "x": 13,
- "y": 2,
- "w": 1.25
- },
- {
- "label": "MO(1)",
- "x": 14.25,
- "y": 2
- },
- {
- "label": "PgDn",
- "x": 0,
- "y": 3
- },
- {
- "label": "GUI",
- "x": 2.5,
- "y": 3
- },
- {
- "label": "Ctrl",
- "x": 3.5,
- "y": 3,
- "w": 1.25
- },
- {
- "label": "Alt",
- "x": 4.75,
- "y": 3
- },
- {
- "x": 5.75,
- "y": 3,
- "w": 2.25
- },
- {
- "x": 8,
- "y": 3,
- "w": 2.75
- },
- {
- "label": "RGUI",
- "x": 10.75,
- "y": 3
- },
- {
- "label": "Ctrl",
- "x": 11.75,
- "y": 3,
- "w": 1.25
- },
- {
- "label": "MO(2)",
- "x": 13,
- "y": 3
- }
+ {"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": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [0, 9], "x": 9.25, "y": 0},
+ {"matrix": [0, 10], "x": 10.25, "y": 0},
+ {"matrix": [0, 11], "x": 11.25, "y": 0},
+ {"matrix": [0, 12], "x": 12.25, "y": 0},
+ {"matrix": [1, 13], "x": 13.25, "y": 0},
+ {"matrix": [0, 13], "x": 14.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2},
+ {"matrix": [2, 11], "x": 12, "y": 2},
+ {"matrix": [2, 12], "x": 13, "y": 2, "w": 1.25},
+ {"matrix": [3, 13], "x": 14.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 2.5, "y": 3},
+ {"matrix": [3, 2], "x": 3.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 7], "x": 8, "y": 3, "w": 2.75},
+ {"matrix": [3, 9], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 12], "x": 13, "y": 3}
]
}
}
diff --git a/keyboards/nightmare/nightmare.c b/keyboards/nightmare/nightmare.c
deleted file mode 100644
index 301a8981a8..0000000000
--- a/keyboards/nightmare/nightmare.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 cfbender
- *
- * 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 "nightmare.h"
diff --git a/keyboards/nightmare/nightmare.h b/keyboards/nightmare/nightmare.h
deleted file mode 100644
index 017e3494e0..0000000000
--- a/keyboards/nightmare/nightmare.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2019 cfbender
- *
- * 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_default( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k113, k013, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313, \
- k300, k301, k302, k307, k311, k312 \
-) { \
- { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013 }, \
- { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \
- { k300, k301, k302, KC_NO, KC_NO, KC_NO, KC_NO, k307, KC_NO, KC_NO, KC_NO, k311, k312, k313 } \
-}
-
-
-#define LAYOUT_split( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k113, k013, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k213, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313, \
- k300, k301, k302, k304, k305, k307, k309, k311, k312 \
-) { \
- { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013 }, \
- { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \
- { k300, k301, k302, KC_NO, k304, k305, KC_NO, k307, KC_NO, k309, KC_NO, k311, k312, k313 } \
-}