zach
/
virtual-klipper-printer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: update configs to apply moonraker path changes 

Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
th33xitus 2022-12-28 15:52:20 +01:00
parent 93bfb72a77
commit 183bf825b1
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/supervisord.conf
View File

@ -1,5 +1,5 @@
[supervisord] [supervisord]
logfile=/home/printer/klipper_logs/supervisord.log ; (main log file;default $CWD/supervisord.log) logfile=/home/printer/printer_data/logs/supervisord.log ; (main log file;default $CWD/supervisord.log)
logfile_maxbytes=50MB ; (max main logfile bytes b4 rotation;default 50MB) logfile_maxbytes=50MB ; (max main logfile bytes b4 rotation;default 50MB)
logfile_backups=10 ; (num of main logfile rotation backups;default 10) logfile_backups=10 ; (num of main logfile rotation backups;default 10)
loglevel=info ; (log level;default info; others: debug,warn,trace) loglevel=info ; (log level;default info; others: debug,warn,trace)
@ -28,7 +28,7 @@ autorestart=true
redirect_stderr=true redirect_stderr=true
[program:klipper] [program:klipper]
command=/home/printer/klippy-env/bin/python /home/printer/klipper/klippy/klippy.py /home/printer/klipper_config/printer.cfg -l /home/printer/klipper_logs/klippy.log -a /tmp/klippy_uds command=/home/printer/klippy-env/bin/python /home/printer/klipper/klippy/klippy.py /home/printer/printer_data/config/printer.cfg -l /home/printer/printer_data/logs/klippy.log -a /home/printer/printer_data/comms/klippy.sock
user=printer user=printer
process_name=klipper process_name=klipper
directory=/home/printer directory=/home/printer
@ -37,7 +37,7 @@ autorestart=true
redirect_stderr=true redirect_stderr=true
[program:moonraker] [program:moonraker]
command=/home/printer/moonraker-env/bin/python /home/printer/moonraker/moonraker/moonraker.py -l /home/printer/klipper_logs/moonraker.log -c /home/printer/klipper_config/moonraker.conf command=/home/printer/moonraker-env/bin/python /home/printer/moonraker/moonraker/moonraker.py -d /home/printer/printer_data
user=printer user=printer
process_name=moonraker process_name=moonraker
directory=/home/printer directory=/home/printer

10
example-configs/moonraker.conf
View File

@ -1,22 +1,17 @@
[machine] [machine]
provider: systemd_cli provider: systemd_cli
validate_service: False
[server] [server]
host: 0.0.0.0 host: 0.0.0.0
port: 7125 port: 7125
klippy_uds_address: /tmp/klippy_uds klippy_uds_address: ~/printer_data/comms/klippy.sock
enable_debug_logging: False
[database]
database_path: ~/.moonraker_database
[data_store] [data_store]
temperature_store_size: 1200 temperature_store_size: 1200
gcode_store_size: 1000 gcode_store_size: 1000
[file_manager] [file_manager]
log_path: ~/klipper_logs
config_path: ~/klipper_config
enable_object_processing: True enable_object_processing: True
[authorization] [authorization]
@ -42,6 +37,5 @@ subscriptions:
mainsail mainsail
[update_manager] [update_manager]
enable_repo_debug: True
refresh_interval: 24 refresh_interval: 24
channel: dev channel: dev

29
scripts/start.sh
View File

@ -13,12 +13,13 @@
set -e set -e
REQUIRED_FOLDERS=( REQUIRED_FOLDERS=(
"${HOME}/klipper_config" "${HOME}/printer_data"
"${HOME}/klipper_logs" "${HOME}/printer_data/config"
"${HOME}/gcode_files" "${HOME}/printer_data/logs"
"${HOME}/webcam_images" "${HOME}/printer_data/gcodes"
"${HOME}/timelapse" "${HOME}/printer_data/webcam_images"
"${HOME}/.moonraker_database" "${HOME}/printer_data/timelapse"
"${HOME}/printer_data/database"
) )
function status_msg() { function status_msg() {
@ -40,13 +41,13 @@ function check_folder_perms() {
} }
###### ######
# Copy example configs if ~/klipper_config is empty # Copy example configs if ~/printer_data/config is empty
### ###
function copy_example_configs() { function copy_example_configs() {
if [[ ! "$(ls -A "${HOME}/klipper_config")" ]]; then if [[ ! "$(ls -A "${HOME}/printer_data/config")" ]]; then
status_msg "Directory ${HOME}/klipper_config is empty!" status_msg "Directory ${HOME}/printer_data/config is empty!"
status_msg "Copy example configs ..." status_msg "Copy example configs ..."
cp -R ~/example-configs/* ~/klipper_config cp -R ~/example-configs/* ~/printer_data/config
status_msg "OK!" status_msg "OK!"
fi fi
} }
@ -55,10 +56,10 @@ function copy_example_configs() {
# Copy dummy images if ~/webcam_images is empty # Copy dummy images if ~/webcam_images is empty
### ###
function copy_dummy_images() { function copy_dummy_images() {
if [[ ! "$(ls -A "${HOME}/webcam_images")" ]]; then if [[ ! "$(ls -A "${HOME}/printer_data/webcam_images")" ]]; then
status_msg "Directory ${HOME}/webcam_images is empty!" status_msg "Directory ${HOME}/printer_data/webcam_images is empty!"
status_msg "Copy dummy images ..." status_msg "Copy dummy images ..."
cp -R ~/mjpg_streamer_images/*.jpg ~/webcam_images cp -R ~/mjpg_streamer_images/*.jpg ~/printer_data/webcam_images
status_msg "OK!" status_msg "OK!"
fi fi
} }
@ -70,7 +71,7 @@ function link_timelapse() {
local component_source="${HOME}/moonraker-timelapse/component/timelapse.py" local component_source="${HOME}/moonraker-timelapse/component/timelapse.py"
local component_target="${HOME}/moonraker/moonraker/components/timelapse.py" local component_target="${HOME}/moonraker/moonraker/components/timelapse.py"
local macro_source="${HOME}/moonraker-timelapse/klipper_macro/timelapse.cfg" local macro_source="${HOME}/moonraker-timelapse/klipper_macro/timelapse.cfg"
local macro_target="${HOME}/klipper_config/addons/timelapse.cfg" local macro_target="${HOME}/printer_data/config/addons/timelapse.cfg"
if [[ -f ${component_source} && ! -h ${component_target} ]]; then if [[ -f ${component_source} && ! -h ${component_target} ]]; then
status_msg "Linking moonraker-timelapse component ..." status_msg "Linking moonraker-timelapse component ..."