aboutsummaryrefslogtreecommitdiff
path: root/keyboards/duck
diff options
context:
space:
mode:
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>2019-05-28 15:47:59 -0700
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-05-28 15:47:59 -0700
commit03bc8e71e6cf6881e9f899125e8486375eb488ef (patch)
tree637c23f80c8f9fb71e4ebd6abcb734cfbd48a9e6 /keyboards/duck
parent6d6646de049a77dab189bcd6efd99f505fc3aa9e (diff)
downloadqmk_firmware-03bc8e71e6cf6881e9f899125e8486375eb488ef.tar.gz
qmk_firmware-03bc8e71e6cf6881e9f899125e8486375eb488ef.zip
Duck Octagon V1 Configurator cleanup (#5957)
* Expand info.json formatting to one line per key This is a white-space-only change. Make it easier for me to read the file. * Make sure every key object has a label Going to be using them shortly. * Insert key identifiers from v1.h into info.json labels Shows where each key is located in the switch matrix. * Move K5O to its correct location on the top row * Adjust white space in v1.h At this point, the macros for LAYOUT and LAYOUT_75_ansi are 100% identical, except for their names. * Redefine LAYOUT_75_ansi as an alias of LAYOUT No need for two code blocks with the same data. * Correct visual positioning in info.json - move Pause 1u to the right - move K5O to the top row, between Print Screen and Pause - move Enter key 1u to the left and 1u wider (1.25u to 2.25u) * Delete key identifiers from info.json labels Don't need them anymore now that we know where everything is. I'm calling K5O as ScrLk so it has a label, even though that's not actually what it is. Also gave the Spacebar a label because I prefer when all the keys have labels. * Enable 75_ansi Community Layout support * Reassign layout macro as LAYOUT_75_ansi and delete macro alias Configure the codebase so LAYOUT_75_ansi is the only layout macro available. * Add key_count key to info.json data
Diffstat (limited to 'keyboards/duck')
-rw-r--r--keyboards/duck/octagon/v1/info.json90
-rw-r--r--keyboards/duck/octagon/v1/rules.mk3
-rw-r--r--keyboards/duck/octagon/v1/v1.h16
3 files changed, 90 insertions, 19 deletions
diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json
index 1feff9519..ff4526700 100644
--- a/keyboards/duck/octagon/v1/info.json
+++ b/keyboards/duck/octagon/v1/info.json
@@ -5,8 +5,94 @@
5 "width": 16, 5 "width": 16,
6 "height": 6, 6 "height": 6,
7 "layouts": { 7 "layouts": {
8 "LAYOUT": { 8 "LAYOUT_75_ansi": {
9 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":3, "w":1.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}] 9 "key_count": 84,
10 "layout": [
11 {"label":"Esc", "x":0, "y":0},
12 {"label":"F1", "x":1, "y":0},
13 {"label":"F2", "x":2, "y":0},
14 {"label":"F3", "x":3, "y":0},
15 {"label":"F4", "x":4, "y":0},
16 {"label":"F5", "x":5, "y":0},
17 {"label":"F6", "x":6, "y":0},
18 {"label":"F7", "x":7, "y":0},
19 {"label":"F8", "x":8, "y":0},
20 {"label":"F9", "x":9, "y":0},
21 {"label":"F10", "x":10, "y":0},
22 {"label":"F11", "x":11, "y":0},
23 {"label":"F12", "x":12, "y":0},
24 {"label":"PrtSc", "x":13, "y":0},
25 {"label":"ScrLk", "x":14, "y":0},
26 {"label":"Pause", "x":15, "y":0},
27 {"label":"~", "x":0, "y":1},
28 {"label":"!", "x":1, "y":1},
29 {"label":"@", "x":2, "y":1},
30 {"label":"#", "x":3, "y":1},
31 {"label":"$", "x":4, "y":1},
32 {"label":"%", "x":5, "y":1},
33 {"label":"^", "x":6, "y":1},
34 {"label":"&", "x":7, "y":1},
35 {"label":"*", "x":8, "y":1},
36 {"label":"(", "x":9, "y":1},
37 {"label":")", "x":10, "y":1},
38 {"label":"_", "x":11, "y":1},
39 {"label":"+", "x":12, "y":1},
40 {"label":"Backspace", "x":13, "y":1, "w":2},
41 {"label":"Home", "x":15, "y":1},
42 {"label":"Tab", "x":0, "y":2, "w":1.5},
43 {"label":"Q", "x":1.5, "y":2},
44 {"label":"W", "x":2.5, "y":2},
45 {"label":"E", "x":3.5, "y":2},
46 {"label":"R", "x":4.5, "y":2},
47 {"label":"T", "x":5.5, "y":2},
48 {"label":"Y", "x":6.5, "y":2},
49 {"label":"U", "x":7.5, "y":2},
50 {"label":"I", "x":8.5, "y":2},
51 {"label":"O", "x":9.5, "y":2},
52 {"label":"P", "x":10.5, "y":2},
53 {"label":"{", "x":11.5, "y":2},
54 {"label":"}", "x":12.5, "y":2},
55 {"label":"|", "x":13.5, "y":2, "w":1.5},
56 {"label":"Page Up", "x":15, "y":2},
57 {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
58 {"label":"A", "x":1.75, "y":3},
59 {"label":"S", "x":2.75, "y":3},
60 {"label":"D", "x":3.75, "y":3},
61 {"label":"F", "x":4.75, "y":3},
62 {"label":"G", "x":5.75, "y":3},
63 {"label":"H", "x":6.75, "y":3},
64 {"label":"J", "x":7.75, "y":3},
65 {"label":"K", "x":8.75, "y":3},
66 {"label":"L", "x":9.75, "y":3},
67 {"label":":", "x":10.75, "y":3},
68 {"label":"\"", "x":11.75, "y":3},
69 {"label":"Enter", "x":12.75, "y":3, "w":2.25},
70 {"label":"Page Down", "x":15, "y":3},
71 {"label":"Shift", "x":0, "y":4, "w":2.25},
72 {"label":"Z", "x":2.25, "y":4},
73 {"label":"X", "x":3.25, "y":4},
74 {"label":"C", "x":4.25, "y":4},
75 {"label":"V", "x":5.25, "y":4},
76 {"label":"B", "x":6.25, "y":4},
77 {"label":"N", "x":7.25, "y":4},
78 {"label":"M", "x":8.25, "y":4},
79 {"label":"<", "x":9.25, "y":4},
80 {"label":">", "x":10.25, "y":4},
81 {"label":"?", "x":11.25, "y":4},
82 {"label":"Shift", "x":12.25, "y":4, "w":1.75},
83 {"label":"\u2191", "x":14, "y":4},
84 {"label":"End", "x":15, "y":4},
85 {"label":"Ctrl", "x":0, "y":5, "w":1.25},
86 {"label":"Win", "x":1.25, "y":5, "w":1.25},
87 {"label":"Alt", "x":2.5, "y":5, "w":1.25},
88 {"label":"Space", "x":3.75, "y":5, "w":6.25},
89 {"label":"Alt", "x":10, "y":5},
90 {"label":"Fn", "x":11, "y":5},
91 {"label":"Ctrl", "x":12, "y":5},
92 {"label":"\u2190", "x":13, "y":5},
93 {"label":"\u2193", "x":14, "y":5},
94 {"label":"\u2192", "x":15, "y":5}
95 ]
10 } 96 }
11 } 97 }
12} 98}
diff --git a/keyboards/duck/octagon/v1/rules.mk b/keyboards/duck/octagon/v1/rules.mk
index 66d2c8def..889b93ed4 100644
--- a/keyboards/duck/octagon/v1/rules.mk
+++ b/keyboards/duck/octagon/v1/rules.mk
@@ -69,4 +69,5 @@ RGBLIGHT_ENABLE = yes
69 69
70CUSTOM_MATRIX = yes 70CUSTOM_MATRIX = yes
71SRC += matrix.c \ 71SRC += matrix.c \
72 72
73LAYOUTS = 75_ansi
diff --git a/keyboards/duck/octagon/v1/v1.h b/keyboards/duck/octagon/v1/v1.h
index 471a91a33..9f3d1e369 100644
--- a/keyboards/duck/octagon/v1/v1.h
+++ b/keyboards/duck/octagon/v1/v1.h
@@ -17,22 +17,6 @@
17 17
18#include "quantum.h" 18#include "quantum.h"
19 19
20#define LAYOUT( \
21 K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5P, \
22 K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4P, \
23 K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3P, \
24 K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K5O, K2N, K2P, \
25 K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1P, \
26 K0A, K0B, K0C, K0G, K0J, K0K, K0L, K0M, K0N, K0P \
27) { \
28 { K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P }, \
29 { K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, KC_NO, K4P }, \
30 { K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, KC_NO, K3P }, \
31 { K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, KC_NO, K2N, KC_NO, K2P }, \
32 { K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, KC_NO, K1M, K1N, KC_NO, K1P }, \
33 { K0A, K0B, K0C, KC_NO, KC_NO, K0G, KC_NO, KC_NO, K0J, K0K, K0L, KC_NO, K0M, K0N, KC_NO, K0P } \
34}
35
36#define LAYOUT_75_ansi( \ 20#define LAYOUT_75_ansi( \
37 K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \ 21 K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \
38 K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4P, \ 22 K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4P, \
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-18 11:59:47 +0000