Skip to content

Commit bb26ecb

Browse files
ReFilSpencer Hall
ReFil
authored and
Spencer Hall
committed
Revert "Updated adv360.keymap"
This reverts commit d7df361.
1 parent a875d6e commit bb26ecb

File tree

2 files changed

+103
-148
lines changed

2 files changed

+103
-148
lines changed

‎config/adv360.keymap‎

Lines changed: 24 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,25 @@
1010
#include <dt-bindings/zmk/rgb.h>
1111
#include <dt-bindings/zmk/stp.h>
1212
#include <behaviors.dtsi>
13-
#include <dt-bindings/zmk/backlight.h>
14-
#include <dt-bindings/zmk/bt.h>
1513
#include <dt-bindings/zmk/keys.h>
14+
#include <dt-bindings/zmk/bt.h>
1615
#include <dt-bindings/zmk/rgb.h>
16+
#include <dt-bindings/zmk/stp.h>
17+
#include <dt-bindings/zmk/backlight.h>
18+
#include <dt-bindings/zmk/pointing.h>
1719

1820
/ {
1921
behaviors {
20-
#include "macros.dtsi"
22+
#include "macros.dtsi"
2123
#include "version.dtsi"
2224
#ifndef VERSION_MACRO
25+
macro_ver: macro_ver {
26+
compatible = "zmk,behavior-macro";
27+
label = "macro_version";
28+
#binding-cells = <0>;
29+
bindings = <&kp RET>;
30+
};
31+
#endif
2332

2433
macro_ver: macro_ver {
2534
compatible = "zmk,behavior-macro";
@@ -236,71 +245,19 @@
236245
status = "reserved";
237246
};
238247

239-
keymap {
240-
compatible = "zmk,keymap";
241-
242-
default_layer {
243-
display-name = "Base";
244-
bindings = <
245-
&kp EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &tog 1 &mo 3 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS
246-
&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp E &none &kp Y &kp U &kp I &kp O &kp P &kp BSLH
247-
&kp ESC &kp A &kp S &kp D &kp F &kp G &none &kp LCTRL &kp LALT &kp LGUI &kp RCTRL &none &kp H &kp J &kp K &kp L &kp SEMI &kp SQT
248-
&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp HOME &kp PG_UP &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT
249-
&mo 2 &kp GRAVE &kp CAPS &kp LEFT &kp RIGHT &kp BSPC &kp DEL &kp END &kp PG_DN &kp ENTER &kp SPACE &kp UP &kp DOWN &kp LBKT &kp RBKT &mo 2
250-
>;
251-
};
252-
253-
keypad {
254-
display-name = "Kp";
255-
bindings = <
256-
&kp EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &trans &mo 3 &kp N6 &kp KP_NUM &kp KP_EQUAL &kp KP_DIVIDE &kp KP_MULTIPLY &kp MINUS
257-
&kp TAB &kp Q &kp W &kp E &kp R &kp T &none &none &kp Y &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &kp BSLH
258-
&kp ESC &kp A &kp S &kp D &kp F &kp G &none &kp LCTRL &kp LALT &kp LGUI &kp RCTRL &none &kp H &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp SQT
259-
&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp HOME &kp PG_UP &kp N &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_ENTER &kp RSHFT
260-
&mo 2 &kp GRAVE &kp CAPS &kp LEFT &kp RIGHT &kp BSPC &kp DEL &kp END &kp PG_DN &kp ENTER &kp KP_N0 &kp UP &kp DOWN &kp KP_DOT &kp RBKT &mo 2
261-
>;
262-
};
263-
264-
fn {
265-
display-name = "Fn";
266-
bindings = <
267-
&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &tog 1 &mo 3 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12
268-
&trans &trans &trans &trans &trans &trans &none &none &trans &trans &trans &trans &trans &trans
269-
&trans &trans &trans &trans &trans &trans &none &trans &trans &trans &trans &none &trans &trans &trans &trans &trans &trans
270-
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
271-
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
272-
>;
273-
};
274-
275-
mod {
276-
display-name = "Mod";
277-
bindings = <
278-
&none &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &none &trans &none &none &none &none &none &none
279-
&none &none &none &none &none &none &bootloader &bootloader &none &none &none &none &none &none
280-
&studio_unlock &none &none &none &none &none &none &none &none &bt BT_CLR &none &stp STP_BAT &none &none &none &none &none &none
281-
&none &none &none &none &macro_ver &none &none &none &none &none &none &none &none &none
282-
&none &none &none &none &none &none &none &none &none &bl BL_TOG &rgb_ug RGB_TOG &bl BL_INC &bl BL_DEC &none &none &none
283-
>;
284-
};
285-
286-
extra1 {
287-
display-name = "Red";
288-
status = "reserved";
289-
};
290-
291-
extra2 {
292-
display-name = "Purple";
293-
status = "reserved";
294-
};
248+
extra2 {
249+
display-name = "Purple";
250+
status = "reserved";
251+
};
295252

296-
extra3 {
297-
display-name = "Cyan";
298-
status = "reserved";
299-
};
253+
extra3 {
254+
display-name = "Cyan";
255+
status = "reserved";
256+
};
300257

301-
extra4 {
302-
display-name = "Yellow";
303-
status = "reserved";
304-
};
258+
extra4 {
259+
display-name = "Yellow";
260+
status = "reserved";
305261
};
262+
};
306263
};

‎config/info.json‎

Lines changed: 79 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,89 @@
11
{
2-
"id": "adv360",
3-
"name": "adv360",
42
"layouts": {
53
"LAYOUT": {
64
"layout": [
7-
{ "label": "=", "row": 0, "col": 0, "x": 0, "y": 0.25, "w": 1.25 },
8-
{ "label": "1", "row": 0, "col": 1, "x": 1.25, "y": 0.25 },
9-
{ "label": "2", "row": 0, "col": 2, "x": 2.25, "y": 0 },
10-
{ "label": "3", "row": 0, "col": 3, "x": 3.25, "y": 0 },
11-
{ "label": "4", "row": 0, "col": 4, "x": 4.25, "y": 0 },
12-
{ "label": "5", "row": 0, "col": 5, "x": 5.25, "y": 0 },
13-
{ "label": "mod1", "row": 0, "col": 6, "x": 6.25, "y": 0 },
14-
{ "label": "mod2", "row": 0, "col": 13, "x": 10.75, "y": 0 },
15-
{ "label": "6", "row": 0, "col": 14, "x": 11.75, "y": 0 },
16-
{ "label": "7", "row": 0, "col": 15, "x": 12.75, "y": 0 },
17-
{ "label": "8", "row": 0, "col": 16, "x": 13.75, "y": 0 },
18-
{ "label": "9", "row": 0, "col": 17, "x": 14.75, "y": 0 },
19-
{ "label": "0", "row": 0, "col": 18, "x": 15.75, "y": 0.25 },
20-
{ "label": "-", "row": 0, "col": 19, "x": 16.75, "y": 0.25, "w": 1.25 },
5+
{ "label": "=", "row": 0, "col": 0, "x": 0, "y": 0.25, "w":1.25 },
6+
{ "label": "1", "row": 0, "col": 1, "x": 1.25, "y": 0.25 },
7+
{ "label": "2", "row": 0, "col": 2, "x": 2.25, "y": 0 },
8+
{ "label": "3", "row": 0, "col": 3, "x": 3.25, "y": 0 },
9+
{ "label": "4", "row": 0, "col": 4, "x": 4.25, "y": 0 },
10+
{ "label": "5", "row": 0, "col": 5, "x": 5.25, "y": 0 },
11+
{ "label": "mod1", "row": 0, "col": 6, "x": 6.25, "y": 0 },
12+
{ "label": "mod2", "row": 0, "col": 13, "x": 10.75, "y": 0 },
13+
{ "label": "6", "row": 0, "col": 14, "x": 11.75, "y": 0 },
14+
{ "label": "7", "row": 0, "col": 15, "x": 12.75, "y": 0 },
15+
{ "label": "8", "row": 0, "col": 16, "x": 13.75, "y": 0 },
16+
{ "label": "9", "row": 0, "col": 17, "x": 14.75, "y": 0 },
17+
{ "label": "0", "row": 0, "col": 18, "x": 15.75, "y": 0.25 },
18+
{ "label": "-", "row": 0, "col": 19, "x": 16.75, "y": 0.25, "w": 1.25 },
2119

22-
{ "label": "Tab", "row": 1, "col": 0, "x": 0, "y": 1.25, "w": 1.25 },
23-
{ "label": "Q", "row": 1, "col": 1, "x": 1.25, "y": 1.25 },
24-
{ "label": "W", "row": 1, "col": 2, "x": 2.25, "y": 1 },
25-
{ "label": "E", "row": 1, "col": 3, "x": 3.25, "y": 1 },
26-
{ "label": "R", "row": 1, "col": 4, "x": 4.25, "y": 1 },
27-
{ "label": "T", "row": 1, "col": 5, "x": 5.25, "y": 1 },
28-
{ "label": "mod3", "row": 1, "col": 6, "x": 6.25, "y": 1 },
29-
{ "label": "mod4", "row": 1, "col": 13, "x": 10.75, "y": 1 },
30-
{ "label": "Y", "row": 1, "col": 14, "x": 11.75, "y": 1 },
31-
{ "label": "U", "row": 1, "col": 15, "x": 12.75, "y": 1 },
32-
{ "label": "I", "row": 1, "col": 16, "x": 13.75, "y": 1 },
33-
{ "label": "O", "row": 1, "col": 17, "x": 14.75, "y": 1 },
34-
{ "label": "P", "row": 1, "col": 18, "x": 15.75, "y": 1.25 },
35-
{ "label": "\\", "row": 1, "col": 19, "x": 16.75, "y": 1.25, "w": 1.25 },
20+
{ "label": "Tab", "row": 1, "col": 0, "x": 0, "y": 1.25, "w": 1.25 },
21+
{ "label": "Q", "row": 1, "col": 1, "x": 1.25, "y": 1.25 },
22+
{ "label": "W", "row": 1, "col": 2, "x": 2.25, "y": 1 },
23+
{ "label": "E", "row": 1, "col": 3, "x": 3.25, "y": 1 },
24+
{ "label": "R", "row": 1, "col": 4, "x": 4.25, "y": 1 },
25+
{ "label": "T", "row": 1, "col": 5, "x": 5.25, "y": 1 },
26+
{ "label": "mod3", "row": 1, "col": 6, "x": 6.25, "y": 1 },
27+
{ "label": "mod4", "row": 1, "col": 13, "x": 10.75, "y": 1 },
28+
{ "label": "Y", "row": 1, "col": 14, "x": 11.75, "y": 1 },
29+
{ "label": "U", "row": 1, "col": 15, "x": 12.75, "y": 1 },
30+
{ "label": "I", "row": 1, "col": 16, "x": 13.75, "y": 1 },
31+
{ "label": "O", "row": 1, "col": 17, "x": 14.75, "y": 1 },
32+
{ "label": "P", "row": 1, "col": 18, "x": 15.75, "y": 1.25 },
33+
{ "label": "\\", "row": 1, "col": 19, "x": 16.75, "y": 1.25, "w": 1.25 },
3634

37-
{ "label": "Caps", "row": 2, "col": 0, "x": 0, "y": 2.25, "w": 1.25 },
38-
{ "label": "A", "row": 2, "col": 1, "x": 1.25, "y": 2.25 },
39-
{ "label": "S", "row": 2, "col": 2, "x": 2.25, "y": 2 },
40-
{ "label": "D", "row": 2, "col": 3, "x": 3.25, "y": 2 },
41-
{ "label": "F", "row": 2, "col": 4, "x": 4.25, "y": 2 },
42-
{ "label": "G", "row": 2, "col": 5, "x": 5.25, "y": 2 },
43-
{ "label": "mod5", "row": 2, "col": 6, "x": 6.25, "y": 2 },
44-
{ "label": "LCtrl", "row": 2, "col": 7, "x": 6.75, "y": 4, "r": 15, "rx": 5.25, "ry": 4 },
45-
{ "label": "LAlt", "row": 2, "col": 8, "x": 7.75, "y": 4, "r": 15, "rx": 5.25, "ry": 4 },
46-
{ "label": "LGui", "row": 2, "col": 11, "x": 9.25, "y": 4, "r": -15, "rx": 12.75, "ry": 4 },
47-
{ "label": "RCtrl", "row": 2, "col": 12, "x": 10.25, "y": 4, "r": -15, "rx": 12.75, "ry": 4 },
48-
{ "label": "mod6", "row": 2, "col": 13, "x": 10.75, "y": 2 },
49-
{ "label": "H", "row": 2, "col": 14, "x": 11.75, "y": 2 },
50-
{ "label": "J", "row": 2, "col": 15, "x": 12.75, "y": 2 },
51-
{ "label": "K", "row": 2, "col": 16, "x": 13.75, "y": 2 },
52-
{ "label": "L", "row": 2, "col": 17, "x": 14.75, "y": 2 },
53-
{ "label": ";", "row": 2, "col": 18, "x": 15.75, "y": 2.25 },
54-
{ "label": "'", "row": 2, "col": 19, "x": 16.75, "y": 2.25, "w": 1.25 },
5535

56-
{ "label": "LShift", "row": 3, "col": 0, "x": 0, "y": 3.25, "w": 1.25 },
57-
{ "label": "Z", "row": 3, "col": 1, "x": 1.25, "y": 3.25 },
58-
{ "label": "X", "row": 3, "col": 2, "x": 2.25, "y": 3 },
59-
{ "label": "C", "row": 3, "col": 3, "x": 3.25, "y": 3 },
60-
{ "label": "V", "row": 3, "col": 4, "x": 4.25, "y": 3 },
61-
{ "label": "B", "row": 3, "col": 5, "x": 5.25, "y": 3 },
62-
{ "label": "Home", "row": 3, "col": 8, "x": 7.75, "y": 5, "r": 15, "rx": 5.25, "ry": 4 },
63-
{ "label": "PgUp", "row": 3, "col": 11, "x": 9.25, "y": 5, "r": -15, "rx": 12.75, "ry": 4 },
64-
{ "label": "N", "row": 3, "col": 14, "x": 11.75, "y": 3 },
65-
{ "label": "M", "row": 3, "col": 15, "x": 12.75, "y": 3 },
66-
{ "label": ",", "row": 3, "col": 16, "x": 13.75, "y": 3 },
67-
{ "label": ".", "row": 3, "col": 17, "x": 14.75, "y": 3 },
68-
{ "label": "/", "row": 3, "col": 18, "x": 15.75, "y": 3.25 },
69-
{ "label": "RShift", "row": 3, "col": 19, "x": 16.75, "y": 3.25, "w": 1.25 },
36+
{ "label": "Caps", "row": 2, "col": 0, "x": 0, "y": 2.25, "w":1.25 },
37+
{ "label": "A", "row": 2, "col": 1, "x": 1.25, "y": 2.25 },
38+
{ "label": "S", "row": 2, "col": 2, "x": 2.25, "y": 2 },
39+
{ "label": "D", "row": 2, "col": 3, "x": 3.25, "y": 2 },
40+
{ "label": "F", "row": 2, "col": 4, "x": 4.25, "y": 2 },
41+
{ "label": "G", "row": 2, "col": 5, "x": 5.25, "y": 2 },
42+
{ "label": "mod5", "row": 2, "col": 6, "x": 6.25, "y": 2},
43+
{ "label": "LCtrl", "row": 2, "col": 7, "x": 6.75, "y": 4, "r":15, "rx":5.25 ,"ry":4},
44+
{ "label": "LAlt", "row": 2, "col": 8, "x": 7.75, "y": 4, "r":15, "rx":5.25 ,"ry":4},
45+
{ "label": "LGui", "row": 2, "col": 11, "x": 9.25, "y": 4, "r":-15, "rx":12.75 ,"ry":4},
46+
{ "label": "RCtrl", "row": 2, "col": 12, "x": 10.25, "y": 4, "r":-15, "rx":12.75 ,"ry":4},
47+
{ "label": "mod6", "row": 2, "col": 13, "x": 10.75, "y": 2},
48+
{ "label": "H", "row": 2, "col": 14, "x": 11.75, "y": 2 },
49+
{ "label": "J", "row": 2, "col": 15, "x": 12.75, "y": 2 },
50+
{ "label": "K", "row": 2, "col": 16, "x": 13.75, "y": 2 },
51+
{ "label": "L", "row": 2, "col": 17, "x": 14.75, "y": 2 },
52+
{ "label": ";", "row": 2, "col": 18, "x": 15.75, "y": 2.25 },
53+
{ "label": "'", "row": 2, "col": 19, "x": 16.75, "y": 2.25, "w":1.25 },
7054

71-
{ "label": "mod7", "row": 4, "col": 0, "x": 0, "y": 4.25, "w": 1.25 },
72-
{ "label": "`", "row": 4, "col": 1, "x": 1.25, "y": 4.25 },
73-
{ "label": "Caps", "row": 4, "col": 2, "x": 2.25, "y": 4 },
74-
{ "label": "Left", "row": 4, "col": 3, "x": 3.25, "y": 4 },
75-
{ "label": "Right", "row": 4, "col": 4, "x": 4.25, "y": 4 },
76-
{ "label": "Bksp", "row": 4, "col": 6, "x": 5.75, "y": 5, "r": 15, "rx": 5.25, "ry": 4, "h": 2 },
77-
{ "label": "Del", "row": 4, "col": 7, "x": 6.75, "y": 5, "r": 15, "rx": 5.25, "ry": 4, "h": 2 },
78-
{ "label": "End", "row": 4, "col": 8, "x": 7.75, "y": 6, "r": 15, "rx": 5.25, "ry": 4 },
79-
{ "label": "PgDn", "row": 4, "col": 11, "x": 9.25, "y": 6, "r": -15, "rx": 12.75, "ry": 4 },
80-
{ "label": "RET", "row": 4, "col": 12, "x": 10.25, "y": 5, "r": -15, "rx": 12.75, "ry": 4, "h": 2 },
81-
{ "label": "SPC", "row": 4, "col": 13, "x": 11.25, "y": 5, "r": -15, "rx": 12.75, "ry": 4, "h": 2 },
82-
{ "label": "Up", "row": 4, "col": 15, "x": 12.75, "y": 4 },
83-
{ "label": "Down", "row": 4, "col": 16, "x": 13.75, "y": 4 },
84-
{ "label": ",", "row": 4, "col": 17, "x": 14.75, "y": 4 },
85-
{ "label": ".", "row": 4, "col": 18, "x": 15.75, "y": 4.25 },
86-
{ "label": "mod8", "row": 4, "col": 19, "x": 16.75, "y": 4.25, "w": 1.25 }
55+
{ "label": "LShift", "row": 3, "col": 0, "x": 0, "y": 3.25, "w":1.25 },
56+
{ "label": "Z", "row": 3, "col": 1, "x": 1.25, "y": 3.25 },
57+
{ "label": "X", "row": 3, "col": 2, "x": 2.25, "y": 3 },
58+
{ "label": "C", "row": 3, "col": 3, "x": 3.25, "y": 3 },
59+
{ "label": "V", "row": 3, "col": 4, "x": 4.25, "y": 3 },
60+
{ "label": "B", "row": 3, "col": 5, "x": 5.25, "y": 3 },
61+
{ "label": "Home", "row": 3, "col": 8, "x": 7.75, "y": 5, "r":15, "rx":5.25 ,"ry":4},
62+
{ "label": "PgUp", "row": 3, "col": 11, "x": 9.25, "y": 5, "r":-15, "rx":12.75 ,"ry":4},
63+
{ "label": "N", "row": 3, "col": 14, "x": 11.75, "y": 3 },
64+
{ "label": "M", "row": 3, "col": 15, "x": 12.75, "y": 3 },
65+
{ "label": ",", "row": 3, "col": 16, "x": 13.75, "y": 3 },
66+
{ "label": ".", "row": 3, "col": 17, "x": 14.75, "y": 3 },
67+
{ "label": "/", "row": 3, "col": 18, "x": 15.75, "y": 3.25 },
68+
{ "label": "RShift", "row": 3, "col": 19, "x": 16.75, "y": 3.25, "w":1.25 },
69+
70+
{ "label": "mod7", "row": 4, "col": 0, "x": 0, "y": 4.25, "w":1.25},
71+
{ "label": "`", "row": 4, "col": 1, "x": 1.25, "y": 4.25 },
72+
{ "label": "Caps", "row": 4, "col": 2, "x": 2.25, "y": 4 },
73+
{ "label": "Left", "row": 4, "col": 3, "x": 3.25, "y": 4 },
74+
{ "label": "Right", "row": 4, "col": 4, "x": 4.25, "y": 4 },
75+
{ "label": "Bksp", "row": 4, "col": 6, "x": 5.75, "y": 5, "r":15, "rx":5.25 ,"ry":4, "h":2},
76+
{ "label": "Del", "row": 4, "col": 7, "x": 6.75, "y": 5, "r":15, "rx":5.25 ,"ry":4, "h":2},
77+
{ "label": "End", "row": 4, "col": 8, "x": 7.75, "y": 6, "r":15, "rx":5.25 ,"ry":4},
78+
{ "label": "PgDn", "row": 4, "col": 11, "x": 9.25, "y": 6, "r":-15, "rx":12.75 ,"ry":4},
79+
{ "label": "RET", "row": 4, "col": 12, "x": 10.25, "y": 5, "r":-15, "rx":12.75 ,"ry":4, "h":2},
80+
{ "label": "SPC", "row": 4, "col": 13, "x": 11.25, "y": 5, "r":-15, "rx":12.75 ,"ry":4, "h":2},
81+
{ "label": "Up", "row": 4, "col": 15, "x": 12.75, "y": 4 },
82+
{ "label": "Down", "row": 4, "col": 16, "x": 13.75, "y": 4 },
83+
{ "label": ",", "row": 4, "col": 17, "x": 14.75, "y": 4 },
84+
{ "label": ".", "row": 4, "col": 18, "x": 15.75, "y": 4.25 },
85+
{ "label": "mod8", "row": 4, "col": 19, "x": 16.75, "y": 4.25, "w":1.25 }
8786
]
8887
}
89-
},
90-
"sensors": []
91-
}
88+
}
89+
}

0 commit comments

Comments
 (0)