diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 71a7e880a3d..60cb7270428 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -1741,7 +1741,10 @@
"target": "ducky/one2mini/1861st"
},
"ducky/one2sf": {
- "target": "ducky/one2sf/1967st"
+ "target": "ducky/one2sf/1967st/ansi"
+ },
+ "ducky/one2sf/1967st": {
+ "target": "ducky/one2sf/1967st/ansi"
},
"dumbpad": {
"target": "dumbpad/v0x"
diff --git a/keyboards/ducky/one2sf/1967st/1967st.c b/keyboards/ducky/one2sf/1967st/1967st.c
new file mode 100644
index 00000000000..fe7855f63d9
--- /dev/null
+++ b/keyboards/ducky/one2sf/1967st/1967st.c
@@ -0,0 +1,9 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+
+void bootloader_jump(void) {
+ // TODO: Work out how to jump to LDROM, for now just reset the board.
+ NVIC_SystemReset();
+}
diff --git a/keyboards/ducky/one2sf/1967st/ansi/keyboard.json b/keyboards/ducky/one2sf/1967st/ansi/keyboard.json
new file mode 100644
index 00000000000..42380addb1b
--- /dev/null
+++ b/keyboards/ducky/one2sf/1967st/ansi/keyboard.json
@@ -0,0 +1,90 @@
+{
+ "keyboard_name": "One 2 SF ANSI",
+ "usb": {
+ "pid": "0x07AF",
+ "device_version": "0.0.1"
+ },
+ "layout_aliases": {
+ "LAYOUT_ansi": "LAYOUT"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
+ {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
+ {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/ducky/one2sf/1967st/ansi/keymaps/default/config.h b/keyboards/ducky/one2sf/1967st/ansi/keymaps/default/config.h
new file mode 100644
index 00000000000..dc80ab8f9d4
--- /dev/null
+++ b/keyboards/ducky/one2sf/1967st/ansi/keymaps/default/config.h
@@ -0,0 +1,12 @@
+// Copyright 2019 /u/KeepItUnder
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// place overrides here
+#define GRAVE_ESC_GUI_OVERRIDE
+#define MK_3_SPEED
+#define MK_C_OFFSET_UNMOD 400 /* Cursor offset per movement (unmodified) */
+#define MK_C_INTERVAL_UNMOD 5 /* Time between cursor movements (unmodified) */
+#define MK_W_OFFSET_UNMOD 100 /* Scroll steps per scroll action (unmodified) */
+#define MK_W_INTERVAL_UNMOD 10 /* Time between scroll steps (unmodified) */
diff --git a/keyboards/ducky/one2sf/keymaps/default_ansi/keymap.c b/keyboards/ducky/one2sf/1967st/ansi/keymaps/default/keymap.c
similarity index 62%
rename from keyboards/ducky/one2sf/keymaps/default_ansi/keymap.c
rename to keyboards/ducky/one2sf/1967st/ansi/keymaps/default/keymap.c
index d353f005ed0..680cc8261d9 100644
--- a/keyboards/ducky/one2sf/keymaps/default_ansi/keymap.c
+++ b/keyboards/ducky/one2sf/1967st/ansi/keymaps/default/keymap.c
@@ -1,34 +1,17 @@
-/* Copyright 2019 /u/KeepItUnder
- *
- * 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 .
- */
+// Copyright 2019 /u/KeepItUnder
+// SPDX-License-Identifier: GPL-2.0-or-later
+
#include QMK_KEYBOARD_H
-// LAYERS
enum Layer {
- _QWERTY = 0, // Standard QWERTY layer
- _FUNCTION, // Function key layer
- _COLOUR // RGB key layer
+ _QWERTY,
+ _FUNCTION,
+ _COLOUR
};
-#define _QW _QWERTY
-#define _FN _FUNCTION
-#define _CLR _COLOUR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTY] = LAYOUT_ansi(
- // 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+ [_QWERTY] = LAYOUT(
QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
@@ -36,15 +19,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
- [_FUNCTION] = LAYOUT_ansi(
+ [_FUNCTION] = LAYOUT(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
_______, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______, KC_HOME,
_______, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, KC_END,
_______, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
- _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______
+ _______, _______, _______, QK_BOOT, MO(2), _______, _______, _______, _______, _______
),
- [_COLOUR] = LAYOUT_ansi(
+ [_COLOUR] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/ducky/one2sf/1967st/chconf.h b/keyboards/ducky/one2sf/1967st/chconf.h
index 617be40dd90..54d5aa84c42 100644
--- a/keyboards/ducky/one2sf/1967st/chconf.h
+++ b/keyboards/ducky/one2sf/1967st/chconf.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 QMK
- *
- * 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 .
- */
+// Copyright 2020 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keyboards/ducky/one2sf/1967st/config.h b/keyboards/ducky/one2sf/1967st/config.h
index 1bb511107db..a8bf4a03ef0 100644
--- a/keyboards/ducky/one2sf/1967st/config.h
+++ b/keyboards/ducky/one2sf/1967st/config.h
@@ -1,19 +1,5 @@
-/*
-Copyright 2019 /u/KeepItUnder
-
-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 .
-*/
+// Copyright 2019 /u/KeepItUnder
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/info.json
new file mode 100644
index 00000000000..634678affaf
--- /dev/null
+++ b/keyboards/ducky/one2sf/1967st/info.json
@@ -0,0 +1,23 @@
+{
+ "manufacturer": "Ducky",
+ "maintainer": "f7urry",
+ "bootloader": "custom",
+ "usb": {
+ "vid": "0x445B"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B15"],
+ "rows": ["D11", "B4", "B5", "B6", "B7"]
+ },
+ "diode_direction": "COL2ROW",
+ "features": {
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ }
+}
diff --git a/keyboards/ducky/one2sf/1967st/iso/keyboard.json b/keyboards/ducky/one2sf/1967st/iso/keyboard.json
new file mode 100644
index 00000000000..f09f5aa7b29
--- /dev/null
+++ b/keyboards/ducky/one2sf/1967st/iso/keyboard.json
@@ -0,0 +1,91 @@
+{
+ "keyboard_name": "One 2 SF ISO",
+ "usb": {
+ "pid": "0x07AE",
+ "device_version": "0.0.1"
+ },
+ "layout_aliases": {
+ "LAYOUT_iso": "LAYOUT"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+
+ {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
+ {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
+ {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
+
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
+ {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
+ {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
+ {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
+ {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
+ {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/ducky/one2sf/1967st/iso/keymaps/default/config.h b/keyboards/ducky/one2sf/1967st/iso/keymaps/default/config.h
new file mode 100644
index 00000000000..dc80ab8f9d4
--- /dev/null
+++ b/keyboards/ducky/one2sf/1967st/iso/keymaps/default/config.h
@@ -0,0 +1,12 @@
+// Copyright 2019 /u/KeepItUnder
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// place overrides here
+#define GRAVE_ESC_GUI_OVERRIDE
+#define MK_3_SPEED
+#define MK_C_OFFSET_UNMOD 400 /* Cursor offset per movement (unmodified) */
+#define MK_C_INTERVAL_UNMOD 5 /* Time between cursor movements (unmodified) */
+#define MK_W_OFFSET_UNMOD 100 /* Scroll steps per scroll action (unmodified) */
+#define MK_W_INTERVAL_UNMOD 10 /* Time between scroll steps (unmodified) */
diff --git a/keyboards/ducky/one2sf/keymaps/default_iso/keymap.c b/keyboards/ducky/one2sf/1967st/iso/keymaps/default/keymap.c
similarity index 62%
rename from keyboards/ducky/one2sf/keymaps/default_iso/keymap.c
rename to keyboards/ducky/one2sf/1967st/iso/keymaps/default/keymap.c
index 3ec27fa54f8..482dae51ce1 100644
--- a/keyboards/ducky/one2sf/keymaps/default_iso/keymap.c
+++ b/keyboards/ducky/one2sf/1967st/iso/keymaps/default/keymap.c
@@ -1,34 +1,17 @@
-/* Copyright 2019 /u/KeepItUnder
- *
- * 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 .
- */
+// Copyright 2019 /u/KeepItUnder
+// SPDX-License-Identifier: GPL-2.0-or-later
+
#include QMK_KEYBOARD_H
-// LAYERS
enum Layer {
- _QWERTY = 0, // Standard QWERTY layer
- _FUNCTION, // Function key layer
- _COLOUR // RGB key layer
+ _QWERTY,
+ _FUNCTION,
+ _COLOUR
};
-#define _QW _QWERTY
-#define _FN _FUNCTION
-#define _CLR _COLOUR
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTY] = LAYOUT_iso(
- // 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+ [_QWERTY] = LAYOUT(
QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_PGUP,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
@@ -36,15 +19,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
- [_FUNCTION] = LAYOUT_iso(
+ [_FUNCTION] = LAYOUT(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
_______, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, KC_HOME,
_______, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, _______, KC_END,
_______, _______, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
- _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______
+ _______, _______, _______, QK_BOOT, MO(2), _______, _______, _______, _______, _______
),
- [_COLOUR] = LAYOUT_iso(
+ [_COLOUR] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/ducky/one2sf/1967st/keyboard.json b/keyboards/ducky/one2sf/1967st/keyboard.json
deleted file mode 100644
index 093793d4c88..00000000000
--- a/keyboards/ducky/one2sf/1967st/keyboard.json
+++ /dev/null
@@ -1,269 +0,0 @@
-{
- "keyboard_name": "One 2 SF",
- "manufacturer": "Ducky",
- "maintainer": "f7urry",
- "usb": {
- "vid": "0x445B",
- "pid": "0x07AF",
- "device_version": "0.0.1"
- },
- "host": {
- "default": {
- "nkro": true
- }
- },
- "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",
- "dip_switch": {
- "matrix_grid": [ [0,14], [1,14], [2,14], [3,14] ]
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "nkro": true,
- "dip_switch": true
- },
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
-
- {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
- {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
- {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
- {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
- {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
- ]
- },
- "LAYOUT_ansi": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
- {"label": "\\", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
-
- {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
-
- {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
- {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
- {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
- {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
- {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
- ]
- },
- "LAYOUT_iso": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},
-
- {"label": "Delete", "matrix": [0, 14], "x": 15.25, "y": 0},
-
- {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
- {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
- {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
- {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
- {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
- {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
- {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
- {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
- {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
- {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
- {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
- {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
- {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
-
- {"label": "Page Up", "matrix": [1, 14], "x": 15.25, "y": 1},
-
- {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
- {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
- {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
- {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
- {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
- {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
- {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
- {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
- {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
- {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
- {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
- {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
- {"label": "#", "matrix": [2, 12], "x": 12.75, "y": 2},
- {"label": "Enter", "matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
-
- {"label": "Page Down", "matrix": [2, 14], "x": 15.25, "y": 2},
-
- {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
- {"label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3},
- {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
- {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
- {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
- {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
- {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
- {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
- {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
- {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
- {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
- {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3},
- {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2},
- {"label": "\u2191", "matrix": [3, 13], "x": 14.25, "y": 3},
-
- {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
- {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
- {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
- {"label": "Space", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
- {"label": "Alt", "matrix": [4, 9], "x": 10, "y": 4},
- {"label": "Fn", "matrix": [4, 10], "x": 11, "y": 4},
- {"label": "Ctrl", "matrix": [4, 11], "x": 12, "y": 4, "w": 1.25},
- {"label": "\u2190", "matrix": [4, 12], "x": 13.25, "y": 4},
- {"label": "\u2193", "matrix": [4, 13], "x": 14.25, "y": 4},
- {"label": "\u2192", "matrix": [4, 14], "x": 15.25, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/ducky/one2sf/1967st/matrix_diagram.md b/keyboards/ducky/one2sf/1967st/matrix_diagram.md
deleted file mode 100644
index 7fdc0a82ceb..00000000000
--- a/keyboards/ducky/one2sf/1967st/matrix_diagram.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Matrix Diagram for Ducky One 2 SF
-
-```
-┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┐
-│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D ││0E │
-├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┤ ┌─────┐
-│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D ││1E │ │ │
-├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┤ ┌──┴┐2D │
-│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D ││2E │ │2C │ │
-├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─────┬──┴┼───┘ └───┴────┘
-│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │ ISO Enter
-├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴───┬───┼───┼───┐
-│40 │41 │42 │45 │49 │4A │4B │4C │4D │4E │
-└────┴────┴────┴────────────────────────┴───┴───┴────┴───┴───┴───┘
-┌────────┐
-│30 │ 2.25u LShift
-└────────┘
-```
diff --git a/keyboards/ducky/one2sf/1967st/mcuconf.h b/keyboards/ducky/one2sf/1967st/mcuconf.h
index 12e9d2a82dc..e8975cf13ff 100644
--- a/keyboards/ducky/one2sf/1967st/mcuconf.h
+++ b/keyboards/ducky/one2sf/1967st/mcuconf.h
@@ -43,7 +43,7 @@
#define NUC123_USB_USE_USB0 TRUE
#define NUC123_USB_USE_USB1 TRUE
-#define NUC123_SERIAL_USE_UART0 TRUE
+#define NUC123_SERIAL_USE_UART0 FALSE
#define NUC123_SERIAL_CLKSRC NUC123_SERIAL_CLKSRC_HSI
#define NUC123_MCUCONF
diff --git a/keyboards/ducky/one2sf/1967st/readme.md b/keyboards/ducky/one2sf/1967st/readme.md
index cb3739efbb7..5038d62ada4 100644
--- a/keyboards/ducky/one2sf/1967st/readme.md
+++ b/keyboards/ducky/one2sf/1967st/readme.md
@@ -2,18 +2,16 @@
A 65% keyboard by Ducky.
-This firmware was tested on the Ducky One 2 SF 1967ST version.
-
* Keyboard Maintainer: [f7urry](https://github.com/f7urry)
* Hardware Supported: Ducky One 2 SF RGB (DKON1967ST), NUC123SD4AN0 + MBI5043GP
- * Only ANSI layout is supported at this time
- * ISO compiles but is **untested**
* VIA still WIP.
* RGB LEDs are currently disabled until the driver is merged.
+ * DIP switches are disabled due to hardware incompatibilities
## Compiling the Firmware:
- make ducky/one2sf/1967st:default
+ make ducky/one2sf/1967st/ansi:default
+ make ducky/one2sf/1967st/iso:default
## Accessing Bootloader Mode
@@ -24,11 +22,16 @@ To enter the 1967ST bootloader to flash, boot the keyboard while holding D+L.
There are then two ways to flash the keyboard:
pip install --user nuvoton-isp
- nuvoisp -f ducky_one2sf_ansi.bin
+ nuvoisp -f ducky_one2sf_1967st_ansi_default.bin
Alternatively you can use elfmimi's [nu-isp-cli](https://lib.rs/crates/nu-isp-cli) which is more complete than nuvoisp and allows flashing .hex files as well.
cargo install nu-isp-cli
- nu-isp-cli flash ducky_one2sf_ansi.bin
+ nu-isp-cli flash ducky_one2sf_1967st_ansi_default.bin
+
+ or
+
+ make ducky/one2sf/1967st/ansi:default:flash
+ make ducky/one2sf/1967st/iso:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ducky/one2sf/1967st/rules.mk b/keyboards/ducky/one2sf/1967st/rules.mk
index 5eb1c44f8a1..1ff38c97eb6 100644
--- a/keyboards/ducky/one2sf/1967st/rules.mk
+++ b/keyboards/ducky/one2sf/1967st/rules.mk
@@ -15,3 +15,6 @@ BOARD = NUC123SD4AN0
MCU = cortex-m0
# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 6
+
+# Needs elevated access to 0416:3f00 on Linux
+PROGRAM_CMD = nu-isp-cli flash $(BUILD_DIR)/$(TARGET).bin
diff --git a/keyboards/ducky/one2sf/keymaps/default/config.h b/keyboards/ducky/one2sf/keymaps/default/config.h
deleted file mode 100644
index b052c604f5a..00000000000
--- a/keyboards/ducky/one2sf/keymaps/default/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 /u/KeepItUnder
- *
- * 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 .
- */
-
-#pragma once
-
-// place overrides here
-#define GRAVE_ESC_GUI_OVERRIDE
-#define MK_3_SPEED
-#define MK_C_OFFSET_UNMOD 400 /* Cursor offset per movement (unmodified) */
-#define MK_C_INTERVAL_UNMOD 5 /* Time between cursor movements (unmodified) */
-#define MK_W_OFFSET_UNMOD 100 /* Scroll steps per scroll action (unmodified) */
-#define MK_W_INTERVAL_UNMOD 10 /* Time between scroll steps (unmodified) */
diff --git a/keyboards/ducky/one2sf/keymaps/default/keymap.c b/keyboards/ducky/one2sf/keymaps/default/keymap.c
deleted file mode 100644
index 91a644d9725..00000000000
--- a/keyboards/ducky/one2sf/keymaps/default/keymap.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2019 /u/KeepItUnder
- *
- * 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 .
- */
-#include QMK_KEYBOARD_H
-
-// LAYERS
-enum Layer {
- _QWERTY = 0, // Standard QWERTY layer
- _FUNCTION, // Function key layer
- _COLOUR // RGB key layer
-};
-#define _QW _QWERTY
-#define _FN _FUNCTION
-#define _CLR _COLOUR
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [_QWERTY] = LAYOUT_all(
- // 2 3 4 5 6 7 8 9 10 11 12 13 14 15
- QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
- KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
- ),
-
- [_FUNCTION] = LAYOUT_all(
- KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
- _______, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, _______, KC_INS, _______, KC_UP, KC_PAUSE, KC_PGUP, KC_HOME, KC_PSCR, _______, KC_HOME,
- _______, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_END, _______, _______, KC_END,
- _______, _______, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
- _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______
- ),
-
- [_COLOUR] = LAYOUT_all(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
-};
diff --git a/keyboards/ducky/one2sf/keymaps/default_ansi/config.h b/keyboards/ducky/one2sf/keymaps/default_ansi/config.h
deleted file mode 100644
index b052c604f5a..00000000000
--- a/keyboards/ducky/one2sf/keymaps/default_ansi/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 /u/KeepItUnder
- *
- * 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 .
- */
-
-#pragma once
-
-// place overrides here
-#define GRAVE_ESC_GUI_OVERRIDE
-#define MK_3_SPEED
-#define MK_C_OFFSET_UNMOD 400 /* Cursor offset per movement (unmodified) */
-#define MK_C_INTERVAL_UNMOD 5 /* Time between cursor movements (unmodified) */
-#define MK_W_OFFSET_UNMOD 100 /* Scroll steps per scroll action (unmodified) */
-#define MK_W_INTERVAL_UNMOD 10 /* Time between scroll steps (unmodified) */
diff --git a/keyboards/ducky/one2sf/keymaps/default_iso/config.h b/keyboards/ducky/one2sf/keymaps/default_iso/config.h
deleted file mode 100644
index b052c604f5a..00000000000
--- a/keyboards/ducky/one2sf/keymaps/default_iso/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 /u/KeepItUnder
- *
- * 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 .
- */
-
-#pragma once
-
-// place overrides here
-#define GRAVE_ESC_GUI_OVERRIDE
-#define MK_3_SPEED
-#define MK_C_OFFSET_UNMOD 400 /* Cursor offset per movement (unmodified) */
-#define MK_C_INTERVAL_UNMOD 5 /* Time between cursor movements (unmodified) */
-#define MK_W_OFFSET_UNMOD 100 /* Scroll steps per scroll action (unmodified) */
-#define MK_W_INTERVAL_UNMOD 10 /* Time between scroll steps (unmodified) */