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

4 files changed, 49 insertions, 1 deletions

diff --git a/docs/docs/behavior/reset.md b/docs/docs/behavior/reset.md
new file mode 100644
index 0000000..8cf122b
--- /dev/null
+++ b/docs/docs/behavior/reset.md
@@ -0,0 +1,43 @@
+---
+title: Reset Behaviors
+sidebar_label: Reset
+---
+
+## Summary
+
+There are two available behaviors that can be used to trigger a reset of the keyboard.
+The first is a soft reset, that will simply reset and re-run the currently flashed
+firmware; the second when triggered will reset into the bootloader, allowing you to
+flash a new firmware to the keyboard.
+
+## Reset
+
+The basic reset behavior will reset the keyboard and re-run the firmware flashed
+to the device
+
+### Behavior Binding
+
+- Reference: `&reset`
+- Parameters: None
+
+Example:
+
+```
+&reset
+```
+
+## Bootloader Reset
+
+The bootloader reset behavior will reset the keyboard and put it into bootloader mode, allowing
+you to flash a new firmware.
+
+### Behavior Binding
+
+- Reference: `&bootloader`
+- Parameters: None
+
+Example:
+
+```
+&bootloader
+```
diff --git a/docs/docs/dev-setup.md b/docs/docs/dev-setup.md
index 6e893b3..fae0aa0 100644
--- a/docs/docs/dev-setup.md
+++ b/docs/docs/dev-setup.md
@@ -52,6 +52,7 @@ sudo apt install -y \
 	autoconf \
 	automake \
 	build-essential \
+        bzip2 \
 	ccache \
 	device-tree-compiler \
 	dfu-util \
@@ -91,6 +92,7 @@ sudo apt install -y \
 	autoconf \
 	automake \
 	build-essential \
+        bzip2 \
 	ccache \
 	device-tree-compiler \
 	dfu-util \
@@ -130,6 +132,7 @@ sudo dnf install -y \
 	wget \
 	autoconf \
 	automake \
+        bzip2 \
 	ccache \
 	dtc \
 	dfu-util \
diff --git a/docs/sidebars.js b/docs/sidebars.js
index 8c7c97f..51313fc 100644
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -12,6 +12,7 @@ module.exports = {
       "behavior/layers",
       "behavior/misc",
       "behavior/mod-tap",
+      "behavior/reset",
       "behavior/lighting",
     ],
     Development: [
diff --git a/docs/static/setup.sh b/docs/static/setup.sh
index bb61df6..4dc740a 100644
--- a/docs/static/setup.sh
+++ b/docs/static/setup.sh
@@ -38,7 +38,7 @@ echo ""
 echo "Keyboard Shield Selection:"
 
 prompt="Pick an keyboard:"
-options=("Kyria" "Lily58" "Corne")
+options=("Kyria" "Lily58" "Corne" "Splitreus62")
 
 PS3="$prompt "
 # TODO: Add support for "Other" and linking to docs on adding custom shields in user config repos.
@@ -50,6 +50,7 @@ select opt in "${options[@]}" "Quit"; do
     1 ) shield_title="Kyria" shield="kyria"; split="y"; break;;
     2 ) shield_title="Lily58" shield="lily58"; split="y"; break;;
     3 ) shield_title="Corne" shield="corne"; split="y"; break;;
+    4 ) shield_title="Splitreus62" shield="splitreus62"; split="y"; break;;
 
     # Add link to docs on adding your own custom shield in your ZMK config!
     # $(( ${#options[@]}+1 )) ) echo "Other!"; break;;