summaryrefslogtreecommitdiff
path: root/keyboards/ducky
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ducky')
-rw-r--r--keyboards/ducky/one2mini/1861st/config.h16
-rw-r--r--keyboards/ducky/one2mini/1861st/info.json289
-rw-r--r--keyboards/ducky/one2sf/1967st/config.h16
-rw-r--r--keyboards/ducky/one2sf/1967st/info.json119
4 files changed, 209 insertions, 231 deletions
diff --git a/keyboards/ducky/one2mini/1861st/config.h b/keyboards/ducky/one2mini/1861st/config.h
index a50ce96ac3..123779a7ab 100644
--- a/keyboards/ducky/one2mini/1861st/config.h
+++ b/keyboards/ducky/one2mini/1861st/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 { D11, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { B10, B9, C13, C12, C11, C10, C9, C8, A15, A14, A13, D0, D1, D2, B8 }
#define DIP_SWITCH_MATRIX_GRID { {0,14}, {1,14}, {2,14}, {3,14} }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define FORCE_NKRO
#define GPIO_INPUT_PIN_DELAY (NUC123_HCLK / 6 / 1000000L)
diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/info.json
index 364d803718..151eee80c1 100644
--- a/keyboards/ducky/one2mini/1861st/info.json
+++ b/keyboards/ducky/one2mini/1861st/info.json
@@ -6,69 +6,74 @@
"pid": "0x0123",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B8"],
+ "rows": ["D11", "B4", "B5", "B6", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"layout_aliases": {
"LAYOUT_iso": "LAYOUT_60_iso"
},
"layouts": {
"LAYOUT_all": {
"layout": [
- { "x": 0, "y": 0, "w": 1, "label": "ESC" },
- { "x": 1, "y": 0, "w": 1, "label": "1" },
- { "x": 2, "y": 0, "w": 1, "label": "2" },
- { "x": 3, "y": 0, "w": 1, "label": "3" },
- { "x": 4, "y": 0, "w": 1, "label": "4" },
- { "x": 5, "y": 0, "w": 1, "label": "5" },
- { "x": 6, "y": 0, "w": 1, "label": "6" },
- { "x": 7, "y": 0, "w": 1, "label": "7" },
- { "x": 8, "y": 0, "w": 1, "label": "8" },
- { "x": 9, "y": 0, "w": 1, "label": "9" },
- { "x": 10, "y": 0, "w": 1, "label": "0" },
- { "x": 11, "y": 0, "w": 1, "label": "DASH" },
- { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" },
+ { "x": 0, "y": 0, "label": "ESC" },
+ { "x": 1, "y": 0, "label": "1" },
+ { "x": 2, "y": 0, "label": "2" },
+ { "x": 3, "y": 0, "label": "3" },
+ { "x": 4, "y": 0, "label": "4" },
+ { "x": 5, "y": 0, "label": "5" },
+ { "x": 6, "y": 0, "label": "6" },
+ { "x": 7, "y": 0, "label": "7" },
+ { "x": 8, "y": 0, "label": "8" },
+ { "x": 9, "y": 0, "label": "9" },
+ { "x": 10, "y": 0, "label": "0" },
+ { "x": 11, "y": 0, "label": "DASH" },
+ { "x": 12, "y": 0, "label": "EQUALSIGN" },
{ "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" },
{ "x": 0, "y": 1, "w": 1.5, "label": "TAB" },
- { "x": 1.5, "y": 1, "w": 1, "label": "Q" },
- { "x": 2.5, "y": 1, "w": 1, "label": "W" },
- { "x": 3.5, "y": 1, "w": 1, "label": "E" },
- { "x": 4.5, "y": 1, "w": 1, "label": "R" },
- { "x": 5.5, "y": 1, "w": 1, "label": "T" },
- { "x": 6.5, "y": 1, "w": 1, "label": "Y" },
- { "x": 7.5, "y": 1, "w": 1, "label": "U" },
- { "x": 8.5, "y": 1, "w": 1, "label": "I" },
- { "x": 9.5, "y": 1, "w": 1, "label": "O" },
- { "x": 10.5, "y": 1, "w": 1, "label": "P" },
- { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" },
- { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" },
+ { "x": 1.5, "y": 1, "label": "Q" },
+ { "x": 2.5, "y": 1, "label": "W" },
+ { "x": 3.5, "y": 1, "label": "E" },
+ { "x": 4.5, "y": 1, "label": "R" },
+ { "x": 5.5, "y": 1, "label": "T" },
+ { "x": 6.5, "y": 1, "label": "Y" },
+ { "x": 7.5, "y": 1, "label": "U" },
+ { "x": 8.5, "y": 1, "label": "I" },
+ { "x": 9.5, "y": 1, "label": "O" },
+ { "x": 10.5, "y": 1, "label": "P" },
+ { "x": 11.5, "y": 1, "label": "LBRACKET" },
+ { "x": 12.5, "y": 1, "label": "RBRACKET" },
{ "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" },
{ "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" },
- { "x": 1.75, "y": 2, "w": 1, "label": "A" },
- { "x": 2.75, "y": 2, "w": 1, "label": "S" },
- { "x": 3.75, "y": 2, "w": 1, "label": "D" },
- { "x": 4.75, "y": 2, "w": 1, "label": "F" },
- { "x": 5.75, "y": 2, "w": 1, "label": "G" },
- { "x": 6.75, "y": 2, "w": 1, "label": "H" },
- { "x": 7.75, "y": 2, "w": 1, "label": "J" },
- { "x": 8.75, "y": 2, "w": 1, "label": "K" },
- { "x": 9.75, "y": 2, "w": 1, "label": "L" },
- { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" },
- { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" },
- { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" },
+ { "x": 1.75, "y": 2, "label": "A" },
+ { "x": 2.75, "y": 2, "label": "S" },
+ { "x": 3.75, "y": 2, "label": "D" },
+ { "x": 4.75, "y": 2, "label": "F" },
+ { "x": 5.75, "y": 2, "label": "G" },
+ { "x": 6.75, "y": 2, "label": "H" },
+ { "x": 7.75, "y": 2, "label": "J" },
+ { "x": 8.75, "y": 2, "label": "K" },
+ { "x": 9.75, "y": 2, "label": "L" },
+ { "x": 10.75, "y": 2, "label": "SEMICOLON" },
+ { "x": 11.75, "y": 2, "label": "QUOTE" },
+ { "x": 12.75, "y": 2, "label": "ISOHASH" },
{ "x": 13.75, "y": 2, "w": 1.25, "label": "ENTER" },
{ "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" },
- { "x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH" },
- { "x": 2.25, "y": 3, "w": 1, "label": "Z" },
- { "x": 3.25, "y": 3, "w": 1, "label": "X" },
- { "x": 4.25, "y": 3, "w": 1, "label": "C" },
- { "x": 5.25, "y": 3, "w": 1, "label": "V" },
- { "x": 6.25, "y": 3, "w": 1, "label": "B" },
- { "x": 7.25, "y": 3, "w": 1, "label": "N" },
- { "x": 8.25, "y": 3, "w": 1, "label": "M" },
- { "x": 9.25, "y": 3, "w": 1, "label": "COMMA" },
- { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" },
- { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" },
+ { "x": 1.25, "y": 3, "label": "ISOBACKSLASH" },
+ { "x": 2.25, "y": 3, "label": "Z" },
+ { "x": 3.25, "y": 3, "label": "X" },
+ { "x": 4.25, "y": 3, "label": "C" },
+ { "x": 5.25, "y": 3, "label": "V" },
+ { "x": 6.25, "y": 3, "label": "B" },
+ { "x": 7.25, "y": 3, "label": "N" },
+ { "x": 8.25, "y": 3, "label": "M" },
+ { "x": 9.25, "y": 3, "label": "COMMA" },
+ { "x": 10.25, "y": 3, "label": "PERIOD" },
+ { "x": 11.25, "y": 3, "label": "SLASH" },
{ "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" },
{ "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" },
@@ -84,61 +89,61 @@
"LAYOUT_60_ansi": {
"layout": [
- { "x": 0, "y": 0, "w": 1, "label": "ESC" },
- { "x": 1, "y": 0, "w": 1, "label": "1" },
- { "x": 2, "y": 0, "w": 1, "label": "2" },
- { "x": 3, "y": 0, "w": 1, "label": "3" },
- { "x": 4, "y": 0, "w": 1, "label": "4" },
- { "x": 5, "y": 0, "w": 1, "label": "5" },
- { "x": 6, "y": 0, "w": 1, "label": "6" },
- { "x": 7, "y": 0, "w": 1, "label": "7" },
- { "x": 8, "y": 0, "w": 1, "label": "8" },
- { "x": 9, "y": 0, "w": 1, "label": "9" },
- { "x": 10, "y": 0, "w": 1, "label": "0" },
- { "x": 11, "y": 0, "w": 1, "label": "DASH" },
- { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" },
+ { "x": 0, "y": 0, "label": "ESC" },
+ { "x": 1, "y": 0, "label": "1" },
+ { "x": 2, "y": 0, "label": "2" },
+ { "x": 3, "y": 0, "label": "3" },
+ { "x": 4, "y": 0, "label": "4" },
+ { "x": 5, "y": 0, "label": "5" },
+ { "x": 6, "y": 0, "label": "6" },
+ { "x": 7, "y": 0, "label": "7" },
+ { "x": 8, "y": 0, "label": "8" },
+ { "x": 9, "y": 0, "label": "9" },
+ { "x": 10, "y": 0, "label": "0" },
+ { "x": 11, "y": 0, "label": "DASH" },
+ { "x": 12, "y": 0, "label": "EQUALSIGN" },
{ "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" },
{ "x": 0, "y": 1, "w": 1.5, "label": "TAB" },
- { "x": 1.5, "y": 1, "w": 1, "label": "Q" },
- { "x": 2.5, "y": 1, "w": 1, "label": "W" },
- { "x": 3.5, "y": 1, "w": 1, "label": "E" },
- { "x": 4.5, "y": 1, "w": 1, "label": "R" },
- { "x": 5.5, "y": 1, "w": 1, "label": "T" },
- { "x": 6.5, "y": 1, "w": 1, "label": "Y" },
- { "x": 7.5, "y": 1, "w": 1, "label": "U" },
- { "x": 8.5, "y": 1, "w": 1, "label": "I" },
- { "x": 9.5, "y": 1, "w": 1, "label": "O" },
- { "x": 10.5, "y": 1, "w": 1, "label": "P" },
- { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" },
- { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" },
+ { "x": 1.5, "y": 1, "label": "Q" },
+ { "x": 2.5, "y": 1, "label": "W" },
+ { "x": 3.5, "y": 1, "label": "E" },
+ { "x": 4.5, "y": 1, "label": "R" },
+ { "x": 5.5, "y": 1, "label": "T" },
+ { "x": 6.5, "y": 1, "label": "Y" },
+ { "x": 7.5, "y": 1, "label": "U" },
+ { "x": 8.5, "y": 1, "label": "I" },
+ { "x": 9.5, "y": 1, "label": "O" },
+ { "x": 10.5, "y": 1, "label": "P" },
+ { "x": 11.5, "y": 1, "label": "LBRACKET" },
+ { "x": 12.5, "y": 1, "label": "RBRACKET" },
{ "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" },
{ "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" },
- { "x": 1.75, "y": 2, "w": 1, "label": "A" },
- { "x": 2.75, "y": 2, "w": 1, "label": "S" },
- { "x": 3.75, "y": 2, "w": 1, "label": "D" },
- { "x": 4.75, "y": 2, "w": 1, "label": "F" },
- { "x": 5.75, "y": 2, "w": 1, "label": "G" },
- { "x": 6.75, "y": 2, "w": 1, "label": "H" },
- { "x": 7.75, "y": 2, "w": 1, "label": "J" },
- { "x": 8.75, "y": 2, "w": 1, "label": "K" },
- { "x": 9.75, "y": 2, "w": 1, "label": "L" },
- { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" },
- { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" },
+ { "x": 1.75, "y": 2, "label": "A" },
+ { "x": 2.75, "y": 2, "label": "S" },
+ { "x": 3.75, "y": 2, "label": "D" },
+ { "x": 4.75, "y": 2, "label": "F" },
+ { "x": 5.75, "y": 2, "label": "G" },
+ { "x": 6.75, "y": 2, "label": "H" },
+ { "x": 7.75, "y": 2, "label": "J" },
+ { "x": 8.75, "y": 2, "label": "K" },
+ { "x": 9.75, "y": 2, "label": "L" },
+ { "x": 10.75, "y": 2, "label": "SEMICOLON" },
+ { "x": 11.75, "y": 2, "label": "QUOTE" },
{ "x": 12.75, "y": 2, "w": 2.25, "label": "ENTER" },
{ "x": 0, "y": 3, "w": 2.25, "label": "LSHIFT" },
- { "x": 2.25, "y": 3, "w": 1, "label": "Z" },
- { "x": 3.25, "y": 3, "w": 1, "label": "X" },
- { "x": 4.25, "y": 3, "w": 1, "label": "C" },
- { "x": 5.25, "y": 3, "w": 1, "label": "V" },
- { "x": 6.25, "y": 3, "w": 1, "label": "B" },
- { "x": 7.25, "y": 3, "w": 1, "label": "N" },
- { "x": 8.25, "y": 3, "w": 1, "label": "M" },
- { "x": 9.25, "y": 3, "w": 1, "label": "COMMA" },
- { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" },
- { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" },
+ { "x": 2.25, "y": 3, "label": "Z" },
+ { "x": 3.25, "y": 3, "label": "X" },
+ { "x": 4.25, "y": 3, "label": "C" },
+ { "x": 5.25, "y": 3, "label": "V" },
+ { "x": 6.25, "y": 3, "label": "B" },
+ { "x": 7.25, "y": 3, "label": "N" },
+ { "x": 8.25, "y": 3, "label": "M" },
+ { "x": 9.25, "y": 3, "label": "COMMA" },
+ { "x": 10.25, "y": 3, "label": "PERIOD" },
+ { "x": 11.25, "y": 3, "label": "SLASH" },
{ "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" },
{ "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" },
@@ -154,62 +159,62 @@
"LAYOUT_60_iso": {
"layout": [
- { "x": 0, "y": 0, "w": 1, "label": "ESC" },
- { "x": 1, "y": 0, "w": 1, "label": "1" },
- { "x": 2, "y": 0, "w": 1, "label": "2" },
- { "x": 3, "y": 0, "w": 1, "label": "3" },
- { "x": 4, "y": 0, "w": 1, "label": "4" },
- { "x": 5, "y": 0, "w": 1, "label": "5" },
- { "x": 6, "y": 0, "w": 1, "label": "6" },
- { "x": 7, "y": 0, "w": 1, "label": "7" },
- { "x": 8, "y": 0, "w": 1, "label": "8" },
- { "x": 9, "y": 0, "w": 1, "label": "9" },
- { "x": 10, "y": 0, "w": 1, "label": "0" },
- { "x": 11, "y": 0, "w": 1, "label": "DASH" },
- { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" },
+ { "x": 0, "y": 0, "label": "ESC" },
+ { "x": 1, "y": 0, "label": "1" },
+ { "x": 2, "y": 0, "label": "2" },
+ { "x": 3, "y": 0, "label": "3" },
+ { "x": 4, "y": 0, "label": "4" },
+ { "x": 5, "y": 0, "label": "5" },
+ { "x": 6, "y": 0, "label": "6" },
+ { "x": 7, "y": 0, "label": "7" },
+ { "x": 8, "y": 0, "label": "8" },
+ { "x": 9, "y": 0, "label": "9" },
+ { "x": 10, "y": 0, "label": "0" },
+ { "x": 11, "y": 0, "label": "DASH" },
+ { "x": 12, "y": 0, "label": "EQUALSIGN" },
{ "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" },
{ "x": 0, "y": 1, "w": 1.5, "label": "TAB" },
- { "x": 1.5, "y": 1, "w": 1, "label": "Q" },
- { "x": 2.5, "y": 1, "w": 1, "label": "W" },
- { "x": 3.5, "y": 1, "w": 1, "label": "E" },
- { "x": 4.5, "y": 1, "w": 1, "label": "R" },
- { "x": 5.5, "y": 1, "w": 1, "label": "T" },
- { "x": 6.5, "y": 1, "w": 1, "label": "Y" },
- { "x": 7.5, "y": 1, "w": 1, "label": "U" },
- { "x": 8.5, "y": 1, "w": 1, "label": "I" },
- { "x": 9.5, "y": 1, "w": 1, "label": "O" },
- { "x": 10.5, "y": 1, "w": 1, "label": "P" },
- { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" },
- { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" },
+ { "x": 1.5, "y": 1, "label": "Q" },
+ { "x": 2.5, "y": 1, "label": "W" },
+ { "x": 3.5, "y": 1, "label": "E" },
+ { "x": 4.5, "y": 1, "label": "R" },
+ { "x": 5.5, "y": 1, "label": "T" },
+ { "x": 6.5, "y": 1, "label": "Y" },
+ { "x": 7.5, "y": 1, "label": "U" },
+ { "x": 8.5, "y": 1, "label": "I" },
+ { "x": 9.5, "y": 1, "label": "O" },
+ { "x": 10.5, "y": 1, "label": "P" },
+ { "x": 11.5, "y": 1, "label": "LBRACKET" },
+ { "x": 12.5, "y": 1, "label": "RBRACKET" },
{ "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" },
- { "x": 1.75, "y": 2, "w": 1, "label": "A" },
- { "x": 2.75, "y": 2, "w": 1, "label": "S" },
- { "x": 3.75, "y": 2, "w": 1, "label": "D" },
- { "x": 4.75, "y": 2, "w": 1, "label": "F" },
- { "x": 5.75, "y": 2, "w": 1, "label": "G" },
- { "x": 6.75, "y": 2, "w": 1, "label": "H" },
- { "x": 7.75, "y": 2, "w": 1, "label": "J" },
- { "x": 8.75, "y": 2, "w": 1, "label": "K" },
- { "x": 9.75, "y": 2, "w": 1, "label": "L" },
- { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" },
- { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" },
- { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" },
+ { "x": 1.75, "y": 2, "label": "A" },
+ { "x": 2.75, "y": 2, "label": "S" },
+ { "x": 3.75, "y": 2, "label": "D" },
+ { "x": 4.75, "y": 2, "label": "F" },
+ { "x": 5.75, "y": 2, "label": "G" },
+ { "x": 6.75, "y": 2, "label": "H" },
+ { "x": 7.75, "y": 2, "label": "J" },
+ { "x": 8.75, "y": 2, "label": "K" },
+ { "x": 9.75, "y": 2, "label": "L" },
+ { "x": 10.75, "y": 2, "label": "SEMICOLON" },
+ { "x": 11.75, "y": 2, "label": "QUOTE" },
+ { "x": 12.75, "y": 2, "label": "ISOHASH" },
{ "x": 13.75, "y": 1, "w": 1.25, "h": 2, "label": "ENTER" },
{ "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" },
- { "x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH" },
- { "x": 2.25, "y": 3, "w": 1, "label": "Z" },
- { "x": 3.25, "y": 3, "w": 1, "label": "X" },
- { "x": 4.25, "y": 3, "w": 1, "label": "C" },
- { "x": 5.25, "y": 3, "w": 1, "label": "V" },
- { "x": 6.25, "y": 3, "w": 1, "label": "B" },
- { "x": 7.25, "y": 3, "w": 1, "label": "N" },
- { "x": 8.25, "y": 3, "w": 1, "label": "M" },
- { "x": 9.25, "y": 3, "w": 1, "label": "COMMA" },
- { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" },
- { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" },
+ { "x": 1.25, "y": 3, "label": "ISOBACKSLASH" },
+ { "x": 2.25, "y": 3, "label": "Z" },
+ { "x": 3.25, "y": 3, "label": "X" },
+ { "x": 4.25, "y": 3, "label": "C" },
+ { "x": 5.25, "y": 3, "label": "V" },
+ { "x": 6.25, "y": 3, "label": "B" },
+ { "x": 7.25, "y": 3, "label": "N" },
+ { "x": 8.25, "y": 3, "label": "M" },
+ { "x": 9.25, "y": 3, "label": "COMMA" },
+ { "x": 10.25, "y": 3, "label": "PERIOD" },
+ { "x": 11.25, "y": 3, "label": "SLASH" },
{ "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" },
{ "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" },
diff --git a/keyboards/ducky/one2sf/1967st/config.h b/keyboards/ducky/one2sf/1967st/config.h
index 8b29e8c3d4..123779a7ab 100644
--- a/keyboards/ducky/one2sf/1967st/config.h
+++ b/keyboards/ducky/one2sf/1967st/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 { D11, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { B10, B9, C13, C12, C11, C10, C9, C8, A15, A14, A13, D0, D1, D2,B15,B8 }
#define DIP_SWITCH_MATRIX_GRID { {0,14}, {1,14}, {2,14}, {3,14} }
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define FORCE_NKRO
#define GPIO_INPUT_PIN_DELAY (NUC123_HCLK / 6 / 1000000L)
diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/info.json
index 5361dbd4a0..81ce8eb2d5 100644
--- a/keyboards/ducky/one2sf/1967st/info.json
+++ b/keyboards/ducky/one2sf/1967st/info.json
@@ -7,82 +7,87 @@
"pid": "0x07AF",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B15", "B8"],
+ "rows": ["D11", "B4", "B5", "B6", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"layouts": {
"LAYOUT_all": {
"layout": [
- { "x": 0, "y": 0, "w": 1, "label": "ESC" },
- { "x": 1, "y": 0, "w": 1, "label": "1" },
- { "x": 2, "y": 0, "w": 1, "label": "2" },
- { "x": 3, "y": 0, "w": 1, "label": "3" },
- { "x": 4, "y": 0, "w": 1, "label": "4" },
- { "x": 5, "y": 0, "w": 1, "label": "5" },
- { "x": 6, "y": 0, "w": 1, "label": "6" },
- { "x": 7, "y": 0, "w": 1, "label": "7" },
- { "x": 8, "y": 0, "w": 1, "label": "8" },
- { "x": 9, "y": 0, "w": 1, "label": "9" },
- { "x": 10, "y": 0, "w": 1, "label": "0" },
- { "x": 11, "y": 0, "w": 1, "label": "DASH" },
- { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" },
+ { "x": 0, "y": 0, "label": "ESC" },
+ { "x": 1, "y": 0, "label": "1" },
+ { "x": 2, "y": 0, "label": "2" },
+ { "x": 3, "y": 0, "label": "3" },
+ { "x": 4, "y": 0, "label": "4" },
+ { "x": 5, "y": 0, "label": "5" },
+ { "x": 6, "y": 0, "label": "6" },
+ { "x": 7, "y": 0, "label": "7" },
+ { "x": 8, "y": 0, "label": "8" },
+ { "x": 9, "y": 0, "label": "9" },
+ { "x": 10, "y": 0, "label": "0" },
+ { "x": 11, "y": 0, "label": "DASH" },
+ { "x": 12, "y": 0, "label": "EQUALSIGN" },
{ "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" },
- { "x": 15.25, "y": 0, "w": 1, "label": "DEL" },
+ { "x": 15.25, "y": 0, "label": "DEL" },
{ "x": 0, "y": 1, "w": 1.5, "label": "TAB" },
- { "x": 1.5, "y": 1, "w": 1, "label": "Q" },
- { "x": 2.5, "y": 1, "w": 1, "label": "W" },
- { "x": 3.5, "y": 1, "w": 1, "label": "E" },
- { "x": 4.5, "y": 1, "w": 1, "label": "R" },
- { "x": 5.5, "y": 1, "w": 1, "label": "T" },
- { "x": 6.5, "y": 1, "w": 1, "label": "Y" },
- { "x": 7.5, "y": 1, "w": 1, "label": "U" },
- { "x": 8.5, "y": 1, "w": 1, "label": "I" },
- { "x": 9.5, "y": 1, "w": 1, "label": "O" },
- { "x": 10.5, "y": 1, "w": 1, "label": "P" },
- { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" },
- { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" },
+ { "x": 1.5, "y": 1, "label": "Q" },
+ { "x": 2.5, "y": 1, "label": "W" },
+ { "x": 3.5, "y": 1, "label": "E" },
+ { "x": 4.5, "y": 1, "label": "R" },
+ { "x": 5.5, "y": 1, "label": "T" },
+ { "x": 6.5, "y": 1, "label": "Y" },
+ { "x": 7.5, "y": 1, "label": "U" },
+ { "x": 8.5, "y": 1, "label": "I" },
+ { "x": 9.5, "y": 1, "label": "O" },
+ { "x": 10.5, "y": 1, "label": "P" },
+ { "x": 11.5, "y": 1, "label": "LBRACKET" },
+ { "x": 12.5, "y": 1, "label": "RBRACKET" },
{ "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" },
- { "x": 15.25, "y": 1, "w": 1, "label": "PAGEUP" },
+ { "x": 15.25, "y": 1, "label": "PAGEUP" },
{ "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" },
- { "x": 1.75, "y": 2, "w": 1, "label": "A" },
- { "x": 2.75, "y": 2, "w": 1, "label": "S" },
- { "x": 3.75, "y": 2, "w": 1, "label": "D" },
- { "x": 4.75, "y": 2, "w": 1, "label": "F" },
- { "x": 5.75, "y": 2, "w": 1, "label": "G" },
- { "x": 6.75, "y": 2, "w": 1, "label": "H" },
- { "x": 7.75, "y": 2, "w": 1, "label": "J" },
- { "x": 8.75, "y": 2, "w": 1, "label": "K" },
- { "x": 9.75, "y": 2, "w": 1, "label": "L" },
- { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" },
- { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" },
- { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" },
+ { "x": 1.75, "y": 2, "label": "A" },
+ { "x": 2.75, "y": 2, "label": "S" },
+ { "x": 3.75, "y": 2, "label": "D" },
+ { "x": 4.75, "y": 2, "label": "F" },
+ { "x": 5.75, "y": 2, "label": "G" },
+ { "x": 6.75, "y": 2, "label": "H" },
+ { "x": 7.75, "y": 2, "label": "J" },
+ { "x": 8.75, "y": 2, "label": "K" },
+ { "x": 9.75, "y": 2, "label": "L" },
+ { "x": 10.75, "y": 2, "label": "SEMICOLON" },
+ { "x": 11.75, "y": 2, "label": "QUOTE" },
+ { "x": 12.75, "y": 2, "label": "ISOHASH" },
{ "x": 13.75, "y": 2, "w": 1.25, "label": "ENTER" },
- { "x": 15.25, "y": 2, "w": 1, "label": "PAGEDOWN" },
+ { "x": 15.25, "y": 2, "label": "PAGEDOWN" },
{ "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" },
- { "x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH" },
- { "x": 2.25, "y": 3, "w": 1, "label": "Z" },
- { "x": 3.25, "y": 3, "w": 1, "label": "X" },
- { "x": 4.25, "y": 3, "w": 1, "label": "C" },
- { "x": 5.25, "y": 3, "w": 1, "label": "V" },
- { "x": 6.25, "y": 3, "w": 1, "label": "B" },
- { "x": 7.25, "y": 3, "w": 1, "label": "N" },
- { "x": 8.25, "y": 3, "w": 1, "label": "M" },
- { "x": 9.25, "y": 3, "w": 1, "label": "COMMA" },
- { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" },
- { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" },
+ { "x": 1.25, "y": 3, "label": "ISOBACKSLASH" },
+ { "x": 2.25, "y": 3, "label": "Z" },
+ { "x": 3.25, "y": 3, "label": "X" },
+ { "x": 4.25, "y": 3, "label": "C" },
+ { "x": 5.25, "y": 3, "label": "V" },
+ { "x": 6.25, "y": 3, "label": "B" },
+ { "x": 7.25, "y": 3, "label": "N" },
+ { "x": 8.25, "y": 3, "label": "M" },
+ { "x": 9.25, "y": 3, "label": "COMMA" },
+ { "x": 10.25, "y": 3, "label": "PERIOD" },
+ { "x": 11.25, "y": 3, "label": "SLASH" },
{ "x": 12.25, "y": 3, "w": 2, "label": "RSHIFT" },
- { "x": 14.25, "y": 3, "w": 1, "label": "UP" },
+ { "x": 14.25, "y": 3, "label": "UP" },
{ "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" },
{ "x": 1.25, "y": 4, "w": 1.25, "label": "LCMD" },
{ "x": 2.5, "y": 4, "w": 1.25, "label": "LALT" },
{ "x": 3.75, "y": 4, "w": 6.25, "label": "SPACE" },
- { "x": 10, "y": 4, "w": 1, "label": "RALT" },
- { "x": 11, "y": 4, "w": 1, "label": "FN" },
+ { "x": 10, "y": 4, "label": "RALT" },
+ { "x": 11, "y": 4, "label": "FN" },
{ "x": 12, "y": 4, "w": 1.25, "label": "RCTRL" },
- { "x": 13.25, "y": 4, "w": 1, "label": "LEFT" },
- { "x": 14.25, "y": 4, "w": 1, "label": "DOWN" },
- { "x": 15.25, "y": 4, "w": 1, "label": "RIGHT" }
+ { "x": 13.25, "y": 4, "label": "LEFT" },
+ { "x": 14.25, "y": 4, "label": "DOWN" },
+ { "x": 15.25, "y": 4, "label": "RIGHT" }
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 07:48:38 +0000