From aecd049a28b02c9e57a8fceabd7bad19fe965142 Mon Sep 17 00:00:00 2001 From: Konstantin Koslowski Date: Sun, 29 Jan 2023 21:32:02 +0100 Subject: [PATCH] use kiauh, replace mjpg_streamer with crowsnest, update some paths --- crowsnest.conf | 10 ++++++++++ ercf/software.cfg | 2 +- moonraker.conf | 33 +++++++++++++++++++++------------ printer.cfg | 20 ++++++++++---------- webcam-xk.txt | 11 ----------- 5 files changed, 42 insertions(+), 34 deletions(-) create mode 100644 crowsnest.conf delete mode 100644 webcam-xk.txt diff --git a/crowsnest.conf b/crowsnest.conf new file mode 100644 index 0000000..9d0e9e9 --- /dev/null +++ b/crowsnest.conf @@ -0,0 +1,10 @@ +[crowsnest] +log_path: ~/printer_data/logs/crowsnest.log +log_level: quiet + +[cam 1] +mode: mjpg +port: 8080 +device: /dev/video0 +resolution: 1280x960 +max_fps: 15 diff --git a/ercf/software.cfg b/ercf/software.cfg index 42bb38e..b622561 100644 --- a/ercf/software.cfg +++ b/ercf/software.cfg @@ -83,7 +83,7 @@ variable_extra_servo_dwell_down: 0 gcode: [save_variables] -filename: /home/pi/klipper_config/ercf/vars.cfg +filename: /home/pi/printer_data/config/ercf/vars.cfg ############################### # ERCF Calibration macros diff --git a/moonraker.conf b/moonraker.conf index 2b4c95e..f11790e 100644 --- a/moonraker.conf +++ b/moonraker.conf @@ -1,6 +1,7 @@ [server] host: 0.0.0.0 port: 7125 +klippy_uds_address: /home/pi/printer_data/comms/klippy.sock [authorization] force_logins: True @@ -41,11 +42,11 @@ type: web repo: fluidd-core/fluidd path: ~/fluidd -[update_manager client mainsail] -type: web -channel: beta -repo: mainsail-crew/mainsail -path: ~/mainsail +# [update_manager client mainsail] +# type: web +# channel: beta +# repo: mainsail-crew/mainsail +# path: ~/mainsail # [update_manager klipper-mcu-update] # type: git_repo @@ -60,18 +61,18 @@ env: ~/.KlipperScreen-env/bin/python requirements: scripts/KlipperScreen-requirements.txt install_script: scripts/KlipperScreen-install.sh -[update_manager client z_calibration] -type: git_repo -path: /home/pi/klipper_z_calibration -origin: https://github.com/protoloft/klipper_z_calibration.git -install_script: install.sh - [update_manager timelapse] type: git_repo primary_branch: main path: ~/moonraker-timelapse origin: https://github.com/mainsail-crew/moonraker-timelapse.git +[update_manager ercf] +type: git_repo +primary_branch: main +path: ~/EnragedRabbitProject +origin: https://github.com/EtteGit/EnragedRabbitProject.git + [power voron-v2.4] type: tplink_smartplug address: 192.168.11.91 @@ -85,6 +86,14 @@ address: 192.168.11.91 ## Directory where the generated video will be saved output_path: ~/timelapse/ ## Directory where the temporary frames are saved -#frame_path: /tmp/timelapse/ +frame_path: /tmp/timelapse/ ## Directory where ffmpeg is installed #ffmpeg_binary_path: /usr/bin/ffmpeg + +# 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/install.sh diff --git a/printer.cfg b/printer.cfg index 0b3612a..7c5fe39 100644 --- a/printer.cfg +++ b/printer.cfg @@ -48,7 +48,7 @@ max_z_accel: 500 square_corner_velocity: 5.0 [virtual_sdcard] -path: /home/pi/gcode_files +path: /home/pi/printer_data/gcodes [pause_resume] @@ -405,15 +405,15 @@ max_adjust: 10 #*# [bed_mesh default] #*# version = 1 #*# points = -#*# -0.010000, -0.012500, -0.016250, -0.006250, -0.013750, 0.018750, -0.003750, 0.008750, 0.005000 -#*# -0.010000, -0.016250, -0.012500, -0.010000, -0.028750, -0.013750, -0.017500, 0.000000, -0.007500 -#*# -0.026250, -0.031250, -0.018750, -0.013750, -0.001250, -0.005000, -0.008750, 0.008750, 0.005000 -#*# -0.007500, -0.025000, -0.013750, -0.008750, -0.002500, 0.000000, -0.010000, -0.002500, -0.006250 -#*# -0.010000, 0.000000, -0.005000, 0.002500, 0.000000, 0.028750, -0.001250, 0.010000, 0.020000 -#*# -0.027500, -0.026250, -0.032500, -0.022500, -0.028750, -0.016250, -0.015000, -0.018750, -0.028750 -#*# -0.021250, -0.011250, -0.011250, -0.015000, -0.016250, -0.006250, -0.012500, -0.008750, -0.002500 -#*# -0.005000, -0.002500, -0.007500, -0.007500, 0.006250, 0.007500, -0.003750, 0.010000, -0.008750 -#*# -0.002500, 0.027500, 0.053750, 0.021250, 0.016250, 0.038750, 0.021250, 0.012500, -0.011250 +#*# -0.001250, -0.002500, -0.006250, -0.017500, -0.005000, 0.005000, 0.016250, 0.022500, 0.006250 +#*# 0.001250, -0.000000, -0.017500, -0.015000, -0.020000, 0.007500, -0.002500, 0.022500, 0.011250 +#*# -0.012500, -0.020000, 0.006250, -0.000000, 0.005000, 0.003750, -0.008750, 0.002500, -0.012500 +#*# -0.013750, 0.003750, 0.005000, 0.023750, 0.008750, 0.030000, 0.012500, 0.028750, 0.008750 +#*# 0.002500, 0.001250, 0.025000, 0.023750, 0.000000, 0.022500, 0.011250, 0.023750, 0.010000 +#*# -0.036250, -0.033750, -0.037500, -0.026250, -0.025000, -0.002500, -0.003750, -0.018750, -0.028750 +#*# -0.036250, -0.027500, -0.028750, -0.033750, -0.027500, -0.025000, -0.041250, -0.027500, -0.048750 +#*# -0.025000, -0.022500, -0.020000, -0.018750, -0.025000, -0.022500, -0.031250, -0.032500, -0.041250 +#*# -0.016250, -0.012500, 0.015000, -0.020000, -0.030000, -0.002500, -0.032500, -0.045000, -0.065000 #*# tension = 0.2 #*# min_x = 40.0 #*# algo = bicubic diff --git a/webcam-xk.txt b/webcam-xk.txt deleted file mode 100644 index e6af7ca..0000000 --- a/webcam-xk.txt +++ /dev/null @@ -1,11 +0,0 @@ -# vim: ft=conf - -### Additional options to supply to MJPG Streamer for the cameras -camera_usb=0 -camera_raspi=1 -camera_usb_options="-d /dev/v4l/by-id/usb-Vimicro_Corp._HBVCAM_FHD_CAMERA-video-index0 -r 1280x960 -f 10" -camera_raspi_options="-d /dev/v4l/by-path/platform-bcm2835-isp-video-index0 -x 1024 -y 768 -roi 0.0,0.0,0.998,1" - -### Configuration of camera HTTP output -camera_http_options="-p 8080" -