From a3fc2e2f3efde7ba6fcc6629cfc66f418943e068 Mon Sep 17 00:00:00 2001 From: ykryshtal Date: Wed, 2 Aug 2023 16:28:37 +0300 Subject: [PATCH 1/5] revert to git revert to 56... --- config/boards/shields/dac_man_5x6/dac_man_5x6.conf | 1 + config/dac_man_5x6.keymap | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/boards/shields/dac_man_5x6/dac_man_5x6.conf b/config/boards/shields/dac_man_5x6/dac_man_5x6.conf index dfa521c..2c5de97 100644 --- a/config/boards/shields/dac_man_5x6/dac_man_5x6.conf +++ b/config/boards/shields/dac_man_5x6/dac_man_5x6.conf @@ -1 +1,2 @@ CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_IDLE_TIMEOUT=300000 diff --git a/config/dac_man_5x6.keymap b/config/dac_man_5x6.keymap index ce0042e..1c21eeb 100644 --- a/config/dac_man_5x6.keymap +++ b/config/dac_man_5x6.keymap @@ -17,7 +17,7 @@ &kp CAPS &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp LG(LS(Q)) &kp LG(LS(R)) &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSLH &kp LA(LSHIFT) &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT -&kp ESC &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &trans +&kp ESC &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &DEL &kp LBKT &kp RBKT &kp LBRC &kp RBRC &mo RAISE &kp SPACE &kp ENTER &mo LOWER &kp TAB &kp LSHIFT &kp BSPC &kp PG_UP From 4cbb2a1f1cb4c9a4f356d1e781f3102f1d9eac3e Mon Sep 17 00:00:00 2001 From: ykryshtal Date: Sat, 5 Aug 2023 11:20:43 +0300 Subject: [PATCH 2/5] revert to git revert b5d0cb9 --- .../shields/dac_man_5x6/dac_man_5x6.conf | 1 - config/dac_man_5x6.conf | 3 -- config/dac_man_5x6.keymap | 37 +++++++++---------- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/config/boards/shields/dac_man_5x6/dac_man_5x6.conf b/config/boards/shields/dac_man_5x6/dac_man_5x6.conf index 2c5de97..dfa521c 100644 --- a/config/boards/shields/dac_man_5x6/dac_man_5x6.conf +++ b/config/boards/shields/dac_man_5x6/dac_man_5x6.conf @@ -1,2 +1 @@ CONFIG_ZMK_SLEEP=y -CONFIG_ZMK_IDLE_TIMEOUT=300000 diff --git a/config/dac_man_5x6.conf b/config/dac_man_5x6.conf index 108b0ec..974243c 100644 --- a/config/dac_man_5x6.conf +++ b/config/dac_man_5x6.conf @@ -4,6 +4,3 @@ # Uncomment the following line to enable the Corne OLED Display # CONFIG_ZMK_DISPLAY=y - -# Logging -#CONFIG_ZMK_USB_LOGGING=y diff --git a/config/dac_man_5x6.keymap b/config/dac_man_5x6.keymap index 1c21eeb..84275fc 100644 --- a/config/dac_man_5x6.keymap +++ b/config/dac_man_5x6.keymap @@ -2,7 +2,6 @@ #include #include - #define DEFAULT 0 #define RAISE 1 #define LOWER 2 @@ -14,28 +13,28 @@ default_layer { bindings = < -&kp CAPS &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp LG(LS(Q)) -&kp LG(LS(R)) &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSLH -&kp LA(LSHIFT) &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT -&kp ESC &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &DEL - &kp LBKT &kp RBKT &kp LBRC &kp RBRC +&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC +&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSLH +&kp LALT &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &mt LGUI SEMI &kp SQT +&kp LCTRL &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RALT + &kp LBKT &mt LGUI RBKT &kp MINUS &kp EQUAL &mo RAISE &kp SPACE &kp ENTER &mo LOWER - &kp TAB &kp LSHIFT &kp BSPC &kp PG_UP - &kp LALT &kp LGUI &kp LCTRL &kp PG_DN + &kp HOME &kp LSHIFT &kp BSPC &kp PG_UP + &kp END &kp INS &kp DEL &kp PG_DN >; }; raise { bindings = < -&bt BT_SEL 0 &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 -&bt BT_NXT &trans &trans &trans &trans &kp LBKT &trans &trans &kp PLUS &kp LEFT_PARENTHESIS &kp RIGHT_PARENTHESIS &trans -&bt BT_PRV &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp HOME &kp PIPE &kp EQUAL &kp MINUS &kp GRAVE &kp TILDE &trans -&bt BT_CLR &trans &trans &trans &trans &trans &trans &trans &kp UNDERSCORE &trans &trans &trans - &trans &kp PSCRN &trans &trans +&bt BT_SEL 0 &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 +&bt BT_NXT &trans &trans &trans &trans &kp LBKT &kp RBKT &kp 7 &kp 8 &kp 9 &trans &kp F12 +&bt BT_PRV &kp HOME &kp PG_UP &kp PG_DN &kp END &kp LPAR &kp RPAR &kp 4 &kp 5 &kp 6 &kp MINUS &kp PIPE +&bt BT_CLR &trans &trans &trans &trans &trans &trans &kp 1 &kp 2 &kp 3 &kp FSLH &kp UNDER + &trans &kp PSCRN &trans &trans &trans &reset &trans &trans &trans &trans &trans &trans - &bootloader &trans &trans &trans + &trans &trans &trans &trans >; }; @@ -43,13 +42,13 @@ bindings = < &kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 -&trans &trans &kp K_PREV &kp K_PP &kp K_NEXT &kp C_VOL_UP &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &trans -&trans &kp LEFT &kp UP &kp DOWN &kp RIGHT &kp C_VOL_DN &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &trans -&trans &trans &trans &trans &trans &kp C_MUTE &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans +&trans &trans &kp K_PREV &kp K_PP &kp K_NEXT &kp C_VOL_UP &kp K_CALC &kp KP_NUM &kp INS &kp SLCK &trans &kp F12 +&trans &kp LEFT &kp UP &kp DOWN &kp RIGHT &kp C_VOL_DN &trans &kp H &kp J &kp K &kp L &trans +&trans &trans &trans &trans &trans &bootloader &bootloader &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &reset &trans &trans &trans &trans &trans - &trans &trans &trans &bootloader + &trans &trans &trans &trans >; }; }; From 894c66e3bf7ff981a4b1672d13cc32579d8069ca Mon Sep 17 00:00:00 2001 From: ykryshtal Date: Sat, 5 Aug 2023 11:37:28 +0300 Subject: [PATCH 3/5] revert to git revert to last successful build --- .../shields/dac_man_5x6/dac_man_5x6.conf | 1 + config/dac_man_5x6.conf | 3 ++ config/dac_man_5x6.keymap | 37 ++++++++++--------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/config/boards/shields/dac_man_5x6/dac_man_5x6.conf b/config/boards/shields/dac_man_5x6/dac_man_5x6.conf index dfa521c..2c5de97 100644 --- a/config/boards/shields/dac_man_5x6/dac_man_5x6.conf +++ b/config/boards/shields/dac_man_5x6/dac_man_5x6.conf @@ -1 +1,2 @@ CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_IDLE_TIMEOUT=300000 diff --git a/config/dac_man_5x6.conf b/config/dac_man_5x6.conf index 974243c..108b0ec 100644 --- a/config/dac_man_5x6.conf +++ b/config/dac_man_5x6.conf @@ -4,3 +4,6 @@ # Uncomment the following line to enable the Corne OLED Display # CONFIG_ZMK_DISPLAY=y + +# Logging +#CONFIG_ZMK_USB_LOGGING=y diff --git a/config/dac_man_5x6.keymap b/config/dac_man_5x6.keymap index 84275fc..ce0042e 100644 --- a/config/dac_man_5x6.keymap +++ b/config/dac_man_5x6.keymap @@ -2,6 +2,7 @@ #include #include + #define DEFAULT 0 #define RAISE 1 #define LOWER 2 @@ -13,28 +14,28 @@ default_layer { bindings = < -&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC -&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSLH -&kp LALT &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &mt LGUI SEMI &kp SQT -&kp LCTRL &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RALT - &kp LBKT &mt LGUI RBKT &kp MINUS &kp EQUAL +&kp CAPS &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp LG(LS(Q)) +&kp LG(LS(R)) &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSLH +&kp LA(LSHIFT) &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT +&kp ESC &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &trans + &kp LBKT &kp RBKT &kp LBRC &kp RBRC &mo RAISE &kp SPACE &kp ENTER &mo LOWER - &kp HOME &kp LSHIFT &kp BSPC &kp PG_UP - &kp END &kp INS &kp DEL &kp PG_DN + &kp TAB &kp LSHIFT &kp BSPC &kp PG_UP + &kp LALT &kp LGUI &kp LCTRL &kp PG_DN >; }; raise { bindings = < -&bt BT_SEL 0 &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 -&bt BT_NXT &trans &trans &trans &trans &kp LBKT &kp RBKT &kp 7 &kp 8 &kp 9 &trans &kp F12 -&bt BT_PRV &kp HOME &kp PG_UP &kp PG_DN &kp END &kp LPAR &kp RPAR &kp 4 &kp 5 &kp 6 &kp MINUS &kp PIPE -&bt BT_CLR &trans &trans &trans &trans &trans &trans &kp 1 &kp 2 &kp 3 &kp FSLH &kp UNDER - &trans &kp PSCRN &trans &trans +&bt BT_SEL 0 &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 +&bt BT_NXT &trans &trans &trans &trans &kp LBKT &trans &trans &kp PLUS &kp LEFT_PARENTHESIS &kp RIGHT_PARENTHESIS &trans +&bt BT_PRV &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp HOME &kp PIPE &kp EQUAL &kp MINUS &kp GRAVE &kp TILDE &trans +&bt BT_CLR &trans &trans &trans &trans &trans &trans &trans &kp UNDERSCORE &trans &trans &trans + &trans &kp PSCRN &trans &trans &trans &reset &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans + &bootloader &trans &trans &trans >; }; @@ -42,13 +43,13 @@ bindings = < &kp GRAVE &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 -&trans &trans &kp K_PREV &kp K_PP &kp K_NEXT &kp C_VOL_UP &kp K_CALC &kp KP_NUM &kp INS &kp SLCK &trans &kp F12 -&trans &kp LEFT &kp UP &kp DOWN &kp RIGHT &kp C_VOL_DN &trans &kp H &kp J &kp K &kp L &trans -&trans &trans &trans &trans &trans &bootloader &bootloader &trans &trans &trans &trans &trans - &trans &trans &trans &trans +&trans &trans &kp K_PREV &kp K_PP &kp K_NEXT &kp C_VOL_UP &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &trans +&trans &kp LEFT &kp UP &kp DOWN &kp RIGHT &kp C_VOL_DN &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &trans +&trans &trans &trans &trans &trans &kp C_MUTE &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &reset &trans &trans &trans &trans &trans - &trans &trans &trans &trans + &trans &trans &trans &bootloader >; }; }; From b168f4e01695225db6c00e40aea92a06c49e60e5 Mon Sep 17 00:00:00 2001 From: ykryshtal Date: Sat, 5 Aug 2023 11:42:06 +0300 Subject: [PATCH 4/5] fix(reset-board): change reset to sys_reset --- config/dac_man_5x6.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/dac_man_5x6.keymap b/config/dac_man_5x6.keymap index ce0042e..3c5fd77 100644 --- a/config/dac_man_5x6.keymap +++ b/config/dac_man_5x6.keymap @@ -33,7 +33,7 @@ &bt BT_PRV &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp HOME &kp PIPE &kp EQUAL &kp MINUS &kp GRAVE &kp TILDE &trans &bt BT_CLR &trans &trans &trans &trans &trans &trans &trans &kp UNDERSCORE &trans &trans &trans &trans &kp PSCRN &trans &trans - &trans &reset &trans &trans + &trans &sys_reset &trans &trans &trans &trans &trans &trans &bootloader &trans &trans &trans >; @@ -47,7 +47,7 @@ &trans &kp LEFT &kp UP &kp DOWN &kp RIGHT &kp C_VOL_DN &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &trans &trans &trans &trans &trans &trans &kp C_MUTE &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &reset &trans + &trans &trans &sys_reset &trans &trans &trans &trans &trans &trans &trans &trans &bootloader >; From 6a6c46821df14a3585b499380c3ecdf2733e6c58 Mon Sep 17 00:00:00 2001 From: ykryshtal Date: Sat, 22 Jun 2024 12:43:13 +0300 Subject: [PATCH 5/5] check actions build