fix(combos): Properly report combos len with emply block (zmkfirmware…

…#2739) Handle the scenario where there is an empty combos block and return a zero combos length.
caksoylar · Jan 11, 2025 · bf8555c · bf8555c
1 parent 437c5f7
commit bf8555c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/include/zmk/combos.h b/app/include/zmk/combos.h
@@ -8,9 +8,9 @@
 
 #include <zephyr/devicetree.h>
 
-#define ZMK_COMBOS_UTIL_ONE(n) 1
+#define ZMK_COMBOS_UTIL_ONE(n) +1
 
 #define ZMK_COMBOS_LEN                                                                             \
-    COND_CODE_1(                                                                                   \
-        DT_HAS_COMPAT_STATUS_OKAY(zmk_combos),                                                     \
-        (DT_FOREACH_CHILD_STATUS_OKAY_SEP(DT_INST(0, zmk_combos), ZMK_COMBOS_UTIL_ONE, (+))), (0))
+    COND_CODE_1(DT_HAS_COMPAT_STATUS_OKAY(zmk_combos),                                             \
+                (0 DT_FOREACH_CHILD_STATUS_OKAY(DT_INST(0, zmk_combos), ZMK_COMBOS_UTIL_ONE)),     \
+                (0))
diff --git a/app/tests/pointing/mouse-move/processors/behaviors_hold_tap/native_posix_64.keymap b/app/tests/pointing/mouse-move/processors/behaviors_hold_tap/native_posix_64.keymap
@@ -18,6 +18,10 @@
 };
 
 / {
+    combos {
+        compatible = "zmk,combos";
+    };
+
     keymap {
         compatible = "zmk,keymap";
         label ="Default keymap";