From e4071905562d3a5635f68af19bb00a78e1cb554f Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Wed, 12 Apr 2023 09:46:58 +0100 Subject: [PATCH 1/2] Refactor(boards): cleanup pins and keys Remove unmapped keys from matrix, remap transform in line with this, unmap associated IO, bring keymap in line with manual --- config/adv360.keymap | 40 +++++++++++------------ config/boards/arm/adv360/adv360.dtsi | 12 +++---- config/boards/arm/adv360/adv360_left.dts | 1 - config/boards/arm/adv360/adv360_right.dts | 5 ++- config/info.json | 8 ----- config/keymap.json | 40 +++++++++++------------ 6 files changed, 48 insertions(+), 58 deletions(-) diff --git a/config/adv360.keymap b/config/adv360.keymap index 15a720ef3e..8ece1db83b 100644 --- a/config/adv360.keymap +++ b/config/adv360.keymap @@ -24,38 +24,38 @@ default_layer { bindings = < - &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 - &kp TAB &kp Q &kp W &kp E &kp R &kp T &none &none &kp Y &kp U &kp I &kp O &kp P &kp BSLH - &kp ESC &kp A &kp S &kp D &kp F &kp G &none &kp LCTRL &kp LALT &none &none &kp LGUI &kp RCTRL &none &kp H &kp J &kp K &kp L &kp SEMI &kp SQT - &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &none &none &kp HOME &none &none &kp PG_UP &none &none &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT - &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 + &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 + &kp TAB &kp Q &kp W &kp E &kp R &kp T &none &none &kp Y &kp U &kp I &kp O &kp P &kp BSLH + &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 + &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 + &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 >; }; keypad { bindings = < - &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 - &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 - &kp ESC &kp A &kp S &kp D &kp F &kp G &none &kp LCTRL &kp LALT &none &none &kp LGUI &kp RCTRL &none &kp H &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp SQT - &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &none &none &kp HOME &none &none &kp PG_UP &none &none &kp N &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_ENTER &kp RSHFT - &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 + &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 + &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 + &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 + &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 + &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 >; }; fn { bindings = < - &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 - &trans &trans &trans &trans &trans &trans &none &none &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &none &trans &trans &none &none &trans &trans &none &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &none &none &trans &none &none &trans &none &none &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &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 + &trans &trans &trans &trans &trans &trans &none &none &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &none &trans &trans &trans &trans &none &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans >; }; mod { bindings = < - &none &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &none &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &none - &none &none &none &none &none &none &bootloader &bootloader &none &none &none &none &none &none - &none &none &none &none &none &none &rgb_ug RGB_MEFS_CMD 5 &bt BT_CLR &bt BT_CLR &none &none &bt BT_CLR &bt BT_CLR &rgb_ug RGB_MEFS_CMD 5 &none &none &none &none &none &none - &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none - &none &none &none &bl BL_INC &bl BL_DEC &rgb_ug RGB_TOG &bl BL_TOG &none &none &bl BL_TOG &rgb_ug RGB_TOG &bl BL_INC &bl BL_DEC &none &none &none + &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 + &none &none &none &none &none &none &bootloader &bootloader &none &none &none &none &none &none + &none &none &none &none &none &none &none &none &none &bt BT_CLR &none &rgb_ug RGB_MEFS_CMD 5 &none &none &none &none &none &none + &none &none &none &none &none &none &none &none &none &none &none &none &none &none + &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 >; }; }; diff --git a/config/boards/arm/adv360/adv360.dtsi b/config/boards/arm/adv360/adv360.dtsi index 5a34559174..286e834695 100644 --- a/config/boards/arm/adv360/adv360.dtsi +++ b/config/boards/arm/adv360/adv360.dtsi @@ -29,16 +29,16 @@ default_transform: keymap_transform_0 { compatible = "zmk,matrix-transform"; - columns = <22>; + columns = <20>; rows = <5>; map = < - RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,15) RC(4,16) RC(4,17) RC(4,18) RC(4,19) RC(4,20) RC(4,21) - RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,15) RC(3,16) RC(3,17) RC(3,18) RC(3,19) RC(3,20) RC(3,21) - RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,15) RC(2,16) RC(2,17) RC(2,18) RC(2,19) RC(2,20) RC(2,21) - RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,7) RC(1,8) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,16) RC(1,17) RC(1,18) RC(1,19) RC(1,20) RC(1,21) - RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,7) RC(0,8) RC(0,9) RC(0,12) RC(0,13) RC(0,14) RC(0,17) RC(0,18) RC(0,19) RC(0,20) RC(0,21) + RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5) RC(4,6) RC(4,13) RC(4,14) RC(4,15) RC(4,16) RC(4,17) RC(4,18) RC(4,19) + RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,13) RC(3,14) RC(3,15) RC(3,16) RC(3,17) RC(3,18) RC(3,19) + RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,13) RC(2,14) RC(2,15) RC(2,16) RC(2,17) RC(2,18) RC(2,19) + RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,9) RC(1,10) RC(1,14) RC(1,15) RC(1,16) RC(1,17) RC(1,18) RC(1,19) + RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,7) RC(0,8) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,15) RC(0,16) RC(0,17) RC(0,18) RC(0,19) >; }; diff --git a/config/boards/arm/adv360/adv360_left.dts b/config/boards/arm/adv360/adv360_left.dts index 8055fd109b..9509093ce8 100644 --- a/config/boards/arm/adv360/adv360_left.dts +++ b/config/boards/arm/adv360/adv360_left.dts @@ -32,7 +32,6 @@ , <&gpio1 9 GPIO_ACTIVE_HIGH> , <&gpio0 12 GPIO_ACTIVE_HIGH> , <&gpio0 7 GPIO_ACTIVE_HIGH> - , <&gpio0 5 GPIO_ACTIVE_HIGH> ; }; diff --git a/config/boards/arm/adv360/adv360_right.dts b/config/boards/arm/adv360/adv360_right.dts index afd38f355f..36f4966c11 100644 --- a/config/boards/arm/adv360/adv360_right.dts +++ b/config/boards/arm/adv360/adv360_right.dts @@ -25,8 +25,7 @@ ; col-gpios - = <&gpio1 14 GPIO_ACTIVE_HIGH> - , <&gpio0 12 GPIO_ACTIVE_HIGH> + = <&gpio0 12 GPIO_ACTIVE_HIGH> , <&gpio1 9 GPIO_ACTIVE_HIGH> , <&gpio0 7 GPIO_ACTIVE_HIGH> , <&gpio1 11 GPIO_ACTIVE_HIGH> @@ -50,5 +49,5 @@ }; &default_transform { - col-offset = <11>; + col-offset = <10>; }; diff --git a/config/info.json b/config/info.json index e1adb3d5de..c25173a926 100644 --- a/config/info.json +++ b/config/info.json @@ -42,8 +42,6 @@ { "label": "mod5", "row": 2, "col": 6, "x": 6.25, "y": 2}, { "label": "LCtrl", "row": 2, "col": 7, "x": 6.75, "y": 4, "r":15, "rx":5.25 ,"ry":4}, { "label": "LAlt", "row": 2, "col": 8, "x": 7.75, "y": 4, "r":15, "rx":5.25 ,"ry":4}, - { "label": "Ped1", "row": 2, "col": 9, "x": 6.75, "y": 5, "r":15, "rx":5.25 ,"ry":4, "h":0}, - { "label": "Ped2", "row": 2, "col": 10, "x": 10.25, "y": 5, "r":-15, "rx":12.75 ,"ry":4, "h":0}, { "label": "LGui", "row": 2, "col": 11, "x": 9.25, "y": 4, "r":-15, "rx":12.75 ,"ry":4}, { "label": "RCtrl", "row": 2, "col": 12, "x": 10.25, "y": 4, "r":-15, "rx":12.75 ,"ry":4}, { "label": "mod6", "row": 2, "col": 13, "x": 10.75, "y": 2}, @@ -60,14 +58,8 @@ { "label": "C", "row": 3, "col": 3, "x": 3.25, "y": 3 }, { "label": "V", "row": 3, "col": 4, "x": 4.25, "y": 3 }, { "label": "B", "row": 3, "col": 5, "x": 5.25, "y": 3 }, - { "label": "1U1", "row": 3, "col": 6, "x": 5.75, "y": 5, "r":15, "rx":5.25 ,"ry":4, "h":0}, - { "label": "1U2", "row": 3, "col": 7, "x": 6.75, "y": 5, "r":15, "rx":5.25 ,"ry":4, "h":0}, { "label": "Home", "row": 3, "col": 8, "x": 7.75, "y": 5, "r":15, "rx":5.25 ,"ry":4}, - { "label": "Ped3", "row": 3, "col": 9, "x": 6.75, "y": 5, "r":15, "rx":5.25 ,"ry":4, "h":0}, - { "label": "Ped4", "row": 3, "col": 10, "x": 10.25, "y": 5, "r":-15, "rx":12.75 ,"ry":4, "h":0}, { "label": "PgUp", "row": 3, "col": 11, "x": 9.25, "y": 5, "r":-15, "rx":12.75 ,"ry":4}, - { "label": "1U3", "row": 3, "col": 12, "x": 10.25, "y": 5, "r":-15, "rx":12.75 ,"ry":4, "h":0}, - { "label": "1U4", "row": 3, "col": 13, "x": 11.25, "y": 5, "r":-15, "rx":12.75 ,"ry":4, "h":0}, { "label": "N", "row": 3, "col": 14, "x": 11.75, "y": 3 }, { "label": "M", "row": 3, "col": 15, "x": 12.75, "y": 3 }, { "label": ",", "row": 3, "col": 16, "x": 13.75, "y": 3 }, diff --git a/config/keymap.json b/config/keymap.json index 998775ed26..c740e08884 100644 --- a/config/keymap.json +++ b/config/keymap.json @@ -10,29 +10,29 @@ ], "layers": [ [ - "&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", - "&kp TAB ", "&kp Q ", "&kp W ", "&kp E ", "&kp R ", "&kp T ", "&none ", "&none ", "&kp Y ", "&kp U ", "&kp I ", "&kp O ", "&kp P ", "&kp BSLH", - "&kp ESC ", "&kp A ", "&kp S ", "&kp D ", "&kp F ", "&kp G ", "&none ", "&kp LCTRL ", "&kp LALT ", "&none ", "&none ", "&kp LGUI ", "&kp RCTRL ", "&none ", "&kp H ", "&kp J ", "&kp K ", "&kp L ", "&kp SEMI ", "&kp SQT", - "&kp LSHFT ", "&kp Z ", "&kp X ", "&kp C ", "&kp V ", "&kp B ", "&none ", "&none ", "&kp HOME ", "&none ", "&none ", "&kp PG_UP ", "&none ", "&none ", "&kp N ", "&kp M ", "&kp COMMA ", "&kp DOT ", "&kp FSLH ", "&kp RSHFT", - "&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" + "&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", + "&kp TAB ", "&kp Q ", "&kp W ", "&kp E ", "&kp R ", "&kp T ", "&none ", "&none ", "&kp Y ", "&kp U ", "&kp I ", "&kp O ", "&kp P ", "&kp BSLH", + "&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", + "&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", + "&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" ], [ - "&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", - "&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", - "&kp ESC ", "&kp A ", "&kp S ", "&kp D ", "&kp F ", "&kp G ", "&none ", "&kp LCTRL ", "&kp LALT ", "&none ", "&none ", "&kp LGUI ", "&kp RCTRL ", "&none ", "&kp H ", "&kp KP_N4 ", "&kp KP_N5 ", "&kp KP_N6 ", "&kp KP_PLUS ", "&kp SQT", - "&kp LSHFT ", "&kp Z ", "&kp X ", "&kp C ", "&kp V ", "&kp B ", "&none ", "&none ", "&kp HOME ", "&none ", "&none ", "&kp PG_UP ", "&none ", "&none ", "&kp N ", "&kp KP_N1 ", "&kp KP_N2 ", "&kp KP_N3 ", "&kp KP_ENTER ", "&kp RSHFT", - "&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" + "&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", + "&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", + "&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", + "&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", + "&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" ], [ - "&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", - "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&none ", "&none ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", - "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&none ", "&trans ", "&trans ", "&none ", "&none ", "&trans ", "&trans ", "&none ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", - "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&none ", "&none ", "&trans ", "&none ", "&none ", "&trans ", "&none ", "&none ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", - "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans" + "&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", + "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&none ", "&none ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", + "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&none ", "&trans ", "&trans ", "&trans ", "&trans ", "&none ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", + "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", + "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans ", "&trans" ], [ - "&none ", "&bt BT_SEL 0 ", "&bt BT_SEL 1 ", "&bt BT_SEL 2 ", "&bt BT_SEL 3 ", "&bt BT_SEL 4 ", "&none ", "&trans ", "&bt BT_SEL 0 ", "&bt BT_SEL 1 ", "&bt BT_SEL 2 ", "&bt BT_SEL 3 ", "&bt BT_SEL 4 ", "&none", - "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&bootloader ", "&bootloader ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none", - "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&rgb_ug RGB_MEFS_CMD 5 ", "&bt BT_CLR ", "&none ", "&none ", "&none ", "&bt BT_CLR ", "&bt BT_CLR ", "&rgb_ug RGB_MEFS_CMD 5 ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none", - "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none", - "&none ", "&none ", "&none ", "&bl BL_INC ", "&bl BL_DEC ", "&rgb_ug RGB_TOG ", "&bl BL_TOG ", "&none ", "&none ", "&bl BL_TOG ", "&rgb_ug RGB_TOG ", "&bl BL_INC ", "&bl BL_DEC ", "&none ", "&none ", "&none" + "&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", + "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&bootloader ", "&bootloader ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none", + "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&rgb_ug RGB_MEFS_CMD 5 ", "&none", "&bt BT_CLR ", "&bt BT_CLR ", "&bt BT_CLR ", "&rgb_ug RGB_MEFS_CMD 5 ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none", + "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none ", "&none", + "&none ", "&none ", "&none ", "&bl BL_INC ", "&bl BL_DEC ", "&none ", "&bl BL_TOG ", "&none ", "&none ", "&bl BL_TOG ", "&rgb_ug RGB_TOG ", "&bl BL_INC ", "&bl BL_DEC ", "&none ", "&none ", "&none" ] ] } From b77a44b21adf095adb5f574810e2e483ceb9fa62 Mon Sep 17 00:00:00 2001 From: ReFil <31960031+ReFil@users.noreply.github.com> Date: Thu, 1 Jun 2023 09:25:42 +0100 Subject: [PATCH 2/2] fix(bluetooth): Disable battery reporting This increases battery reporting interval to the extent it never happens, preventing spurious wakeups on macs. Will be totally disabled in V3.0 --- config/boards/arm/adv360/adv360_left_defconfig | 1 + config/boards/arm/adv360/adv360_right_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/config/boards/arm/adv360/adv360_left_defconfig b/config/boards/arm/adv360/adv360_left_defconfig index c8804278e0..af88b6c3e7 100644 --- a/config/boards/arm/adv360/adv360_left_defconfig +++ b/config/boards/arm/adv360/adv360_left_defconfig @@ -59,3 +59,4 @@ CONFIG_USB_DEVICE_MANUFACTURER="Kinesis Corporation" CONFIG_BT_DIS_MANUF="Kinesis Corporation" CONFIG_BUILD_OUTPUT_UF2=y +CONFIG_ZMK_BATTERY_REPORT_INTERVAL=9999999 diff --git a/config/boards/arm/adv360/adv360_right_defconfig b/config/boards/arm/adv360/adv360_right_defconfig index dd4a9a1ca0..275fc2c82d 100644 --- a/config/boards/arm/adv360/adv360_right_defconfig +++ b/config/boards/arm/adv360/adv360_right_defconfig @@ -57,3 +57,4 @@ CONFIG_USB_DEVICE_PID=0x0362 CONFIG_USB_DEVICE_MANUFACTURER="Kinesis Corporation" CONFIG_BUILD_OUTPUT_UF2=y +CONFIG_ZMK_BATTERY_REPORT_INTERVAL=9999999