aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-08-14 06:19:50 -0700
committerGitHub <noreply@github.com>2021-08-14 23:19:50 +1000
commitde29364827063c5ee79d2e9d0eec33af63286408 (patch)
treec95343899add38b5817d7574e3c456d8f011ae69
parent47b76f556bb7915267b0c687ef936cb86d0ef37d (diff)
downloadqmk_firmware-de29364827063c5ee79d2e9d0eec33af63286408.tar.gz
qmk_firmware-de29364827063c5ee79d2e9d0eec33af63286408.zip
Ducky One2mini Layout Macro fixes (#14002)
Diffstat
-rw-r--r--keyboards/ducky/one2mini/1861st/1861st.h58
-rw-r--r--keyboards/ducky/one2mini/1861st/info.json24
-rw-r--r--keyboards/ducky/one2mini/keymaps/ansi/keymap.c24
-rw-r--r--keyboards/ducky/one2mini/keymaps/default/keymap.c12
-rw-r--r--keyboards/ducky/one2mini/keymaps/iso/keymap.c18
5 files changed, 76 insertions, 60 deletions
diff --git a/keyboards/ducky/one2mini/1861st/1861st.h b/keyboards/ducky/one2mini/1861st/1861st.h
index 2f6f7eee7..23ca18206 100644
--- a/keyboards/ducky/one2mini/1861st/1861st.h
+++ b/keyboards/ducky/one2mini/1861st/1861st.h
@@ -17,6 +17,8 @@
17 17
18#include "quantum.h" 18#include "quantum.h"
19 19
20#define XXX KC_NO
21
20/* This a shortcut to help you visually see your layout. 22/* This a shortcut to help you visually see your layout.
21 * 23 *
22 * The first section contains all of the arguments representing the physical 24 * The first section contains all of the arguments representing the physical
@@ -30,39 +32,39 @@
30 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ 32 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
31 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ 33 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
32 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ 34 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \
33 k40, k41, k42, k45, k4a, k4b, k4c, k4d \ 35 k40, k41, k42, k45, k4a, k4b, k4c, k4d \
34) { \ 36) { \
35 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, KC_NO }, \ 37 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \
36 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \ 38 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
37 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \ 39 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
38 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, KC_NO }, \ 40 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \
39 { k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO, KC_NO, KC_NO, k4a, k4b, k4c, k4d } \ 41 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX } \
40} 42}
41 43
42#define LAYOUT_ansi( \ 44#define LAYOUT_60_ansi( \
43 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ 45 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
44 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ 46 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
45 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ 47 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
46 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ 48 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \
47 k40, k41, k42, k45, k4a, k4b, k4c, k4d \ 49 k40, k41, k42, k45, k4a, k4b, k4c, k4d \
48) { \ 50) { \
49 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, KC_NO }, \ 51 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \
50 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \ 52 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX }, \
51 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \ 53 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX }, \
52 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, KC_NO }, \ 54 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \
53 { k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO, KC_NO, KC_NO, k4a, k4b, k4c, k4d } \ 55 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX } \
54} 56}
55 57
56#define LAYOUT_iso( \ 58#define LAYOUT_60_iso( \
57 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ 59 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
58 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ 60 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
59 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ 61 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
60 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \ 62 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \
61 k40, k41, k42, k45, k4a, k4b, k4c, k4d \ 63 k40, k41, k42, k45, k4a, k4b, k4c, k4d \
62) { \ 64) { \
63 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, KC_NO, }, \ 65 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, XXX }, \
64 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, KC_NO, }, \ 66 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX }, \
65 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO, }, \ 67 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \
66 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, KC_NO, }, \ 68 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX }, \
67 { k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO, KC_NO, KC_NO, k4a, k4b, k4c, k4d } \ 69 { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX } \
68} 70}
diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/info.json
index f0abe81ed..44ba19b6e 100644
--- a/keyboards/ducky/one2mini/1861st/info.json
+++ b/keyboards/ducky/one2mini/1861st/info.json
@@ -2,6 +2,9 @@
2 "keyboard_name": "Ducky One 2 Mini", 2 "keyboard_name": "Ducky One 2 Mini",
3 "width": 14, 3 "width": 14,
4 "height": 5, 4 "height": 5,
5 "layout_aliases": {
6 "LAYOUT_iso": "LAYOUT_60_iso"
7 },
5 "layouts": { 8 "layouts": {
6 "LAYOUT_all": { 9 "LAYOUT_all": {
7 "layout": [ 10 "layout": [
@@ -19,6 +22,7 @@
19 { "x": 11, "y": 0, "w": 1, "label": "DASH" }, 22 { "x": 11, "y": 0, "w": 1, "label": "DASH" },
20 { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" }, 23 { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" },
21 { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" }, 24 { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" },
25
22 { "x": 0, "y": 1, "w": 1.5, "label": "TAB" }, 26 { "x": 0, "y": 1, "w": 1.5, "label": "TAB" },
23 { "x": 1.5, "y": 1, "w": 1, "label": "Q" }, 27 { "x": 1.5, "y": 1, "w": 1, "label": "Q" },
24 { "x": 2.5, "y": 1, "w": 1, "label": "W" }, 28 { "x": 2.5, "y": 1, "w": 1, "label": "W" },
@@ -33,6 +37,7 @@
33 { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" }, 37 { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" },
34 { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" }, 38 { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" },
35 { "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" }, 39 { "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" },
40
36 { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" }, 41 { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" },
37 { "x": 1.75, "y": 2, "w": 1, "label": "A" }, 42 { "x": 1.75, "y": 2, "w": 1, "label": "A" },
38 { "x": 2.75, "y": 2, "w": 1, "label": "S" }, 43 { "x": 2.75, "y": 2, "w": 1, "label": "S" },
@@ -47,6 +52,7 @@
47 { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" }, 52 { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" },
48 { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" }, 53 { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" },
49 { "x": 13.75, "y": 2, "w": 1.25, "label": "ENTER" }, 54 { "x": 13.75, "y": 2, "w": 1.25, "label": "ENTER" },
55
50 { "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" }, 56 { "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" },
51 { "x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH" }, 57 { "x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH" },
52 { "x": 2.25, "y": 3, "w": 1, "label": "Z" }, 58 { "x": 2.25, "y": 3, "w": 1, "label": "Z" },
@@ -59,7 +65,8 @@
59 { "x": 9.25, "y": 3, "w": 1, "label": "COMMA" }, 65 { "x": 9.25, "y": 3, "w": 1, "label": "COMMA" },
60 { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" }, 66 { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" },
61 { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" }, 67 { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" },
62 { "x": 12.25, "y": 3, "w": 2.25, "label": "RSHIFT" }, 68 { "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" },
69
63 { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" }, 70 { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" },
64 { "x": 1.25, "y": 4, "w": 1.25, "label": "LCMD" }, 71 { "x": 1.25, "y": 4, "w": 1.25, "label": "LCMD" },
65 { "x": 2.5, "y": 4, "w": 1.25, "label": "LALT" }, 72 { "x": 2.5, "y": 4, "w": 1.25, "label": "LALT" },
@@ -71,7 +78,7 @@
71 ] 78 ]
72 }, 79 },
73 80
74 "LAYOUT_ansi": { 81 "LAYOUT_60_ansi": {
75 "layout": [ 82 "layout": [
76 { "x": 0, "y": 0, "w": 1, "label": "ESC" }, 83 { "x": 0, "y": 0, "w": 1, "label": "ESC" },
77 { "x": 1, "y": 0, "w": 1, "label": "1" }, 84 { "x": 1, "y": 0, "w": 1, "label": "1" },
@@ -87,6 +94,7 @@
87 { "x": 11, "y": 0, "w": 1, "label": "DASH" }, 94 { "x": 11, "y": 0, "w": 1, "label": "DASH" },
88 { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" }, 95 { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" },
89 { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" }, 96 { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" },
97
90 { "x": 0, "y": 1, "w": 1.5, "label": "TAB" }, 98 { "x": 0, "y": 1, "w": 1.5, "label": "TAB" },
91 { "x": 1.5, "y": 1, "w": 1, "label": "Q" }, 99 { "x": 1.5, "y": 1, "w": 1, "label": "Q" },
92 { "x": 2.5, "y": 1, "w": 1, "label": "W" }, 100 { "x": 2.5, "y": 1, "w": 1, "label": "W" },
@@ -101,6 +109,7 @@
101 { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" }, 109 { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" },
102 { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" }, 110 { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" },
103 { "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" }, 111 { "x": 13.5, "y": 1, "w": 1.5, "label": "BACKSLASH" },
112
104 { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" }, 113 { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" },
105 { "x": 1.75, "y": 2, "w": 1, "label": "A" }, 114 { "x": 1.75, "y": 2, "w": 1, "label": "A" },
106 { "x": 2.75, "y": 2, "w": 1, "label": "S" }, 115 { "x": 2.75, "y": 2, "w": 1, "label": "S" },
@@ -113,8 +122,8 @@
113 { "x": 9.75, "y": 2, "w": 1, "label": "L" }, 122 { "x": 9.75, "y": 2, "w": 1, "label": "L" },
114 { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" }, 123 { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" },
115 { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" }, 124 { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" },
116 { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" },
117 { "x": 12.75, "y": 2, "w": 2.25, "label": "ENTER" }, 125 { "x": 12.75, "y": 2, "w": 2.25, "label": "ENTER" },
126
118 { "x": 0, "y": 3, "w": 2.25, "label": "LSHIFT" }, 127 { "x": 0, "y": 3, "w": 2.25, "label": "LSHIFT" },
119 { "x": 2.25, "y": 3, "w": 1, "label": "Z" }, 128 { "x": 2.25, "y": 3, "w": 1, "label": "Z" },
120 { "x": 3.25, "y": 3, "w": 1, "label": "X" }, 129 { "x": 3.25, "y": 3, "w": 1, "label": "X" },
@@ -127,6 +136,7 @@
127 { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" }, 136 { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" },
128 { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" }, 137 { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" },
129 { "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" }, 138 { "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" },
139
130 { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" }, 140 { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" },
131 { "x": 1.25, "y": 4, "w": 1.25, "label": "LCMD" }, 141 { "x": 1.25, "y": 4, "w": 1.25, "label": "LCMD" },
132 { "x": 2.5, "y": 4, "w": 1.25, "label": "LALT" }, 142 { "x": 2.5, "y": 4, "w": 1.25, "label": "LALT" },
@@ -138,7 +148,7 @@
138 ] 148 ]
139 }, 149 },
140 150
141 "LAYOUT_iso": { 151 "LAYOUT_60_iso": {
142 "layout": [ 152 "layout": [
143 { "x": 0, "y": 0, "w": 1, "label": "ESC" }, 153 { "x": 0, "y": 0, "w": 1, "label": "ESC" },
144 { "x": 1, "y": 0, "w": 1, "label": "1" }, 154 { "x": 1, "y": 0, "w": 1, "label": "1" },
@@ -154,6 +164,7 @@
154 { "x": 11, "y": 0, "w": 1, "label": "DASH" }, 164 { "x": 11, "y": 0, "w": 1, "label": "DASH" },
155 { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" }, 165 { "x": 12, "y": 0, "w": 1, "label": "EQUALSIGN" },
156 { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" }, 166 { "x": 13, "y": 0, "w": 2, "label": "BACKSPACE" },
167
157 { "x": 0, "y": 1, "w": 1.5, "label": "TAB" }, 168 { "x": 0, "y": 1, "w": 1.5, "label": "TAB" },
158 { "x": 1.5, "y": 1, "w": 1, "label": "Q" }, 169 { "x": 1.5, "y": 1, "w": 1, "label": "Q" },
159 { "x": 2.5, "y": 1, "w": 1, "label": "W" }, 170 { "x": 2.5, "y": 1, "w": 1, "label": "W" },
@@ -167,7 +178,7 @@
167 { "x": 10.5, "y": 1, "w": 1, "label": "P" }, 178 { "x": 10.5, "y": 1, "w": 1, "label": "P" },
168 { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" }, 179 { "x": 11.5, "y": 1, "w": 1, "label": "LBRACKET" },
169 { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" }, 180 { "x": 12.5, "y": 1, "w": 1, "label": "RBRACKET" },
170 { "x": 13.75, "y": 1, "w": 1.25, "h": 2, "label": "ENTER" }, 181
171 { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" }, 182 { "x": 0, "y": 2, "w": 1.75, "label": "CAPSLOCK" },
172 { "x": 1.75, "y": 2, "w": 1, "label": "A" }, 183 { "x": 1.75, "y": 2, "w": 1, "label": "A" },
173 { "x": 2.75, "y": 2, "w": 1, "label": "S" }, 184 { "x": 2.75, "y": 2, "w": 1, "label": "S" },
@@ -181,6 +192,8 @@
181 { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" }, 192 { "x": 10.75, "y": 2, "w": 1, "label": "SEMICOLON" },
182 { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" }, 193 { "x": 11.75, "y": 2, "w": 1, "label": "QUOTE" },
183 { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" }, 194 { "x": 12.75, "y": 2, "w": 1, "label": "ISOHASH" },
195 { "x": 13.75, "y": 1, "w": 1.25, "h": 2, "label": "ENTER" },
196
184 { "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" }, 197 { "x": 0, "y": 3, "w": 1.25, "label": "LSHIFT" },
185 { "x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH" }, 198 { "x": 1.25, "y": 3, "w": 1, "label": "ISOBACKSLASH" },
186 { "x": 2.25, "y": 3, "w": 1, "label": "Z" }, 199 { "x": 2.25, "y": 3, "w": 1, "label": "Z" },
@@ -194,6 +207,7 @@
194 { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" }, 207 { "x": 10.25, "y": 3, "w": 1, "label": "PERIOD" },
195 { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" }, 208 { "x": 11.25, "y": 3, "w": 1, "label": "SLASH" },
196 { "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" }, 209 { "x": 12.25, "y": 3, "w": 2.75, "label": "RSHIFT" },
210
197 { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" }, 211 { "x": 0, "y": 4, "w": 1.25, "label": "LCTRL" },
198 { "x": 1.25, "y": 4, "w": 1.25, "label": "LCMD" }, 212 { "x": 1.25, "y": 4, "w": 1.25, "label": "LCMD" },
199 { "x": 2.5, "y": 4, "w": 1.25, "label": "LALT" }, 213 { "x": 2.5, "y": 4, "w": 1.25, "label": "LALT" },
diff --git a/keyboards/ducky/one2mini/keymaps/ansi/keymap.c b/keyboards/ducky/one2mini/keymaps/ansi/keymap.c
index c6d597f72..3f03525e1 100644
--- a/keyboards/ducky/one2mini/keymaps/ansi/keymap.c
+++ b/keyboards/ducky/one2mini/keymaps/ansi/keymap.c
@@ -27,30 +27,30 @@ enum Layer {
27 27
28const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 28const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
29 29
30 [_QWERTY] = LAYOUT_ansi( 30 [_QWERTY] = LAYOUT_60_ansi(
31 // 2 3 4 5 6 7 8 9 10 11 12 13 14 31 // 2 3 4 5 6 7 8 9 10 11 12 13 14
32 KC_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, 32 KC_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,
33 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_NUBS, 33 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_NUBS,
34 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, 34 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,
35 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, 35 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
36 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN), KC_RCTL 36 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN), KC_RCTL
37 ), 37 ),
38 38
39 [_FUNCTION] = LAYOUT_ansi( 39 [_FUNCTION] = LAYOUT_60_ansi(
40 // 2 3 4 5 6 7 8 9 10 11 12 13 14 40 // 2 3 4 5 6 7 8 9 10 11 12 13 14
41 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, 41 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,
42 _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______, 42 _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______,
43 _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SLCK, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, KC_ENT, 43 _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SLCK, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, KC_ENT,
44 _______, _______, KC_APP, _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, 44 _______, _______, KC_APP, _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
45 _______, KC_APP, MO(_CLR), _______, _______, KC_APP, _______, _______ 45 _______, KC_APP, MO(_CLR), _______, _______, KC_APP, _______, _______
46 ), 46 ),
47 47
48 [_COLOUR] = LAYOUT_ansi( 48 [_COLOUR] = LAYOUT_60_ansi(
49 // 2 3 4 5 6 7 8 9 10 11 12 13 14 49 // 2 3 4 5 6 7 8 9 10 11 12 13 14
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
51 _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, 51 _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,
52 _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, 52 _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______,
53 _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, 53 _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,
54 _______, _______, _______, RGB_TOG, _______, _______, _______, _______ 54 _______, _______, _______, RGB_TOG, _______, _______, _______, _______
55 ), 55 ),
56}; 56};
diff --git a/keyboards/ducky/one2mini/keymaps/default/keymap.c b/keyboards/ducky/one2mini/keymaps/default/keymap.c
index 573353a76..d8bc5bbe2 100644
--- a/keyboards/ducky/one2mini/keymaps/default/keymap.c
+++ b/keyboards/ducky/one2mini/keymaps/default/keymap.c
@@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
32 KC_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, 32 KC_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,
33 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, 33 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,
34 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, 34 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,
35 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, 35 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,
36 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN), KC_RCTL 36 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN), KC_RCTL
37 ), 37 ),
38 38
39 [_FUNCTION] = LAYOUT_all( 39 [_FUNCTION] = LAYOUT_all(
@@ -41,8 +41,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
41 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, 41 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,
42 _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______, 42 _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______,
43 _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SLCK, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, KC_ENT, 43 _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SLCK, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, KC_ENT,
44 _______, _______, _______, KC_APP, _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, 44 _______, _______, _______, KC_APP, _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
45 _______, _______, MO(_CLR), KC_MPLY, _______, KC_APP, _______, _______ 45 _______, _______, MO(_CLR), KC_MPLY, _______, KC_APP, _______, _______
46 ), 46 ),
47 47
48 [_COLOUR] = LAYOUT_all( 48 [_COLOUR] = LAYOUT_all(
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
51 _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, 51 _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,
52 _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, 52 _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
53 _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, 53 _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,
54 _______, _______, _______, RGB_TOG, _______, _______, _______, _______ 54 _______, _______, _______, RGB_TOG, _______, _______, _______, _______
55 ), 55 ),
56}; 56};
diff --git a/keyboards/ducky/one2mini/keymaps/iso/keymap.c b/keyboards/ducky/one2mini/keymaps/iso/keymap.c
index 758f45931..1929b86c1 100644
--- a/keyboards/ducky/one2mini/keymaps/iso/keymap.c
+++ b/keyboards/ducky/one2mini/keymaps/iso/keymap.c
@@ -27,30 +27,30 @@ enum Layer {
27 27
28const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 28const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
29 29
30 [_QWERTY] = LAYOUT_iso( 30 [_QWERTY] = LAYOUT_60_iso(
31 // 2 3 4 5 6 7 8 9 10 11 12 13 14 31 // 2 3 4 5 6 7 8 9 10 11 12 13 14
32 KC_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, 32 KC_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,
33 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, 33 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,
34 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, 34 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,
35 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, 35 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,
36 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN), KC_RCTL 36 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN), KC_RCTL
37 ), 37 ),
38 38
39 [_FUNCTION] = LAYOUT_iso( 39 [_FUNCTION] = LAYOUT_60_iso(
40 // 2 3 4 5 6 7 8 9 10 11 12 13 14 40 // 2 3 4 5 6 7 8 9 10 11 12 13 14
41 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, 41 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,
42 _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, 42 _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR,
43 _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SLCK, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, KC_ENT, 43 _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SLCK, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, KC_ENT,
44 _______, _______, _______, KC_APP, _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, 44 _______, _______, _______, KC_APP, _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
45 _______, KC_APP, MO(_CLR), _______, _______, KC_APP, _______, _______ 45 _______, KC_APP, MO(_CLR), _______, _______, KC_APP, _______, _______
46 ), 46 ),
47 47
48 [_COLOUR] = LAYOUT_iso( 48 [_COLOUR] = LAYOUT_60_iso(
49 // 2 3 4 5 6 7 8 9 10 11 12 13 14 49 // 2 3 4 5 6 7 8 9 10 11 12 13 14
50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
51 _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, 51 _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,
52 _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, 52 _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
53 _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, 53 _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,
54 _______, _______, _______, RGB_TOG, _______, _______, _______, _______ 54 _______, _______, _______, RGB_TOG, _______, _______, _______, _______
55 ), 55 ),
56}; 56};
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-26 21:42:45 +0000