Fix build script, small keymap changes

3 files changed, 133 insertions, 30 deletions

diff --git a/bin/build.sh b/bin/build.sh
index 04a671c..330f0d3 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -157,14 +157,14 @@ CONFIG_DIR="$DOCKER_CONFIG_DIR/config"
 compile_board () {
     board=$(echo "$1" | jq -r '.board')
     shield=$(echo "$1" | jq -r '.shield // ""')
-    [[ -z $shield ]] && shield="" || shield="-DSHIELD=${shield}"
+    [[ -z $shield ]] && shield_opts="" || shield_opts="-DSHIELD=${shield}"
 
     BUILD_DIR="${board}_${shield}_$SUFFIX"
     LOGFILE="$LOG_DIR/zmk_build_$board_$shield.log"
     [[ $MULTITHREAD = "true" ]] || echo -en "\n$(tput setaf 2)Building $1... $(tput sgr0)"
     [[ $MULTITHREAD = "true" ]] && echo -e "$(tput setaf 2)Building $1... $(tput sgr0)"
     $DOCKER_PREFIX west build -d "build/$BUILD_DIR" -b $board $WEST_OPTS \
-        -- -DZMK_CONFIG="$CONFIG_DIR" $shield  -Wno-dev > "$LOGFILE" 2>&1
+        -- -DZMK_CONFIG="$CONFIG_DIR" $shield_opts  -Wno-dev > "$LOGFILE" 2>&1
     if [[ $? -eq 0 ]]
     then
         [[ $MULTITHREAD = "true" ]] || echo "$(tput setaf 2)done$(tput sgr0)"
diff --git a/config/corne.keymap b/config/corne.keymap
index 0db80b8..a6f73b3 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -8,57 +8,98 @@
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
 
+#include "../utils/keypos_42keys.h"
+
+#define K_E LT2
+#define K_O RT3
+#define K_A LM4
+
 #define DEFAULT 0
 #define LOWER   1
 #define RAISE   2
+#define SUPER   3
 
 #include "common.h"
 
+COMBO(lnx_oe_comb, K_O K_E, DEFAULT, &lnx_no_oe)
+COMBO(lnx_ae_comb, K_A K_E, DEFAULT, &lnx_no_ae)
+COMBO(lnx_ao_comb, K_A K_O, DEFAULT, &lnx_no_ao)
+
 / {
+        behaviors {
+            kp_mo: behavior_kp_mo {
+                compatible = "zmk,behavior-hold-tap";
+                label = "kp_mo";
+                #binding-cells = <2>;
+                flavor = "hold-preferred";
+                tapping-term-ms = <200>;
+                bindings = <&mo>, <&kp>;
+            };
+            td_alt: td_alt {
+                compatible = "zmk,behavior-tap-dance";
+                label = "td_alt";
+                #binding-cells = <0>;
+                tapping-term-ms = <200>;
+                bindings = <&kp LALT>, <&kp RALT>;
+            };
+        };
         keymap {
                 compatible = "zmk,keymap";
 
                 default_layer {
-// -----------------------------------------------------------------------------------------
-// |  TAB |  Q  |  W  |  E  |  R  |  T  |   |  Y  |  U   |  I  |  O  |  P  | BKSP |
-// | CTRL |  A  |  S  |  D  |  F  |  G  |   |  H  |  J   |  K  |  L  |  ;  |  '   |
-// | SHFT |  Z  |  X  |  C  |  V  |  B  |   |  N  |  M   |  ,  |  .  |  /  | GUI  |
-//                    | SHFT| LWR | ENT |   | SPC | RSE  | ALT |
+// ---------------------------------------------------------------------------------------
+// |     |  Q  |  W  |  E  |  R  |    T    |   |    Y    |  U   |  I  |  O  |  P  |      |
+// | ALT |  A  |  S  |  D  |  F  |    G    |   |    H    |  J   |  K  |  L  |  ;  |  '   |
+// | GUI |  Z  |  X  |  C  |  V  |    B    |   |    N    |  M   |  ,  |  .  |  /  |      |
+//                        | TAB |SHIFT| ENT/RSE |   | SPC/LWR | BKSP | CTRL/ESC |
                         label = "Base";
                         bindings = <
-   &kp TAB       &kp Q &kp W &kp E &kp R &kp T   &kp Y &kp U  &kp I     &kp O   &kp P    &kp BSPC
-   &mt LCTRL ESC &kp A &kp S &kp D &kp F &kp G   &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 N &kp M  &kp COMMA &kp DOT &kp FSLH &kp GUI
-                      &kp LSHIFT &mo RAISE &kp RET   &kp SPACE &mo LOWER &kp RALT
+   XXX      &kp Q &kp W &kp E &kp R &kp T   &kp Y &kp U  &kp I     &kp O   &kp P    XXX
+   &td_alt  &kp A &kp S &kp D &kp F &kp G   &kp H &kp J  &kp K     &kp L   &kp SEMI &kp SQT
+   &kp LGUI &kp Z &kp X &kp C &kp V &kp B   &kp N &kp M  &kp COMMA &kp DOT &kp FSLH XXX
+                      &kp TAB &kp_mo RAISE RET &kp LSHIFT &kp BSPC &kp_mo LOWER SPACE &mt LCTRL ESC
                         >;
                 };
                 lower_layer {
-// -----------------------------------------------------------------------------------------
-// |  TAB |  1  |  2  |  3  |  4  |  5  |   |  6  |  7  |  8  |  9  |  0  | BKSP |
-// | BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 |   | LFT | DWN |  UP | RGT |     |      |
-// | SHFT |     |     |     |     |     |   | HME | P_D | P_U | END |     |      |
-//                    | SHFT|     | ENT |   | SPC |     | ALT |
+// ----------------------------------------------------------------------------------------
+// |      |  1  |  2  |  3  |  4  |    5    |   |    6    |  7   |  8  |  9  |  0  |      |
+// |      |     |     |     |     |         |   |   LFT   | DWN  |  UP | RGT |     |      |
+// |      |     |     |     |     |         |   |   HME   | P_D  | P_U | END |     |      |
+//                    |     |     |         |   |         |      |     |
                         label = "Lower";
                         bindings = <
-   &kp TAB    &kp N1       &kp N2       &kp N3       &kp N4       &kp N5         &kp N6   &kp N7    &kp N8    &kp N9     &kp N0 &kp BSPC
-   &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4   &kp LEFT &kp DOWN  &kp UP    &kp RIGHT  ___    ___   
-   &kp LSHFT  ___          ___          ___          ___          ___            &kp HOME &kp PG_DN &kp PG_UP &kp END    ___    ___   
-                          	        &kp LSHFT     ___          &kp RET      &kp SPACE  ___      &kp RALT
+   ___      &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6   &kp N7    &kp N8    &kp N9    &kp N0 &kp BSPC
+   ___      ___    ___    ___    ___    ___    &kp LEFT &kp DOWN  &kp UP    &kp RIGHT ___    ___   
+   &kp LGUI ___    ___    ___    ___    ___    &kp HOME &kp PG_DN &kp PG_UP &kp END   ___    ___   
+                          	        ___ ___ ___      ___  ___ ___
                         >;
                 };
-
                 raise_layer {
-// -----------------------------------------------------------------------------------------
-// |  TAB |  !  |  @  |  #  |  $  |  %  |   |  ^  |  &  |  *  |  (  |  )  | BKSP |
-// | CTRL |     |     |     |     |     |   |  -  |  =  |  [  |  ]  |  \  |  `   |
-// | SHFT |     |     |     |     |     |   |  _  |  +  |  {  |  }  | "|" |  ~   |
-//                    | GUI |     | ENT |   | SPC |     | ALT |
+// ---------------------------------------------------------------------------------------
+// |      | F9  | F10 | F11 | F12 |         |   |         |     |     |  (  |  )  |      |
+// |      | F5  | F6  |  F7 | F8  |         |   |    -    |  =  |  [  |  ]  |  \  |  `   |
+// |      | F1  | F2  |  F3 | F4  |         |   |    _    |  +  |  {  |  }  | "|" |  ~   |
+//                    |     |     |         |   |         |      |     |
                         label = "Raise";
                         bindings = <
-   &kp  TAB  &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT   &kp CARET &kp AMPS  &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp BSPC
-   &mt LCTRL ESC ___      ___    ___      ___      ___         &kp MINUS &kp EQUAL &kp LBKT        &kp RBKT &kp BSLH &kp GRAVE
-   &kp LSHFT ___      ___    ___      ___      ___         &kp UNDER &kp PLUS  &kp LBRC        &kp RBRC &kp PIPE &kp TILDE
-                    	     &kp LGUI ___      &kp RET   &kp SPACE   ___       &kp RALT
+   ___ &kp F9 &kp F10 &kp F11 &kp F12 ___ ___       ___       &kp LPAR &kp RPAR ___      ___
+   ___ &kp F5 &kp F6  &kp F7  &kp F8  ___ &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE
+   ___ &kp F1 &kp F2  &kp F3  &kp F4  ___ &kp UNDER &kp PLUS  &kp LBRC &kp RBRC &kp PIPE &kp TILDE
+                          	        ___ ___ ___      &kp DEL  ___ ___
+                        >;
+                };
+                super {
+// ----------------------------------------------------------------------------------------
+// |      |     |     |     |     |         |   |         |      |     |     |     |      |
+// | BTCLR| BT1 | BT2 | BT3 | BT4 |   BT5   |   |         |      |     |     |     |      |
+// |      |     |     |     |     |         |   |         |      |     |     |     |      |
+//                    |     |     |         |   |         |      |     |
+                        label = "Super";
+                        bindings = <
+    ___        ___          ___          ___          ___          ___          ___ ___ ___ ___ ___ ___
+    &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 ___ ___ ___ ___ ___ ___
+    ___        ___          ___          ___          ___          ___          ___ ___ ___ ___ ___ ___
+                          	        ___ ___ ___      ___  ___ ___
                         >;
                 };
         };
diff --git a/utils/keypos_42keys.h b/utils/keypos_42keys.h
new file mode 100644
index 0000000..21f7052
--- /dev/null
+++ b/utils/keypos_42keys.h
@@ -0,0 +1,62 @@
+// https://raw.githubusercontent.com/urob/zmk-nodefree-config/8506dbaaee9b46d200aa553a94b6dbca8560a5e1/keypos_def/keypos_42keys.h
+/*                                      42 KEY MATRIX / LAYOUT MAPPING
+
+  ╭────────────────────────┬────────────────────────╮ ╭─────────────────────────┬─────────────────────────╮
+  │  0   1   2   3   4   5 │  6   7   8   9  10  11 │ │ LT5 LT4 LT3 LT2 LT1 LT0 │ RT0 RT1 RT2 RT3 RT4 RT5 │
+  │ 12  13  14  15  16  17 │ 18  19  20  21  22  23 │ │ LM5 LM4 LM3 LM2 LM1 LM0 │ RM0 RM1 RM2 RM3 RM4 RM5 │
+  │ 24  25  26  27  28  29 │ 30  31  32  33  34  35 │ │ LB5 LB4 LB3 LB2 LB1 LB0 │ RB0 RB1 RB2 RB3 RB4 RB5 │
+  ╰───────────╮ 36  37  38 │ 39  40  41 ╭───────────╯ ╰───────────╮ LH2 LH1 LH0 │ RH0 RH1 RH2 ╭───────────╯
+              ╰────────────┴────────────╯                         ╰─────────────┴─────────────╯             */
+
+#pragma once
+
+#define LT0  5  // left-top row
+#define LT1  4
+#define LT2  3
+#define LT3  2
+#define LT4  1
+#define LT5  0
+
+#define RT0  6  // right-top row
+#define RT1  7
+#define RT2  8
+#define RT3  9
+#define RT4 10
+#define RT5 11
+
+#define LM0 17  // left-middle row
+#define LM1 16
+#define LM2 15
+#define LM3 14
+#define LM4 13
+#define LM5 12
+
+#define RM0 18  // right-middle row
+#define RM1 19
+#define RM2 20
+#define RM3 21
+#define RM4 22
+#define RM5 23
+
+#define LB0 29  // left-bottom row
+#define LB1 28
+#define LB2 27
+#define LB3 26
+#define LB4 25
+#define LB5 24
+
+#define RB0 30  // right-bottom row
+#define RB1 31
+#define RB2 32
+#define RB3 33
+#define RB4 34
+#define RB5 35
+
+#define LH0 38  // left thumb keys
+#define LH1 37
+#define LH2 36
+
+#define RH0 39  // right thumb keys
+#define RH1 40
+#define RH2 41
+