This commit is contained in:
Konstantin Koslowski 2025-12-06 12:15:44 +01:00
parent c298263d94
commit 4895ffdefb
5 changed files with 65 additions and 40 deletions

View file

@ -43,4 +43,8 @@ extruder = 255
#~# test_stream_delay = False
#~# timelapse_render = False
#~# timelapse_take_frame = False
#~#
#~# [graph v2.4]
#~# temperature_sensor mcu = False
#~# temperature_sensor rpi = False
#~#

View file

@ -29,12 +29,11 @@
[crowsnest]
log_path: ~/printer_data/logs/crowsnest.log
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
no_proxy: false
## LEGACY
[cam 1]
mode: ustreamer # ustreamer - Provides mjpg and snapshots. (All devices)
# camera-streamer - Provides webrtc, mjpg and snapshots. (rpi + Raspi OS based only)
@ -42,19 +41,8 @@ enable_rtsp: false # If camera-streamer is used, this enabl
rtsp_port: 8554 # Set different ports for each device!
port: 8080 # HTTP/MJPG Stream/Snapshot Port
device: /dev/video0 # See Log for available ...
resolution: 640x480 # widthxheight format
# resolution: 640x480 # widthxheight format
resolution: 1280x720 # widthxheight format
max_fps: 15 # If Hardware Supports this it will be forced, otherwise ignored/coerced.
#custom_flags: # You can run the Stream Services with custom flags.
#v4l2ctl: # Add v4l2-ctl parameters to setup your camera, see Log what your cam is capable of.
# ## LIBCAMERA
# [cam 1]
# mode: camera-streamer # ustreamer - Provides mjpg and snapshots. (All devices)
# # enable_rtsp: false # If camera-streamer is used, this enables also usage of an rtsp server
# # rtsp_port: 8554 # Set different ports for each device!
# # port: 8080 # HTTP/MJPG Stream/Snapshot Port
# device: /dev/v4l/by-path/platform-3f801000.csi-video-index0 # See Log for available ...
# # resolution: 1920x1080 # widthxheight format
# # max_fps: 15 # If Hardware Supports this it will be forced, otherwise ignored/coerced.
# #custom_flags: # You can run the Stream Services with custom flags.
# #v4l2ctl: # Add v4l2-ctl parameters to setup your camera, see Log what your cam is capable of.

View file

@ -1,6 +1,7 @@
####################################################################
# Macros used for printing
# - BRUSHIE
# - BRUSHIES
# - CANCEL_PRINT
# - LOAD_FILAMENT
# - UNLOAD_FILAMENT
@ -38,6 +39,36 @@ gcode:
M118 printer not homed
{% endif %}
# BRUSHIES
[gcode_macro BRUSHIES]
gcode:
{% set x0=250 %}
{% set x1=190 %}
{% set y0=printer.toolhead.axis_maximum.y - 1 %}
{% set z0=2.0 %}
# {% set z_hop = printer['gcode_macro _USER_VARIABLE'].z_hop|int %}
{% set z_hop = 10 %}
{% if "xyz" in printer.toolhead.homed_axes %}
G0 Z{z_hop} F1000 # move Z to travel height
G0 X{x0} Y{y0} F6000 # move to x0/y0
G0 Z{z0} # lower
G0 X{x1} # l
G0 X{x0} # r
G0 X{x1} # l
G0 X{x0} # r
G0 X{x1} # l
G0 X{x0} # r
G0 X{x1} # l
G0 X{x0} # r
G0 X{x1} # l
G0 X{x0} # r
G0 X{x1} # l
G0 X{x0} # r
G0 Z{z_hop} F300 # move Z to travel height
{% else %}
M118 printer not homed
{% endif %}
# CANCEL_PRINT
[gcode_macro CANCEL_PRINT]

View file

@ -1,3 +1,4 @@
# vim: ft=config
[server]
host: 0.0.0.0
port: 7125
@ -51,8 +52,9 @@ path: ~/fluidd
# [update_manager klipper]
# type: git_repo
# origin: https://github.com/Klipper3d/klipper.git
# primary_branch: main
# path: ~/klipper
# origin: https://github.com/xkonni/klipper.git
[update_manager KlipperScreen]
type: git_repo
@ -62,12 +64,12 @@ env: ~/.KlipperScreen-env/bin/python
requirements: scripts/KlipperScreen-requirements.txt
install_script: scripts/KlipperScreen-install.sh
# [update_manager timelapse]
# type: git_repo
# primary_branch: main
# is_system_service: false
# path: ~/moonraker-timelapse
# origin: https://github.com/mainsail-crew/moonraker-timelapse.git
[update_manager timelapse]
type: git_repo
primary_branch: main
is_system_service: false
path: ~/moonraker-timelapse
origin: https://github.com/mainsail-crew/moonraker-timelapse.git
# [update_manager ercf]
# type: git_repo
@ -79,20 +81,20 @@ install_script: scripts/KlipperScreen-install.sh
[power voron-v2.4]
# type: tplink_smartplug
# address: 192.168.11.91
type: tasmota
address: pcu-eg-office-voronberry.nom
# password: mypassword
type: tasmota
address: pcu-ug-ws-voronberry.nom
# [timelapse]
[timelapse]
## Following basic configuration is default to most images and don't need
## to be changed in most scenarios. Only uncomment and change it if your
## Image differ from standard installations. In most common scenarios
## a User only need [timelapse] in there configuration.
##
## Directory where the generated video will be saved
# output_path: ~/timelapse/
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
@ -101,6 +103,7 @@ address: pcu-eg-office-voronberry.nom
type: git_repo
path: ~/crowsnest
origin: https://github.com/mainsail-crew/crowsnest.git
primary_branch: legacy/v3
# primary_branch: legacy/v3
primary_branch: master
managed_services: crowsnest
install_script: tools/install.sh

View file

@ -38,11 +38,10 @@ kinematics: corexy
max_velocity: 600
## regular
max_accel: 4000
max_accel_to_decel: 2000
## resonance testing
# max_accel: 10000
# max_accel_to_decel: 5000
##
# minimum_cruise_ratio: 0.5
max_z_velocity: 30 # Max 15 for 12V TMC Drivers, can increase for 24V
max_z_accel: 500
square_corner_velocity: 5.0
@ -366,7 +365,7 @@ max_adjust: 10
#*# [extruder]
#*#
#*# [probe]
#*# z_offset = -0.880
#*# z_offset = -1.100
#*#
#*# [input_shaper]
#*# shaper_type_x = 3hump_ei
@ -377,15 +376,15 @@ max_adjust: 10
#*# [bed_mesh default]
#*# version = 1
#*# points =
#*# -0.000973, 0.016527, 0.007777, 0.001527, 0.016527, -0.005973, 0.014027, 0.015277, 0.007777
#*# -0.003473, 0.012777, 0.009027, -0.005973, 0.011527, 0.000277, 0.021527, 0.002777, 0.012777
#*# 0.004027, 0.007777, 0.012777, 0.020277, 0.024027, 0.024027, 0.020277, 0.017777, 0.014027
#*# -0.005973, -0.008473, -0.002223, -0.003473, 0.019027, -0.003473, -0.003473, -0.002223, -0.003473
#*# -0.000973, -0.007223, -0.004723, 0.011527, -0.004723, -0.000973, 0.022777, 0.009027, -0.005973
#*# 0.001527, 0.015277, 0.036527, 0.015277, 0.014027, 0.012777, 0.021527, 0.016527, 0.019027
#*# -0.010973, 0.012777, -0.005973, -0.000973, 0.000277, -0.007223, 0.000277, -0.002223, -0.012223
#*# -0.007223, 0.005277, 0.006527, 0.015277, 0.011527, 0.024027, 0.011527, -0.012223, 0.001527
#*# -0.003473, -0.003473, 0.009027, -0.008473, 0.009027, 0.007777, 0.009027, -0.007223, -0.009723
#*# -0.004458, -0.003208, 0.004292, -0.001958, -0.008208, 0.000542, -0.004458, -0.000708, -0.013208
#*# -0.008208, 0.006792, -0.000708, 0.003042, -0.000708, 0.008042, 0.015542, 0.004292, 0.001792
#*# 0.000542, 0.004292, 0.013042, 0.021792, 0.020542, 0.006792, 0.009292, 0.001792, -0.009458
#*# -0.006958, 0.005542, 0.015542, 0.001792, 0.001792, -0.001958, -0.003208, -0.003208, -0.009458
#*# 0.004292, 0.001792, 0.015542, 0.038042, -0.005708, 0.013042, -0.000708, -0.014458, -0.015708
#*# 0.011792, 0.014292, 0.036792, 0.011792, 0.034292, 0.035542, -0.020708, -0.013208, -0.011958
#*# -0.005708, 0.003042, 0.003042, -0.004458, 0.014292, -0.008208, -0.040708, -0.038208, -0.046958
#*# -0.013208, -0.013208, 0.004292, -0.006958, 0.003042, -0.011958, 0.001792, -0.030708, -0.019458
#*# -0.016958, -0.011958, 0.004292, -0.004458, -0.004458, -0.004458, 0.006792, -0.015708, -0.014458
#*# x_count = 9
#*# y_count = 9
#*# mesh_x_pps = 2