Merge branch 'urob:main' into main

beyertom · Aug 5, 2023 · b703e17 · b703e17
2 parents 67b12f5 + 4fbcfb1
commit b703e17
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 16 deletions.
diff --git a/config/combos.dtsi b/config/combos.dtsi
@@ -9,10 +9,10 @@
 
 // use global-quick-tap-ms for combos (requires PR 1387)
 #undef COMBO_HOOK
-#define COMBO_HOOK global-quick-tap-ms = <100>;
+#define COMBO_HOOK global-quick-tap-ms = <150>;
 
-#define COMBO_TERM_FAST 20
-#define COMBO_TERM_SLOW 35
+#define COMBO_TERM_FAST 18
+#define COMBO_TERM_SLOW 30
 
 // make homerow combos tap-only (so HRMs can be chorded instantaneously)
 #define HRC_TAB    &hml         LA(LCTRL) TAB
@@ -24,13 +24,13 @@
 ZMK_COMBO(de_eur,&kp RA(N5),    LT1 LT0,     DEF NAV NUM, COMBO_TERM_FAST)
 ZMK_COMBO(esc,   &kp ESC,       LT3 LT2,     DEF NAV NUM, COMBO_TERM_FAST)
 ZMK_COMBO(ret,   &kp RETURN,    LT2 LT1,     DEF NAV NUM, COMBO_TERM_FAST)
-ZMK_COMBO(mouse, &smart_mouse,  LT3 LT1,     DEF NAV NUM, COMBO_TERM_SLOW)
+ZMK_COMBO(mouse, &smart_mouse,  LT3 LT1,     DEF NAV NUM, COMBO_TERM_FAST)
 
 ZMK_COMBO(de_ss, &kp RA(S),     LM1 LM0,     DEF NAV NUM, COMBO_TERM_FAST)
 ZMK_COMBO(tab,   HRC_TAB,       LM3 LM2,     DEF NAV NUM, COMBO_TERM_FAST)
 ZMK_COMBO(repeat,HRC_REPEAT,    LM2 LM1,     DEF NAV NUM, COMBO_TERM_FAST)
 
-ZMK_COMBO(cut,   &kp LC(X),     LB3 LB1,     DEF NAV NUM, COMBO_TERM_SLOW)
+ZMK_COMBO(cut,   &kp LC(X),     LB3 LB1,     DEF NAV NUM, COMBO_TERM_FAST)
 ZMK_COMBO(copy,  &kp LC(INS),   LB3 LB2,     DEF NAV NUM, COMBO_TERM_FAST)
 ZMK_COMBO(paste, &kp LS(INS),   LB2 LB1,     DEF NAV NUM, COMBO_TERM_FAST)
 
@@ -51,8 +51,8 @@ ZMK_COMBO(rbkt,  &kp RBKT,      RB2 RB3,     DEF     NUM, COMBO_TERM_FAST)
 ZMK_COMBO(lbrc,  &kp LBRC,      RB1 RB2,         NAV    , COMBO_TERM_FAST)
 ZMK_COMBO(rbrc,  &kp RBRC,      RB2 RB3,         NAV    , COMBO_TERM_FAST)
 
-ZMK_COMBO(grk,   &sl UC,        RT1 RT3,     DEF NAV NUM, COMBO_TERM_SLOW)
-ZMK_COMBO(cpgrk, &sls 0,        RT1 RT2 RT3, DEF NAV NUM, COMBO_TERM_SLOW)
+ZMK_COMBO(grk,   &sl UC,        RT1 RT3,     DEF NAV NUM, COMBO_TERM_FAST)
+ZMK_COMBO(cpgrk, &sls 0,        RT1 RT2 RT3, DEF NAV NUM, COMBO_TERM_FAST)
 
 /* Vertical combos - left hand */
 ZMK_COMBO(at,    &kp AT,        LT3 LM3,     DEF NAV NUM, COMBO_TERM_SLOW)

diff --git a/scripts/zmk_build.sh b/scripts/zmk_build.sh
@@ -12,6 +12,10 @@ while [[ $# -gt 0 ]]; do
             RUNWITH_DOCKER="false"
             ;;
 
+        -m|--multithread)
+            MULTITHREAD="true"
+            ;;
+
         -c|--clear-cache)
             CLEAR_CACHE="true"
             ;;
@@ -128,7 +132,8 @@ fi
 if [[ $RUNWITH_DOCKER = true ]]
 then
     echo "Build mode: docker"
-    DOCKER_CMD="$DOCKER_BIN run --name zmk-$ZEPHYR_VERSION --rm \
+    # DOCKER_CMD="$DOCKER_BIN run --name zmk-$ZEPHYR_VERSION --rm \
+    DOCKER_CMD="$DOCKER_BIN run --rm \
         --mount type=bind,source=$HOST_ZMK_DIR,target=$DOCKER_ZMK_DIR \
         --mount type=bind,source=$HOST_CONFIG_DIR,target=$DOCKER_CONFIG_DIR,readonly \
         --mount type=volume,source=zmk-root-user-$ZEPHYR_VERSION,target=/root \
@@ -165,15 +170,15 @@ fi
 
 # usage: compile_board board
 compile_board () {
-    echo -en "\n$(tput setaf 2)Building $1... $(tput sgr0)"
     BUILD_DIR="${1}_$SUFFIX"
     LOGFILE="$LOG_DIR/zmk_build_$1.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 $1 $WEST_OPTS \
         -- -DZMK_CONFIG="$CONFIG_DIR" -Wno-dev > "$LOGFILE" 2>&1
     if [[ $? -eq 0 ]]
     then
-        # echo "$(tput setaf 4)Success: $1 done$(tput sgr0)"
-        echo "$(tput setaf 2)done$(tput sgr0)"
+        [[ $MULTITHREAD = "true" ]] || echo "$(tput setaf 2)done$(tput sgr0)"
         echo "Build log saved to \"$LOGFILE\"."
         if [[ -f $HOST_ZMK_DIR/app/build/$BUILD_DIR/zephyr/zmk.uf2 ]]
         then
@@ -192,8 +197,27 @@ compile_board () {
 }
 
 cd "$HOST_ZMK_DIR/app"
-for board in $(echo $BOARDS | sed 's/,/ /g')
-do
-    compile_board $board
-done
-
+if [[ $MULTITHREAD = "true" ]]; then
+    i=1
+    for board in $(echo $BOARDS | sed 's/,/ /g')
+    do
+        compile_board $board &
+        eval "T${i}=\${!}"
+        eval "B${i}=\$board"  # Store the board name in a corresponding variable
+        ((i++))
+    done
+
+    echo "Starting $(($i - 1)) background threads:"
+    for ((x=1; x<i; x++))
+    do
+        pid="T$x"
+        wait "${!pid}"
+        board="B$x"  # Retrieve the board name from the corresponding variable
+        echo -e "$(tput setaf 3)Thread $x with PID ${!pid} has finished: ${!board}$(tput sgr0)"
+    done
+else
+    for board in $(echo $BOARDS | sed 's/,/ /g')
+    do
+        compile_board $board
+    done
+fi