diff --git a/.moonraker.conf.bkp b/.moonraker.conf.bkp index c34e2ba..b7e56ae 100644 --- a/.moonraker.conf.bkp +++ b/.moonraker.conf.bkp @@ -43,13 +43,6 @@ path = /home/pi/mainsail-config primary_branch = master type = git_repo -[update_manager crowsnest] -type = git_repo -path = ~/crowsnest -origin = https://github.com/mainsail-crew/crowsnest.git -managed_services = crowsnest -install_script = tools/pkglist.sh - [update_manager timelapse] type = git_repo primary_branch = main @@ -75,8 +68,18 @@ bound_services = klipper [spoolman] -server = https://spoolman.fieryeagle.org/ +server = http://127.0.0.1:7912 sync_rate = 5 [timelapse] +[update_manager crowsnest] +type = git_repo +path = ~/crowsnest +origin = https://github.com/mainsail-crew/crowsnest.git +primary_branch = v5 +managed_services = crowsnest +system_dependencies = system-dependencies.json +virtualenv = ~/crowsnest-env +requirements = requirements.txt + diff --git a/crowsnest.conf b/crowsnest.conf index 446aff5..d5d26d2 100644 --- a/crowsnest.conf +++ b/crowsnest.conf @@ -23,22 +23,17 @@ #### http://:/?action=[stream/snapshot] ##### #### ##### ##################################################################### -#### RTSP Stream URL: ( if enabled and supported ) ##### -#### rtsp://:/stream.h264 ##### -##################################################################### [crowsnest] -log_path: /home/pi/printer_data/logs/crowsnest.log log_level: verbose # Valid Options are quiet/verbose/debug -delete_log: false # Deletes log on every restart, if set to true +rollover_on_start: false # Creates a backup and clears the log on every restart, if set to true no_proxy: false # If set to true, no reverse proxy is required. Only change this, if you know what you are doing. [cam 1] -mode: ustreamer # ustreamer - Provides MJPG and snapshots. (All devices) - # camera-streamer - Provides WebRTC, MJPG and snapshots. (only RPiOS + RPi 0/1/2/3/4) +mode: ustreamer # https://docs.mainsail.xyz/crowsnest/faq/backends port: 8080 # HTTP/MJPG stream/snapshot port -device: /dev/v4l/by-id/usb-Jieli_Technology_USB_PHY_2.0-video-index0 # See log for available devices +device: /dev/video0 # See log for available devices resolution: 1920x1080 # x format max_fps: 24 # If hardware supports it, it will be forced, otherwise ignored/coerced. custom_flags: --allow-truncated-frames # You can run the stream services with custom flags. diff --git a/moonraker.conf b/moonraker.conf index 9c66900..7f242f6 100644 --- a/moonraker.conf +++ b/moonraker.conf @@ -44,13 +44,6 @@ path: /home/pi/mainsail-config primary_branch: master type: git_repo -# Crowsnest update_manager entry -[update_manager crowsnest] -type: git_repo -path: ~/crowsnest -origin: https://github.com/mainsail-crew/crowsnest.git -managed_services: crowsnest -install_script: tools/pkglist.sh [update_manager timelapse] type: git_repo @@ -77,7 +70,7 @@ bound_services: klipper [spoolman] -server: https://spoolman.fieryeagle.org/ +server: http://127.0.0.1:7912 sync_rate: 5 [timelapse] @@ -91,3 +84,12 @@ sync_rate: 5 ## Directory where the temporary frames are saved #ffmpeg_binary_path: /usr/bin/ffmpeg ## Directory where ffmpeg is installed +[update_manager crowsnest] +type: git_repo +path: ~/crowsnest +origin: https://github.com/mainsail-crew/crowsnest.git +primary_branch: v5 +managed_services: crowsnest +system_dependencies: system-dependencies.json +virtualenv: ~/crowsnest-env +requirements: requirements.txt diff --git a/printer.cfg b/printer.cfg index 3d85d65..1ea2549 100644 --- a/printer.cfg +++ b/printer.cfg @@ -237,18 +237,18 @@ pin: PB0 #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated. #*# #*# [bltouch] -#*# z_offset = 1.380 +#*# z_offset = 1.430 #*# #*# [bed_mesh default] #*# version = 1 #*# points = -#*# 0.072500, 0.060000, 0.032500, 0.020000, 0.005000, -0.010000, -0.012500 -#*# 0.045000, 0.045000, 0.002500, -0.032500, -0.035000, -0.070000, -0.072500 -#*# 0.037500, 0.002500, -0.025000, -0.050000, -0.070000, -0.105000, -0.097500 -#*# 0.012500, -0.030000, -0.070000, -0.067500, -0.080000, -0.122500, -0.115000 -#*# 0.005000, -0.032500, -0.077500, -0.075000, -0.070000, -0.132500, -0.120000 -#*# 0.030000, -0.020000, -0.060000, -0.067500, -0.070000, -0.122500, -0.117500 -#*# 0.052500, 0.020000, -0.060000, -0.060000, -0.047500, -0.102500, -0.050000 +#*# -0.055000, -0.082500, -0.085000, -0.072500, -0.032500, -0.012500, 0.005000 +#*# -0.070000, -0.112500, -0.137500, -0.117500, -0.082500, -0.037500, -0.025000 +#*# -0.050000, -0.152500, -0.167500, -0.147500, -0.117500, -0.085000, -0.065000 +#*# -0.065000, -0.150000, -0.165000, -0.125000, -0.117500, -0.112500, -0.092500 +#*# -0.052500, -0.135000, -0.147500, -0.125000, -0.112500, -0.125000, -0.115000 +#*# -0.020000, -0.112500, -0.142500, -0.122500, -0.117500, -0.137500, -0.112500 +#*# 0.045000, -0.060000, -0.095000, -0.100000, -0.090000, -0.102500, -0.080000 #*# x_count = 7 #*# y_count = 7 #*# mesh_x_pps = 2