aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-11-02 08:26:58 +0000
committerQMK Bot <hello@qmk.fm>2021-11-02 08:26:58 +0000
commitb87b402ea529f814f1de70ef90b6756efeb054cc (patch)
treec6b9dd350b5b34f0d4c0bae60bc2f7b3b2fcc64c
parent464d67c68fd5083efc7f47f1817867c742c955fd (diff)
parent87fc950707be430a74db67c0963a588d908b8447 (diff)
downloadqmk_firmware-b87b402ea529f814f1de70ef90b6756efeb054cc.tar.gz
qmk_firmware-b87b402ea529f814f1de70ef90b6756efeb054cc.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/redox_media/config.h4
-rw-r--r--keyboards/redox_media/info.json89
-rw-r--r--keyboards/redox_media/redox_media.h59
3 files changed, 132 insertions, 20 deletions
diff --git a/keyboards/redox_media/config.h b/keyboards/redox_media/config.h
index 70fb2aa16..0d4ac16b5 100644
--- a/keyboards/redox_media/config.h
+++ b/keyboards/redox_media/config.h
@@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
24#define PRODUCT_ID 0x0000 24#define PRODUCT_ID 0x0000
25#define DEVICE_VER 0x0100 25#define DEVICE_VER 0x0100
26#define MANUFACTURER shiftux 26#define MANUFACTURER shiftux
27#define PRODUCT The Redox Keyboard 27#define PRODUCT Redox Media
28 28
29/* key matrix size */ 29/* key matrix size */
30// Rows are doubled-up 30// Rows are doubled-up
@@ -57,4 +57,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
57 57
58#define ENCODERS_PAD_A { F4 } 58#define ENCODERS_PAD_A { F4 }
59#define ENCODERS_PAD_B { F5 } 59#define ENCODERS_PAD_B { F5 }
60#define ENCODER_RESOLUTION 4 \ No newline at end of file 60#define ENCODER_RESOLUTION 4
diff --git a/keyboards/redox_media/info.json b/keyboards/redox_media/info.json
new file mode 100644
index 000000000..e13487e79
--- /dev/null
+++ b/keyboards/redox_media/info.json
@@ -0,0 +1,89 @@
1{
2 "keyboard_name": "Redox Media",
3 "url": "",
4 "maintainer": "shiftux",
5 "layouts": {
6 "LAYOUT": {
7 "layout": [
8 {"label":"Mute", "x":5.25, "y":0.15},
9 {"label":"Play", "x":12.25, "y":0.15},
10 {"label":"Next", "x":13.5, "y":0},
11
12 {"label":"_Nav || `", "x":0, "y":1.375, "w":1.25},
13 {"label":"1", "x":1.25, "y":1.375},
14 {"label":"2", "x":2.25, "y":1.125},
15 {"label":"3", "x":3.25, "y":1},
16 {"label":"4", "x":4.25, "y":1.125},
17 {"label":"5", "x":5.25, "y":1.25},
18 {"label":"6", "x":12.25, "y":1.25},
19 {"label":"7", "x":13.25, "y":1.125},
20 {"label":"8", "x":14.25, "y":1},
21 {"label":"9", "x":15.25, "y":1.125},
22 {"label":"0", "x":16.25, "y":1.375},
23 {"label":"_Nav || -", "x":17.25, "y":1.375, "w":1.25},
24
25 {"label":"Tab", "x":0, "y":2.375, "w":1.25},
26 {"label":"Q", "x":1.25, "y":2.375},
27 {"label":"W", "x":2.25, "y":2.125},
28 {"label":"E", "x":3.25, "y":2},
29 {"label":"R", "x":4.25, "y":2.125},
30 {"label":"T", "x":5.25, "y":2.25},
31 {"label":"MO(_SYMB)", "x":6.25, "y":1.75},
32 {"label":"MO(_SYMB)", "x":11.25, "y":1.75},
33 {"label":"Y", "x":12.25, "y":2.25},
34 {"label":"U", "x":13.25, "y":2.125},
35 {"label":"I", "x":14.25, "y":2},
36 {"label":"O", "x":15.25, "y":2.125},
37 {"label":"P", "x":16.25, "y":2.375},
38 {"label":"=", "x":17.25, "y":2.375, "w":1.25},
39
40 {"label":"Esc", "x":0, "y":3.375, "w":1.25},
41 {"label":"A", "x":1.25, "y":3.375},
42 {"label":"S", "x":2.25, "y":3.125},
43 {"label":"D", "x":3.25, "y":3},
44 {"label":"F", "x":4.25, "y":3.125},
45 {"label":"G", "x":5.25, "y":3.25},
46 {"label":"[", "x":6.25, "y":3},
47 {"label":"]", "x":11.25, "y":3},
48 {"label":"H", "x":12.25, "y":3.25},
49 {"label":"J", "x":13.25, "y":3.125},
50 {"label":"K", "x":14.25, "y":3},
51 {"label":"L", "x":15.25, "y":3.125},
52 {"label":";", "x":16.25, "y":3.375},
53 {"label":"'", "x":17.25, "y":3.375, "w":1.25},
54
55 {"label":"Shift", "x":0, "y":4.375, "w":1.25},
56 {"label":"Z", "x":1.25, "y":4.375},
57 {"label":"X", "x":2.25, "y":4.125},
58 {"label":"C", "x":3.25, "y":4},
59 {"label":"V", "x":4.25, "y":4.125},
60 {"label":"B", "x":5.25, "y":4.25},
61 {"label":"_Adjust/Page Up", "x":6.75, "y":4.75},
62 {"label":"Page Down", "x":7.75, "y":4.75},
63 {"label":"Home", "x":9.75, "y":4.75},
64 {"label":"_Adjust/End", "x":10.75, "y":4.75},
65 {"label":"N", "x":12.25, "y":4.25},
66 {"label":"M", "x":13.25, "y":4.125},
67 {"label":",", "x":14.25, "y":4},
68 {"label":",", "x":15.25, "y":4.125},
69 {"label":"\\", "x":16.25, "y":4.375},
70 {"label":"Shift", "x":17.25, "y":4.375, "w":1.25},
71
72 {"label":"LGUI", "x":0.25, "y":5.375},
73 {"label":"P+", "x":1.25, "y":5.375},
74 {"label":"P-", "x":2.25, "y":5.125},
75 {"label":"LAlt || P*", "x":3.25, "y":5},
76 {"label":"LCtrl || P/", "x":5.5, "y":6.25, "w":1.25},
77 {"label":"Backspace", "x":6.75, "y":5.75, "h":1.5},
78 {"label":"Delete", "x":7.75, "y":5.75, "h":1.5},
79 {"label":"Enter", "x":9.75, "y":5.75, "h":1.5},
80 {"label":"Space", "x":10.75, "y":5.75, "h":1.5},
81 {"label":"RAlt", "x":11.75, "y":6.25, "w":1.25},
82 {"label":"Left", "x":14.25, "y":5},
83 {"label":"Down", "x":15.25, "y":5.125},
84 {"label":"Up", "x":16.25, "y":5.375},
85 {"label":"Right", "x":17.25, "y":5.375}
86 ]
87 }
88 }
89}
diff --git a/keyboards/redox_media/redox_media.h b/keyboards/redox_media/redox_media.h
index 6188aa9a1..8cd13c63f 100644
--- a/keyboards/redox_media/redox_media.h
+++ b/keyboards/redox_media/redox_media.h
@@ -19,28 +19,51 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19 19
20#include "quantum.h" 20#include "quantum.h"
21 21
22#define XXX KC_NO
23
24/*
25 * ┌───┐ ┌───┐┌───┐
26 * │56 │ │B6 ││B5 │
27 * └───┘ └───┘└───┘
28 * ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┐
29 * │00 │01 │02 │03 │04 │05 │ │65 │64 │63 │62 │61 │60 │
30 * ├───┼───┼───┼───┼───┼───┼───┐ ┌───┼───┼───┼───┼───┼───┼───┤
31 * │10 │11 │12 │13 │14 │15 │06 │ │66 │75 │74 │73 │72 │71 │70 │
32 * ├───┼───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┼───┤
33 * │20 │21 │22 │23 │24 │25 │16 │ │76 │85 │84 │83 │82 │81 │80 │
34 * ├───┼───┼───┼───┼───┼───┼───┘ └───┼───┼───┼───┼───┼───┼───┤
35 * │30 │31 │32 │33 │34 │35 │ ┌───┬───┐ ┌───┬───┐ │95 │94 │93 │92 │91 │90 │
36 * ├───┼───┼───┼───┼───┴───┘ │26 │36 │ │96 │86 │ └───┴───┼───┼───┼───┼───┤
37 * │40 │41 │42 │43 │ ├───┼───┤ ├───┼───┤ │A3 │A2 │A1 │A0 │
38 * └───┴───┴───┴───┘ ┌────┤ │ │ │ │ ├────┐ └───┴───┴───┴───┘
39 * │44 │45 │46 │ │A6 │A5 │A4 │
40 * └────┴───┴───┘ └───┴───┴────┘
41 *
42 *
43 */
44
22// rows are doubled 45// rows are doubled
23// clang-format off 46// clang-format off
24#define LAYOUT( \ 47#define LAYOUT( \
25 R5C6, R11C6, R11C5, \ 48 K56, KB6, KB5, \
26 R0C0, R0C1, R0C2, R0C3, R0C4, R0C5, R6C5, R6C4, R6C3, R6C2, R6C1, R6C0, \ 49 K00, K01, K02, K03, K04, K05, K65, K64, K63, K62, K61, K60, \
27 R1C0, R1C1, R1C2, R1C3, R1C4, R1C5, R0C6, R6C6, R7C5, R7C4, R7C3, R7C2, R7C1, R7C0, \ 50 K10, K11, K12, K13, K14, K15, K06, K66, K75, K74, K73, K72, K71, K70, \
28 R2C0, R2C1, R2C2, R2C3, R2C4, R2C5, R1C6, R7C6, R8C5, R8C4, R8C3, R8C2, R8C1, R8C0, \ 51 K20, K21, K22, K23, K24, K25, K16, K76, K85, K84, K83, K82, K81, K80, \
29 R3C0, R3C1, R3C2, R3C3, R3C4, R3C5, R2C6, R3C6, R9C6, R8C6, R9C5, R9C4, R9C3, R9C2, R9C1, R9C0, \ 52 K30, K31, K32, K33, K34, K35, K26, K36, K96, K86, K95, K94, K93, K92, K91, K90, \
30 R4C0, R4C1, R4C2, R4C3, R4C4, R4C5, R4C6, R10C6, R10C5, R10C4, R10C3, R10C2, R10C1, R10C0 \ 53 K40, K41, K42, K43, K44, K45, K46, KA6, KA5, KA4, KA3, KA2, KA1, KA0 \
31) \ 54) \
32{ \ 55{ \
33 { R0C0, R0C1, R0C2, R0C3, R0C4, R0C5, R0C6 }, \ 56 { K00, K01, K02, K03, K04, K05, K06 }, \
34 { R1C0, R1C1, R1C2, R1C3, R1C4, R1C5, R1C6 }, \ 57 { K10, K11, K12, K13, K14, K15, K16 }, \
35 { R2C0, R2C1, R2C2, R2C3, R2C4, R2C5, R2C6 }, \ 58 { K20, K21, K22, K23, K24, K25, K26 }, \
36 { R3C0, R3C1, R3C2, R3C3, R3C4, R3C5, R3C6 }, \ 59 { K30, K31, K32, K33, K34, K35, K36 }, \
37 { R4C0, R4C1, R4C2, R4C3, R4C4, R4C5, R4C6 }, \ 60 { K40, K41, K42, K43, K44, K45, K46 }, \
38 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R5C6 }, \ 61 { XXX, XXX, XXX, XXX, XXX, XXX, K56 }, \
39\ 62\
40 { R6C0, R6C1, R6C2, R6C3, R6C4, R6C5, R6C6 }, \ 63 { K60, K61, K62, K63, K64, K65, K66 }, \
41 { R7C0, R7C1, R7C2, R7C3, R7C4, R7C5, R7C6 }, \ 64 { K70, K71, K72, K73, K74, K75, K76 }, \
42 { R8C0, R8C1, R8C2, R8C3, R8C4, R8C5, R8C6 }, \ 65 { K80, K81, K82, K83, K84, K85, K86 }, \
43 { R9C0, R9C1, R9C2, R9C3, R9C4, R9C5, R9C6 }, \ 66 { K90, K91, K92, K93, K94, K95, K96 }, \
44 { R10C0, R10C1, R10C2, R10C3, R10C4, R10C5, R10C6 }, \ 67 { KA0, KA1, KA2, KA3, KA4, KA5, KA6 }, \
45 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R11C5, R11C6 } \ 68 { XXX, XXX, XXX, XXX, XXX, KB5, KB6 } \
46} 69}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 00:41:11 +0000