Merge branch 'main' of https://github.com/zmkfirmware/zmk into main

.github/workflows/build.yml

@@ -25,6 +25,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Cache west modules
+        timeout-minutes: 2
+        continue-on-error: true
         uses: actions/cache@v2
         env:
           cache-name: cache-zephyr-modules

app/Kconfig

@@ -193,6 +193,10 @@ source "subsys/logging/Kconfig.template.log_config"
 
 rsource "boards/Kconfig"
 rsource "boards/shields/*/Kconfig.defconfig"
+rsource "boards/shields/*/Kconfig.shield"
+
+osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.defconfig"
+osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.shield"
 
 source "Kconfig.zephyr"
 

app/cmake/zmk_config.cmake

@@ -44,6 +44,7 @@ endif()
 set(CACHED_ZMK_CONFIG ${ZMK_CONFIG} CACHE STRING "Selected user ZMK config")
 
 if (ZMK_CONFIG)
+	set(ENV{ZMK_CONFIG} "${ZMK_CONFIG}")
 	if(EXISTS ${ZMK_CONFIG}/boards)
 		message(STATUS "Adding ZMK config directory as board root: ${ZMK_CONFIG}")
 		list(APPEND BOARD_ROOT ${ZMK_CONFIG})

docs/docs/behavior/key-press.md

@@ -1,5 +1,6 @@
 ---
-title: Key Presses
+title: Key Press Behaviors
+sidebar_label: Key Press
 ---
 
 ## Summary

docs/docs/behavior/layers.md

@@ -1,5 +1,6 @@
 ---
-title: Layers
+title: Layer Behaviors
+sidebar_label: Layers
 ---
 
 ## Summary
@@ -56,6 +57,7 @@ Example:
 ```
 
 "Toggle layer" for a :
+
 ```
 #define DEFAULT 0
 #define NAVI    1

docs/docs/behavior/lighting.md

@@ -1,5 +1,6 @@
 ---
-title: Lighting
+title: Lighting Behavior
+sidebar_label: Lighting
 ---
 
 ## Summary
@@ -21,7 +22,7 @@ This will allow you to reference the actions defined in this header such as `RGB
 Here is a table describing the action for each define:
 
 | Define    | Action                                                    |
-|-----------|-----------------------------------------------------------|
+| --------- | --------------------------------------------------------- |
 | `RGB_TOG` | Toggles the RGB feature on and off                        |
 | `RGB_HUI` | Increases the hue of the RGB feature                      |
 | `RGB_HUD` | Decreases the hue of the RGB feature                      |

docs/docs/behavior/misc.md

@@ -1,5 +1,6 @@
 ---
-title: Miscellaneous
+title: Miscellaneous Behaviors
+sidebar_label: Miscellaneous
 ---
 
 ## Summary

docs/docs/behavior/mod-tap.md

@@ -1,5 +1,6 @@
 ---
-title: Mod-Tap
+title: Mod-Tap Behavior
+sidebar_label: Mod-Tap
 ---
 
 ## Summary