From 7e77c2361fbfba60fabb490a8dae310d5b7309ba Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 22 Jan 2021 09:10:52 -0800 Subject: [PATCH] Move Backslash/ISO Hash key to home row for Uni660 rev2 ISO (#11657) * Move Backslash/ISO Hash key to home row for Uni660 rev2 ISO * update readme formatting --- keyboards/sirius/uni660/rev1/readme.md | 24 ++++++++++++----- keyboards/sirius/uni660/rev2/ansi/readme.md | 24 ++++++++++++----- keyboards/sirius/uni660/rev2/iso/info.json | 2 +- keyboards/sirius/uni660/rev2/iso/iso.h | 4 +-- .../uni660/rev2/iso/keymaps/default/keymap.c | 4 +-- .../uni660/rev2/iso/keymaps/via/keymap.c | 16 +++++------ keyboards/sirius/uni660/rev2/iso/readme.md | 24 ++++++++++++----- keyboards/sirius/uni660/rev2/readme.md | 27 +++++++++++++------ 8 files changed, 83 insertions(+), 42 deletions(-) diff --git a/keyboards/sirius/uni660/rev1/readme.md b/keyboards/sirius/uni660/rev1/readme.md index 278841bd6..88928f791 100644 --- a/keyboards/sirius/uni660/rev1/readme.md +++ b/keyboards/sirius/uni660/rev1/readme.md @@ -1,15 +1,25 @@ # Uni660 Rev1 +![Sirius Uni660](https://i.imgur.com/ijkH0Q3l.jpg) + The Uni660 is an ergonomic wireless keyboard designed by Sirius. -Join the KeyCommerce [Discord](https://discord.gg/GJ8bdM) +Join the [KeyCommerce Discord](https://discord.gg/GJ8bdM). -Make example: +* Keyboard Maintainer: [danielhklein](https://github.com/danielhklein), [The QMK Community](https://github.com/qmk) +* Hardware Supported: Uni660 Rev1, ATmega32U4 +* Hardware Availability: Not currently available as of 2021-01-21 -``` -make sirius/uni660/rev1:default -``` +Make example for this keyboard (after setting up your build environment): + + make sirius/uni660/rev1:default + +Flashing example for this keyboard: + + make sirius/uni660/rev1:default:flash + +To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the RST pins: + +![RST pins](https://i.imgur.com/IlKKXWBl.png) 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). - -To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the ![RST pins](https://i.imgur.com/IlKKXWB.png) diff --git a/keyboards/sirius/uni660/rev2/ansi/readme.md b/keyboards/sirius/uni660/rev2/ansi/readme.md index 76bb94391..7da38f82b 100644 --- a/keyboards/sirius/uni660/rev2/ansi/readme.md +++ b/keyboards/sirius/uni660/rev2/ansi/readme.md @@ -1,15 +1,25 @@ # Uni660 Rev2 ANSI +![Sirius Uni660](https://i.imgur.com/ijkH0Q3l.jpg) + The Uni660 is an ergonomic wireless keyboard designed by Sirius. -Join the KeyCommerce [Discord](https://discord.gg/GJ8bdM) +Join the [KeyCommerce Discord](https://discord.gg/GJ8bdM). -Make example: +* Keyboard Maintainer: [danielhklein](https://github.com/danielhklein), [The QMK Community](https://github.com/qmk) +* Hardware Supported: Uni660 Rev2 ANSI, ATmega32U4 +* Hardware Availability: Not currently available as of 2021-01-21 -``` -make sirius/uni660/rev2/ansi:default -``` +Make example for this keyboard (after setting up your build environment): + + make sirius/uni660/rev2/ansi:default + +Flashing example for this keyboard: + + make sirius/uni660/rev2/ansi:default:flash + +To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the RST pins: + +![RST pins](https://i.imgur.com/IlKKXWBl.png) 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). - -To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the ![RST pins](https://i.imgur.com/IlKKXWB.png) diff --git a/keyboards/sirius/uni660/rev2/iso/info.json b/keyboards/sirius/uni660/rev2/iso/info.json index faaf217e9..2fe215475 100644 --- a/keyboards/sirius/uni660/rev2/iso/info.json +++ b/keyboards/sirius/uni660/rev2/iso/info.json @@ -44,7 +44,6 @@ {"x": 13, "y": 1}, {"x": 14, "y": 1}, {"x": 15, "y": 1}, - {"x": 16.25, "y": 1, "w": 1.25, "h": 2}, {"x": 18, "y": 1}, @@ -64,6 +63,7 @@ {"x": 13.25, "y": 2}, {"x": 14.25, "y": 2}, {"x": 15.25, "y": 2}, + {"x": 16.25, "y": 1, "w": 1.25, "h": 2}, {"x": 0, "y": 3}, diff --git a/keyboards/sirius/uni660/rev2/iso/iso.h b/keyboards/sirius/uni660/rev2/iso/iso.h index df5516e78..d9ed905d5 100644 --- a/keyboards/sirius/uni660/rev2/iso/iso.h +++ b/keyboards/sirius/uni660/rev2/iso/iso.h @@ -12,8 +12,8 @@ #define LAYOUT_iso( \ k00, k01, k02, k03, k04, k05, k06, k46, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k3F,\ - k10, k11, k12, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k2F,\ - k20, k21, k22, k23, k24, k25, k26, k28, k29, k2A, k2B, k2C, k2D, k2E, \ + k10, k11, k12, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k1D, k1E, k2F,\ + k20, k21, k22, k23, k24, k25, k26, k28, k29, k2A, k2B, k2C, k2D, k1F, k2E, \ k30, k31, k37, k32, k33, k34, k35, k36, k38, k39, k3A, k3B, k3C, k3D, k3E, \ k40, k41, k42, k43, k44, k45, k48, k49, k4A, k4C, k4D, k4E, k4F \ ) { \ diff --git a/keyboards/sirius/uni660/rev2/iso/keymaps/default/keymap.c b/keyboards/sirius/uni660/rev2/iso/keymaps/default/keymap.c index 25e471416..c26fd2712 100644 --- a/keyboards/sirius/uni660/rev2/iso/keymaps/default/keymap.c +++ b/keyboards/sirius/uni660/rev2/iso/keymaps/default/keymap.c @@ -3,8 +3,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_iso( /* Base */ KC_ESC, KC_GRV, 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_INS, - KC_F1, 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_DEL, - KC_F2, 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_F1, 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_DEL, + KC_F2, 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_BSLS, KC_ENT, KC_F3, 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_F4, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_DEL, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ) diff --git a/keyboards/sirius/uni660/rev2/iso/keymaps/via/keymap.c b/keyboards/sirius/uni660/rev2/iso/keymaps/via/keymap.c index 396543544..54a40ce37 100644 --- a/keyboards/sirius/uni660/rev2/iso/keymaps/via/keymap.c +++ b/keyboards/sirius/uni660/rev2/iso/keymaps/via/keymap.c @@ -3,32 +3,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_iso( /* Base */ KC_ESC, KC_GRV, 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_INS, - KC_F1, 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_DEL, - KC_F2, 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_F1, 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_DEL, + KC_F2, 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_BSLS, KC_ENT, KC_F3, 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_F4, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_DEL, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_iso( /* Layer 1 */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT_iso( /* Layer 2 */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [3] = LAYOUT_iso( /* Layer 3 */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/sirius/uni660/rev2/iso/readme.md b/keyboards/sirius/uni660/rev2/iso/readme.md index ea80141e9..f42564339 100644 --- a/keyboards/sirius/uni660/rev2/iso/readme.md +++ b/keyboards/sirius/uni660/rev2/iso/readme.md @@ -1,15 +1,25 @@ # Uni660 Rev2 ISO +![Sirius Uni660](https://i.imgur.com/ijkH0Q3l.jpg) + The Uni660 is an ergonomic wireless keyboard designed by Sirius. -Join the KeyCommerce [Discord](https://discord.gg/GJ8bdM) +Join the [KeyCommerce Discord](https://discord.gg/GJ8bdM). -Make example: +* Keyboard Maintainer: [danielhklein](https://github.com/danielhklein), [The QMK Community](https://github.com/qmk) +* Hardware Supported: Uni660 Rev2 ISO, ATmega32U4 +* Hardware Availability: Not currently available as of 2021-01-21 -``` -make sirius/uni660/rev2/iso:default -``` +Make example for this keyboard (after setting up your build environment): + + make sirius/uni660/rev2/iso:default + +Flashing example for this keyboard: + + make sirius/uni660/rev2/iso:default:flash + +To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the RST pins: + +![RST pins](https://i.imgur.com/IlKKXWBl.png) 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). - -To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the ![RST pins](https://i.imgur.com/IlKKXWB.png) diff --git a/keyboards/sirius/uni660/rev2/readme.md b/keyboards/sirius/uni660/rev2/readme.md index 059782b31..d267e16c7 100644 --- a/keyboards/sirius/uni660/rev2/readme.md +++ b/keyboards/sirius/uni660/rev2/readme.md @@ -1,16 +1,27 @@ # Uni660 Rev2 +![Sirius Uni660](https://i.imgur.com/ijkH0Q3l.jpg) + The Uni660 is an ergonomic wireless keyboard designed by Sirius. -Join the KeyCommerce [Discord](https://discord.gg/GJ8bdM) +Join the [KeyCommerce Discord](https://discord.gg/GJ8bdM). -Make example: +* Keyboard Maintainer: [danielhklein](https://github.com/danielhklein), [The QMK Community](https://github.com/qmk) +* Hardware Supported: [Uni660 Rev2 ANSI](ansi/), [Uni660 Rev2 ISO](iso/), ATmega32U4 +* Hardware Availability: Not currently available as of 2021-01-21 -``` -make sirius/uni660/rev2/ansi:default -make sirius/uni660/rev2/iso:default -``` +Make example for this keyboard (after setting up your build environment): + + make sirius/uni660/rev2/ansi:default # for ANSI version + make sirius/uni660/rev2/iso:default # for ISO version + +Flashing example for this keyboard: + + make sirius/uni660/rev2/ansi:default:flash # for ANSI version + make sirius/uni660/rev2/iso:default:flash # for ISO version + +To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the RST pins: + +![RST pins](https://i.imgur.com/IlKKXWBl.png) 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). - -To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the ![RST pins](https://i.imgur.com/IlKKXWB.png)