Merge https://github.com/zmkfirmware/zmk into main

docs/docs/behaviors/mod-morph.md

@@ -0,0 +1,74 @@
+---
+title: Mod-Morph Behavior
+sidebar_label: Mod-Morph
+---
+
+## Summary
+
+The Mod-Morph behavior sends a different keypress, depending on whether a specified modifier is being held during the keypress.
+
+- If you tap the key by itself, the first keycode is sent.
+- If you tap the key while holding the specified modifier, the second keycode is sent.
+
+## Mod-Morph
+
+The Mod-Morph behavior acts as one of two keycodes, depending on if the required modifier is being held during the keypress.
+
+When the modifier is being held it is sent along with the morphed keycode. This can cause problems when the morphed keycode and modifier have an existing relationship (such as `shift-delete` or `ctrl-v` on many operating systems).
+
+### Configuration
+
+An example of how to implement the mod-morph "Grave Escape":
+
+```
+/ {
+behaviors {
+    gresc: grave_escape {
+        compatible = "zmk,behavior-mod-morph";
+        label = "GRAVE_ESCAPE";
+        #binding-cells = <0>;
+        bindings = <&kp ESC>, <&kp GRAVE>;
+        mods = <(MOD_LGUI|MOD_LSFT|MOD_RGUI|MOD_RSFT)>;
+    }
+
+};
+
+    keymap {
+        ...
+    }
+}
+```
+
+Note that this specific mod-morph exists in ZMK by default using code `&gresc`.
+
+### Behavior Binding
+
+- Reference: `&gresc`
+- Parameter: None
+
+Example:
+
+```
+&gresc
+```
+
+### Mods
+
+This is how you determine what modifiers will activate the morphed version of the keycode.
+
+Available Modifiers:
+
+- `MOD_LSFT`
+- `MOD_RSFT`
+- `MOD_LCTL`
+- `MOD_RCTL`
+- `MOD_LALT`
+- `MOD_RALT`
+- `MOD_LGUI`
+- `MOD_RGUI`
+
+Example:
+
+```
+mods = <(MOD_LGUI|MOD_LSFT|MOD_RGUI|MOD_RSFT)>;
+```

docs/docs/features/combos.md

@@ -18,7 +18,6 @@ Combos configured in your `.keymap` file, but are separate from the `keymap` nod
 			timeout-ms = <50>;
 			key-positions = <0 1>;
 			bindings = <&kp ESC>;
-			layers = <-1>;
 		};
 	};
 };
@@ -28,7 +27,7 @@ Combos configured in your `.keymap` file, but are separate from the `keymap` nod
 - The `compatible` property should always be `"zmk,combos"` for combos.
 - `timeout-ms` is the number of milliseconds that all keys of the combo must be pressed.
 - `key-positions` is an array of key positions. See the info section below about how to figure out the positions on your board.
-- `layers = <0 1...>` will allow limiting a combo to specific layers. this is an _optional_ parameter and defaults to `-1` which is global scope.
+- `layers = <0 1...>` will allow limiting a combo to specific layers. This is an _optional_ parameter, when omitted it defaults to global scope.
 - `bindings` is the behavior that is activated when the behavior is pressed.
 - (advanced) you can specify `slow-release` if you want the combo binding to be released when all key-positions are released. The default is to release the combo as soon as any of the keys in the combo is released.
 

docs/sidebars.js

@@ -22,6 +22,7 @@ module.exports = {
       "behaviors/misc",
       "behaviors/hold-tap",
       "behaviors/mod-tap",
+      "behaviors/mod-morph",
       "behaviors/sticky-key",
       "behaviors/sticky-layer",
       "behaviors/reset",