Dev to Main (#342)

* Remove UNLOAD_FILAMENT from the default config. Addresses issue #335 (#336)

* feat: Add automatic firmware branch detection (KLIPPER / KALICO) (#341)

* feat: Add automatic firmware branch detection (KLIPPER / KALICO)

* feat: Add automatic firmware branch detection (KLIPPER / KALICO)

* feat: Add automatic firmware branch detection (KLIPPER / KALICO)

---------

Co-authored-by: Beattune <beattune-github@e-mail.de>

* Reduce sleep duration after git pull commands

---------

Co-authored-by: EternalNooblet <67196335+EternalNooblet@users.noreply.github.com>
Co-authored-by: Beattune <60428301+Beattune@users.noreply.github.com>
Co-authored-by: Beattune <beattune-github@e-mail.de>

Author: 4 people

img-config/rpi-mcu-install.sh

@@ -14,6 +14,17 @@ apply_minimal_config() {
     make olddefconfig
 }
 
+# Get current git branch from $KLIPPER_DIR
+cd "$KLIPPER_DIR" || exit 1
+current_branch=$(git rev-parse --abbrev-ref HEAD)
+
+# Check for detached HEAD status
+if [[ "$current_branch" == "HEAD" ]]; then
+    echo "Warning: Detached HEAD state detected!"
+    sleep 30
+    exit 1
+fi
+
 # Prompt user for MCU if not passed as argument
 if [[ -z $1 ]]; then
     echo ""
@@ -33,7 +44,27 @@ else
 fi
 
 # Update Klipper
-cd "$KLIPPER_DIR" && git pull origin master
+cd "$KLIPPER_DIR" || exit 1
+pull_output=$(git pull origin "$current_branch" 2>&1)
+pull_exit=$?
+
+# Check for git pull errors
+if [[ $pull_exit -ne 0 ]]; then
+    echo -e "\n❌ Git pull failed for '$current_branch'!"
+    echo "$pull_output"
+    sleep 20
+    exit 1
+fi
+
+# Generate and show response message
+if echo "$pull_output" | grep -iq "already up to date"; then
+    echo -e "\nℹ️ Branch '$current_branch' is already up to date."
+    sleep 5
+else
+    echo -e "\n✅ Git pull successful for '$current_branch':"
+    echo "$pull_output"
+    sleep 5
+fi
 
 ### STM32 MCU UPDATE ###
 if [[ "$mcu_choice" == "STM32" || "$mcu_choice" == "All" ]]; then

printer-confs/base.cfg

@@ -225,7 +225,6 @@ gcode:
 description: Pause for colour change
 gcode:
   PAUSE
-  UNLOAD_FILAMENT
 
 [gcode_macro LOAD_FILAMENT]
 variable_prev_temp: 0