aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-01-22 17:11:22 +0000
committerQMK Bot <hello@qmk.fm>2021-01-22 17:11:22 +0000
commit397e8e461f88ebfb635264e91ab1d07ebd6d9813 (patch)
tree2e1b9917f915a5f3c0caf47df75c4777d5765987
parentf52baa4bc10be215a249b8c6c1f9866d65191b91 (diff)
parent7e77c2361fbfba60fabb490a8dae310d5b7309ba (diff)
downloadqmk_firmware-397e8e461f88ebfb635264e91ab1d07ebd6d9813.tar.gz
qmk_firmware-397e8e461f88ebfb635264e91ab1d07ebd6d9813.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/sirius/uni660/rev1/readme.md24
-rw-r--r--keyboards/sirius/uni660/rev2/ansi/readme.md24
-rw-r--r--keyboards/sirius/uni660/rev2/iso/info.json2
-rw-r--r--keyboards/sirius/uni660/rev2/iso/iso.h4
-rw-r--r--keyboards/sirius/uni660/rev2/iso/keymaps/default/keymap.c4
-rw-r--r--keyboards/sirius/uni660/rev2/iso/keymaps/via/keymap.c16
-rw-r--r--keyboards/sirius/uni660/rev2/iso/readme.md24
-rw-r--r--keyboards/sirius/uni660/rev2/readme.md27
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 @@
1# Uni660 Rev1 1# Uni660 Rev1
2 2
3![Sirius Uni660](https://i.imgur.com/ijkH0Q3l.jpg)
4
3The Uni660 is an ergonomic wireless keyboard designed by Sirius. 5The Uni660 is an ergonomic wireless keyboard designed by Sirius.
4 6
5Join the KeyCommerce [Discord](https://discord.gg/GJ8bdM) 7Join the [KeyCommerce Discord](https://discord.gg/GJ8bdM).
6 8
7Make example: 9* Keyboard Maintainer: [danielhklein](https://github.com/danielhklein), [The QMK Community](https://github.com/qmk)
10* Hardware Supported: Uni660 Rev1, ATmega32U4
11* Hardware Availability: Not currently available as of 2021-01-21
8 12
9``` 13Make example for this keyboard (after setting up your build environment):
10make sirius/uni660/rev1:default
11```
12 14
13See 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). 15 make sirius/uni660/rev1:default
16
17Flashing example for this keyboard:
18
19 make sirius/uni660/rev1:default:flash
14 20
15To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the ![RST pins](https://i.imgur.com/IlKKXWB.png) 21To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the RST pins:
22
23![RST pins](https://i.imgur.com/IlKKXWBl.png)
24
25See 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/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 @@
1# Uni660 Rev2 ANSI 1# Uni660 Rev2 ANSI
2 2
3![Sirius Uni660](https://i.imgur.com/ijkH0Q3l.jpg)
4
3The Uni660 is an ergonomic wireless keyboard designed by Sirius. 5The Uni660 is an ergonomic wireless keyboard designed by Sirius.
4 6
5Join the KeyCommerce [Discord](https://discord.gg/GJ8bdM) 7Join the [KeyCommerce Discord](https://discord.gg/GJ8bdM).
6 8
7Make example: 9* Keyboard Maintainer: [danielhklein](https://github.com/danielhklein), [The QMK Community](https://github.com/qmk)
10* Hardware Supported: Uni660 Rev2 ANSI, ATmega32U4
11* Hardware Availability: Not currently available as of 2021-01-21
8 12
9``` 13Make example for this keyboard (after setting up your build environment):
10make sirius/uni660/rev2/ansi:default
11```
12 14
13See 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). 15 make sirius/uni660/rev2/ansi:default
16
17Flashing example for this keyboard:
18
19 make sirius/uni660/rev2/ansi:default:flash
14 20
15To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the ![RST pins](https://i.imgur.com/IlKKXWB.png) 21To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the RST pins:
22
23![RST pins](https://i.imgur.com/IlKKXWBl.png)
24
25See 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/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 @@
44 {"x": 13, "y": 1}, 44 {"x": 13, "y": 1},
45 {"x": 14, "y": 1}, 45 {"x": 14, "y": 1},
46 {"x": 15, "y": 1}, 46 {"x": 15, "y": 1},
47 {"x": 16.25, "y": 1, "w": 1.25, "h": 2},
48 47
49 {"x": 18, "y": 1}, 48 {"x": 18, "y": 1},
50 49
@@ -64,6 +63,7 @@
64 {"x": 13.25, "y": 2}, 63 {"x": 13.25, "y": 2},
65 {"x": 14.25, "y": 2}, 64 {"x": 14.25, "y": 2},
66 {"x": 15.25, "y": 2}, 65 {"x": 15.25, "y": 2},
66 {"x": 16.25, "y": 1, "w": 1.25, "h": 2},
67 67
68 {"x": 0, "y": 3}, 68 {"x": 0, "y": 3},
69 69
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 @@
12 12
13#define LAYOUT_iso( \ 13#define LAYOUT_iso( \
14 k00, k01, k02, k03, k04, k05, k06, k46, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k3F,\ 14 k00, k01, k02, k03, k04, k05, k06, k46, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k3F,\
15 k10, k11, k12, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k2F,\ 15 k10, k11, k12, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k1D, k1E, k2F,\
16 k20, k21, k22, k23, k24, k25, k26, k28, k29, k2A, k2B, k2C, k2D, k2E, \ 16 k20, k21, k22, k23, k24, k25, k26, k28, k29, k2A, k2B, k2C, k2D, k1F, k2E, \
17 k30, k31, k37, k32, k33, k34, k35, k36, k38, k39, k3A, k3B, k3C, k3D, k3E, \ 17 k30, k31, k37, k32, k33, k34, k35, k36, k38, k39, k3A, k3B, k3C, k3D, k3E, \
18 k40, k41, k42, k43, k44, k45, k48, k49, k4A, k4C, k4D, k4E, k4F \ 18 k40, k41, k42, k43, k44, k45, k48, k49, k4A, k4C, k4D, k4E, k4F \
19) { \ 19) { \
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 @@
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4 [0] = LAYOUT_iso( /* Base */ 4 [0] = LAYOUT_iso( /* Base */
5 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, 5 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,
6 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, 6 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,
7 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, 7 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,
8 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, 8 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,
9 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 9 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
10 ) 10 )
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 @@
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4 [0] = LAYOUT_iso( /* Base */ 4 [0] = LAYOUT_iso( /* Base */
5 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, 5 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,
6 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, 6 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,
7 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, 7 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,
8 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, 8 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,
9 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 9 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
10 ), 10 ),
11 11
12 [1] = LAYOUT_iso( /* Layer 1 */ 12 [1] = LAYOUT_iso( /* Layer 1 */
13 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 13 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
14 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 14 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
15 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 15 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
16 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 16 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
17 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 17 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
18 ), 18 ),
19 19
20 [2] = LAYOUT_iso( /* Layer 2 */ 20 [2] = LAYOUT_iso( /* Layer 2 */
21 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 21 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
22 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 22 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
23 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 23 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
24 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 24 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
25 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 25 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
26 ), 26 ),
27 27
28 [3] = LAYOUT_iso( /* Layer 3 */ 28 [3] = LAYOUT_iso( /* Layer 3 */
29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
33 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 33 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
34 ) 34 )
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 @@
1# Uni660 Rev2 ISO 1# Uni660 Rev2 ISO
2 2
3![Sirius Uni660](https://i.imgur.com/ijkH0Q3l.jpg)
4
3The Uni660 is an ergonomic wireless keyboard designed by Sirius. 5The Uni660 is an ergonomic wireless keyboard designed by Sirius.
4 6
5Join the KeyCommerce [Discord](https://discord.gg/GJ8bdM) 7Join the [KeyCommerce Discord](https://discord.gg/GJ8bdM).
6 8
7Make example: 9* Keyboard Maintainer: [danielhklein](https://github.com/danielhklein), [The QMK Community](https://github.com/qmk)
10* Hardware Supported: Uni660 Rev2 ISO, ATmega32U4
11* Hardware Availability: Not currently available as of 2021-01-21
8 12
9``` 13Make example for this keyboard (after setting up your build environment):
10make sirius/uni660/rev2/iso:default
11```
12 14
13See 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). 15 make sirius/uni660/rev2/iso:default
16
17Flashing example for this keyboard:
18
19 make sirius/uni660/rev2/iso:default:flash
14 20
15To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the ![RST pins](https://i.imgur.com/IlKKXWB.png) 21To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the RST pins:
22
23![RST pins](https://i.imgur.com/IlKKXWBl.png)
24
25See 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/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 @@
1# Uni660 Rev2 1# Uni660 Rev2
2 2
3![Sirius Uni660](https://i.imgur.com/ijkH0Q3l.jpg)
4
3The Uni660 is an ergonomic wireless keyboard designed by Sirius. 5The Uni660 is an ergonomic wireless keyboard designed by Sirius.
4 6
5Join the KeyCommerce [Discord](https://discord.gg/GJ8bdM) 7Join the [KeyCommerce Discord](https://discord.gg/GJ8bdM).
6 8
7Make example: 9* Keyboard Maintainer: [danielhklein](https://github.com/danielhklein), [The QMK Community](https://github.com/qmk)
10* Hardware Supported: [Uni660 Rev2 ANSI](ansi/), [Uni660 Rev2 ISO](iso/), ATmega32U4
11* Hardware Availability: Not currently available as of 2021-01-21
8 12
9``` 13Make example for this keyboard (after setting up your build environment):
10make sirius/uni660/rev2/ansi:default
11make sirius/uni660/rev2/iso:default
12```
13 14
14See 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). 15 make sirius/uni660/rev2/ansi:default # for ANSI version
16 make sirius/uni660/rev2/iso:default # for ISO version
17
18Flashing example for this keyboard:
19
20 make sirius/uni660/rev2/ansi:default:flash # for ANSI version
21 make sirius/uni660/rev2/iso:default:flash # for ISO version
15 22
16To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the ![RST pins](https://i.imgur.com/IlKKXWB.png) 23To get the U2U into DFU flashing mode, insert the U2U into the computer and connect the RST pins:
24
25![RST pins](https://i.imgur.com/IlKKXWBl.png)
26
27See 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).
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 18:30:31 +0000