From 25500329cea80a6c0a4080da95cc801af1fd0ca3 Mon Sep 17 00:00:00 2001 From: jattie-ire <52493590+jattie-ire@users.noreply.github.com> Date: Thu, 25 Apr 2024 09:55:23 +0100 Subject: [PATCH 1/3] Update useful_macros.sh Add reload camera shell script option to reload webcam configs --- files/scripts/useful_macros.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/files/scripts/useful_macros.sh b/files/scripts/useful_macros.sh index 4479242..1248df8 100755 --- a/files/scripts/useful_macros.sh +++ b/files/scripts/useful_macros.sh @@ -2,6 +2,12 @@ set -e +function reload_camera(){ + echo -e "Info: Reload camera config..." + ACTION=reload /usr/bin/auto_uvc.sh + exit 0 +} + function backup_klipper(){ if [ -f /usr/data/printer_data/config/backup_config.tar.gz ]; then rm -f /usr/data/printer_data/config/backup_config.tar.gz @@ -66,7 +72,9 @@ elif [ "$1" == "-backup_moonraker" ]; then backup_moonraker elif [ "$1" == "-restore_moonraker" ]; then restore_moonraker +elif [ "$1" == "-reload_camera" ]; then + reload_camera else - echo -e "Invalid argument. Usage: $0 [-backup_klipper | -restore_klipper | -backup_moonraker | -restore_moonraker]" + echo -e "Invalid argument. Usage: $0 [-backup_klipper | -restore_klipper | -backup_moonraker | -restore_moonraker | -reload_camera]" exit 1 -fi \ No newline at end of file +fi From 033a2916e875c0ee8f676bd7b6f6950268ff71ab Mon Sep 17 00:00:00 2001 From: jattie-ire <52493590+jattie-ire@users.noreply.github.com> Date: Thu, 25 Apr 2024 10:00:12 +0100 Subject: [PATCH 2/3] Update useful-macros.cfg add camera reload shell and macro commands to execute the camera reload shell command from the macro page. --- files/macros/useful-macros.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/files/macros/useful-macros.cfg b/files/macros/useful-macros.cfg index 2a5a033..b32dde9 100644 --- a/files/macros/useful-macros.cfg +++ b/files/macros/useful-macros.cfg @@ -22,6 +22,11 @@ command: sh /usr/data/helper-script/files/scripts/useful_macros.sh -restore_moon timeout: 600.0 verbose: true +[gcode_shell_command Reload_Camera] +command: sh /usr/data/helper-script/files/scripts/useful_macros.sh -reload_camera +timeout: 600.0 +verbose: true + [gcode_macro KLIPPER_BACKUP_CONFIG] gcode: @@ -42,6 +47,10 @@ gcode: gcode: RUN_SHELL_COMMAND CMD=Moonraker_Restore +[gcode_macro RELOAD_CAMERA] +gcode: + RUN_SHELL_COMMAND CMD=Reload_Camera + [gcode_macro BED_LEVELING] description: Start Bed Leveling From 3b01a848d677341e28ade314f66d5ee572cc9c16 Mon Sep 17 00:00:00 2001 From: Cyril Guislain Date: Thu, 25 Apr 2024 12:38:02 +0200 Subject: [PATCH 3/3] Update useful_macros.sh --- files/scripts/useful_macros.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/files/scripts/useful_macros.sh b/files/scripts/useful_macros.sh index 1248df8..f8151eb 100755 --- a/files/scripts/useful_macros.sh +++ b/files/scripts/useful_macros.sh @@ -2,12 +2,6 @@ set -e -function reload_camera(){ - echo -e "Info: Reload camera config..." - ACTION=reload /usr/bin/auto_uvc.sh - exit 0 -} - function backup_klipper(){ if [ -f /usr/data/printer_data/config/backup_config.tar.gz ]; then rm -f /usr/data/printer_data/config/backup_config.tar.gz @@ -64,6 +58,12 @@ function restore_moonraker(){ exit 0 } +function reload_camera(){ + echo -e "Info: Reloading camera config..." + ACTION=reload /usr/bin/auto_uvc.sh + exit 0 +} + if [ "$1" == "-backup_klipper" ]; then backup_klipper elif [ "$1" == "-restore_klipper" ]; then