From 4ef0c8230cfb9b4768b50dbf4104d83d2ab21880 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 13 Jul 2022 13:57:55 -0700 Subject: [PATCH] Ducky One 2 SF touch-up (#17672) * info.json: correct JSON syntax error * info.json: correct key sizes * update readme files Moves nearly all of the information about this keyboard to the 1967st version's readme, because this readme is exposed in QMK Configurator. Also updates the readme to align more closely with QMK's keyboard readme template. * info.json: update metadata Updates the keyboard name and maintainer fields. --- keyboards/ducky/one2sf/1967st/info.json | 15 +++++------ keyboards/ducky/one2sf/1967st/readme.md | 33 ++++++++++++++++++++++++- keyboards/ducky/one2sf/readme.md | 27 ++++---------------- 3 files changed, 45 insertions(+), 30 deletions(-) diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/info.json index 468222a6e24914133bdb91b309c46a66655872fe..1ba894e65b76ad5aea3ae20cd221c6e6cca457cb 100644 --- a/keyboards/ducky/one2sf/1967st/info.json +++ b/keyboards/ducky/one2sf/1967st/info.json @@ -1,5 +1,6 @@ { - "keyboard_name": "Ducky One 2 SF", + "keyboard_name": "Ducky One 2 SF (DKON1967ST)", + "maintainer": "f7urry", "layouts": { "LAYOUT_all": { "layout": [ @@ -17,7 +18,7 @@ { "x": 11, "y": 0, "w": 1, "label": "DASH" }, { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" }, { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" }, - { "x": 15.25, "y": 0, "w": 2, "label": "DEL" }, + { "x": 15.25, "y": 0, "w": 1, "label": "DEL" }, { "x": 0, "y": 1, "w": 1.5, "label": "TAB" }, { "x": 1.5, "y": 1, "w": 1, "label": "Q" }, @@ -33,7 +34,7 @@ { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" }, { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" }, { "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" }, - { "x": 15.25, "y": 1, "w": 1.5, "label": "PAGEUP" }, + { "x": 15.25, "y": 1, "w": 1, "label": "PAGEUP" }, { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" }, { "x": 1.75, "y": 2, "w": 1, "label": "A" }, @@ -49,7 +50,7 @@ { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" }, { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" }, { "x": 13.75, "y": 2, "w": 1.25, "label": "ENTER" }, - { "x": 15.25, "y": 2, "w": 1.25, "label": "PAGEDOWN" }, + { "x": 15.25, "y": 2, "w": 1, "label": "PAGEDOWN" }, { "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" }, { "x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH" }, @@ -63,8 +64,8 @@ { "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": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" }, - { "x": 14.25, "y": 3, "w": 2.75, "label": "UP" }, + { "x": 12.25, "y": 3, "w": 2, "label": "RSHIFT" }, + { "x": 14.25, "y": 3, "w": 1, "label": "UP" }, { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" }, { "x": 1.25, "y": 4, "w": 1.25, "label": "LCMD" }, @@ -74,7 +75,7 @@ { "x": 11, "y": 4, "w": 1, "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": 14.25, "y": 4, "w": 1, "label": "DOWN" }, { "x": 15.25, "y": 4, "w": 1, "label": "RIGHT" } ] } diff --git a/keyboards/ducky/one2sf/1967st/readme.md b/keyboards/ducky/one2sf/1967st/readme.md index 16a932812e557a0b42cc911a2ee9a7d0770463e6..be96a8db7109ba62b4ace5de6db277d40b32d156 100644 --- a/keyboards/ducky/one2sf/1967st/readme.md +++ b/keyboards/ducky/one2sf/1967st/readme.md @@ -1 +1,32 @@ -# One2SF \ No newline at end of file +# One 2 SF (DKON1967ST) + +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 & VIA still WIP). + * RGB LEDs are currently disabled until the driver is merged. + +## Compiling the Firmware: + + make ducky/one2sf/1967st:default + +## Accessing Bootloader Mode + +To enter the 1967ST bootloader to flash, boot the keyboard while holding D+L. + +## Flashing the Firmware: + +There are then two ways to flash the keyboard: + + pip install --user nuvoton-isp + nuvoisp -f ducky_one2sf_ansi.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 + +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/readme.md b/keyboards/ducky/one2sf/readme.md index 7f6abd81feb20b11fdd6440d27674254417d921d..fb37adb7e9edf3b1a3985b987af9c664c84d3cb5 100644 --- a/keyboards/ducky/one2sf/readme.md +++ b/keyboards/ducky/one2sf/readme.md @@ -1,25 +1,8 @@ -# One2SF +# One 2 SF -A 65% keyboard by Ducky +A 65% keyboard by Ducky. -* Hardware Supported: Ducky One 2 SF RGB / NUC123SD4AN0 / MBI5043GP -* Layout only support for ANSI (ISO & VIA still WIP) -Make example for this keyboard (after setting up your build environment): +The only supported keyboard version at this time is the DKON1967ST. - make ducky/one2sf:default - -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). - -RGB LEDs are currently disabled until the driver is merged. - -This firmware was tested on the duckyon2sf 1967ST version. To enter the 1967ST bootloader to flash you can 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 - -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 +* Hardware Supported: + * [DKON1967ST](1967st/), NUC123SD4AN0 + MBI5043GP