diff --git a/3dsprinter_data/config/crowsnest.conf b/3dsprinter_data/config/crowsnest.conf index ada3651..18d05be 100644 --- a/3dsprinter_data/config/crowsnest.conf +++ b/3dsprinter_data/config/crowsnest.conf @@ -36,12 +36,14 @@ no_proxy: false [cam 1] mode: ustreamer # ustreamer - Provides mjpg and snapshots. (All devices) - # camera-streamer - Provides webrtc, mjpg and snapshots. (rpi + Raspi OS based only) -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/video1 # See Log for available ... +device: /dev/v4l/by-id/usb-_Webcam_C110-video-index0 # See Log for available ... resolution: 640x480 # 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. + +[cam 2] +mode: ustreamer +port: 8081 +device: /dev/v4l/by-id/usb-046d_0825_5C2671A0-video-index0 +resolution: 640x480 +max_fps: 15 diff --git a/3dsprinter_data/config/jschuh_klipper_macros.cfg b/3dsprinter_data/config/jschuh_klipper_macros.cfg new file mode 100644 index 0000000..d45799e --- /dev/null +++ b/3dsprinter_data/config/jschuh_klipper_macros.cfg @@ -0,0 +1,72 @@ +# All customizations are documented in globals.cfg. Just copy a variable from +# there into the section below, and change the value to meet your needs. + +[gcode_macro _km_options] +# These are examples of some likely customizations: +# Any sheets in the below list will be available with a configurable offset. +#variable_bed_surfaces: ['smooth_1','texture_1'] +# Length (in mm) of filament to load (bowden tubes will be longer). +#variable_load_length: 90.0 +# Hide the Octoprint LCD menu since I don't use it. +variable_menu_show_octoprint: False +# Customize the filament menus (up to 10 entries). +variable_menu_temperature: [ + {'name' : 'PLA', 'extruder' : 225.0, 'bed' : 60.0}, + {'name' : 'PETG', 'extruder' : 230.0, 'bed' : 85.0}, + {'name' : 'ABS', 'extruder' : 245.0, 'bed' : 110.0, 'chamber' : 60}] +# Length of filament (in millimeters) to purge at print start. +variable_start_purge_length: 30 # This value works for most setups. +gcode: # This line is required by Klipper. +# Any code you put here will run at klipper startup, after the initialization +# for these macros. For example, you could uncomment the following line to +# automatically adjust your bed surface offsets to account for any changes made +# to your Z endstop or probe offset. +# ADJUST_SURFACE_OFFSETS + +# BACKUP config to git.npau.ru +[gcode_macro update_git] +gcode: + {% set message = params.MESSAGE|default() %} + {% if message %} + RUN_SHELL_COMMAND CMD=update_git_script_message PARAMS="'{params.MESSAGE}'" + {% else %} + RUN_SHELL_COMMAND CMD=update_git_script + {% endif %} + +[gcode_shell_command update_git_script] +command: bash -c "bash $HOME/klipper-backup-3dsprinter/script.sh" +timeout: 90.0 +verbose: True + +[gcode_shell_command update_git_script_message] +command: bash -c "bash $HOME/klipper-backup-3dsprinter/script.sh $0" +timeout: 90.0 +verbose: True + +# This line includes all the standard macros. +[include klipper-macros/*.cfg] +# Uncomment to include features that require specific hardware support. +# LCD menu support for features like bed surface selection and pause next layer. +[include klipper-macros/optional/lcd_menus.cfg] +# Optimized bed leveling +[include klipper-macros/optional/bed_mesh.cfg] + +# The sections below here are required for the macros to work. If your config +# already has some of these sections you should merge the duplicates into one +# (or if they are identical just remove one of them). +[idle_timeout] +gcode: + _KM_IDLE_TIMEOUT # This line must be in your idle_timeout section. + +[pause_resume] + +[respond] + +[save_variables] +filename: ~/3dsprinter_data/variables.cfg # UPDATE THIS FOR YOUR PATH!!! + +[virtual_sdcard] +path: ~/3dsprinter_data/gcodes +on_error_gcode: CANCEL_PRINT + +[display_status] \ No newline at end of file diff --git a/3dsprinter_data/config/moonraker.conf b/3dsprinter_data/config/moonraker.conf index b9b73de..06a04f3 100644 --- a/3dsprinter_data/config/moonraker.conf +++ b/3dsprinter_data/config/moonraker.conf @@ -67,9 +67,29 @@ primary_branch: main is_system_service: False managed_services: klipper -[power printer] +# Notifier +[notifier telegram] +# url: tgram://{bottoken}/{ChatID} +url: tgram://7093071502:AAFGW5ygvu9oRgsZsS0CpU8-hy8x_oaxlsc/158812314 +events: started, complete, error, cancelled, paused, resumed +body_format: text +title: ⚠️ 3dsprinter Сообщение. +body: Статус принтера изменен на {event_name}. Файл: '{event_args[1].filename}'. +attach: http://192.168.47.44/webcam/?action=snapshot + +[power printergpio] type: gpio -pin: gpiochip1/gpio26 +pin: gpiochip1/gpio113 off_when_shutdown: true restart_klipper_when_powered: true initial_state: off + +[power haas_switch_13] +type: homeassistant +protocol: http +address: 192.168.47.8 +port: 8123 +device: light.m0f_13 +token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiI5NTFjMzRlZmYwYjg0NTcyOTJjN2EzMTk0M2ZlMWI0YSIsImlhdCI6MTcyMTY3MDI0MiwiZXhwIjoyMDM3MDMwMjQyfQ.cHfHviVBNokbxTFKWdHoYGtI_GyKaI1N2xvNV94LmrY +domain: light +status_delay: 1.0 diff --git a/3dsprinter_data/config/printer.cfg b/3dsprinter_data/config/printer.cfg index b92ae1d..0539f9e 100644 --- a/3dsprinter_data/config/printer.cfg +++ b/3dsprinter_data/config/printer.cfg @@ -1,11 +1,15 @@ -[include shell_command.cfg] -[include fluidd.cfg] +[include jschuh_klipper_macros.cfg] -[virtual_sdcard] -path: /home/jeka/3dsprinter_data/gcodes -on_error_gcode: CANCEL_PRINT +[filament_switch_sensor runout] +switch_pin: !PG5 +pause_on_runout: True +insert_gcode: +runout_gcode: -[include macros.cfg] +[temperature_sensor odroidC2] +sensor_type: temperature_host +min_temp: 10 +max_temp: 100 [mcu] serial: /dev/serial/by-id/usb-Arduino__www.arduino.cc__0042_75638303037351301112-if00 @@ -116,7 +120,10 @@ sensor_pin: PK5 #pid_Ki: 1.08 #pid_Kd: 114 min_temp: 0 -max_temp: 250 +max_temp: 270 +pressure_advance: 0.5 +max_extrude_cross_section: 99999 +#min_extrude_temp: 0 [heater_bed] heater_pin: PH5 @@ -126,9 +133,24 @@ control: watermark min_temp: 0 max_temp: 130 +[verify_heater heater_bed] +max_error: 130 +check_gain_time: 300 +hysteresis: 3 +heating_gain: 1 + +[verify_heater extruder] +max_error: 120 +check_gain_time: 20 +hysteresis: 5 +heating_gain: 2 + [fan] pin: PH6 +[output_pin beeper] +pin: EXP1_1 + [printer] kinematics: corexy max_velocity: 500 @@ -162,23 +184,12 @@ aliases: #*# <---------------------- SAVE_CONFIG ----------------------> #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated. #*# -#*# [extruder] -#*# control = pid -#*# pid_kp = 25.328 -#*# pid_ki = 1.578 -#*# pid_kd = 101.628 -#*# -#*# [heater_bed] -#*# pid_kp = 72.255 -#*# pid_ki = 1.487 -#*# pid_kd = 877.904 -#*# #*# [bed_mesh default] #*# version = 1 #*# points = -#*# -0.037500, -0.042500, -0.027500, -0.016250, 0.016250 -#*# -0.017500, -0.006250, 0.042500, 0.056250, 0.036250 -#*# 0.045000, 0.062500, 0.098750, 0.116250, 0.076250 +#*# 0.052500, 0.021250, 0.022500, 0.058750, 0.073750 +#*# 0.027500, -0.008750, 0.022500, 0.041250, 0.058750 +#*# 0.100000, 0.095000, 0.126250, 0.146250, 0.163750 #*# x_count = 5 #*# y_count = 3 #*# mesh_x_pps = 2 @@ -191,4 +202,10 @@ aliases: #*# max_y = 150.0 #*# #*# [bltouch] -#*# z_offset = 2.290 +#*# z_offset = 2.360 +#*# +#*# [extruder] +#*# control = pid +#*# pid_kp = 26.528 +#*# pid_ki = 1.579 +#*# pid_kd = 111.418 diff --git a/3dsprinter_data/config/telegram.conf b/3dsprinter_data/config/telegram.conf index 8046fc3..1a87d47 100644 --- a/3dsprinter_data/config/telegram.conf +++ b/3dsprinter_data/config/telegram.conf @@ -12,10 +12,10 @@ host: http://192.168.47.44/webcam/?action=stream [progress_notification] percent: 5 height: 5 -time: 5 +#time: 5 -[timelapse] -cleanup: true -height: 0.2 -time: 5 -target_fps: 30 +#[timelapse] +#cleanup: true +#height: 0.2 +#time: 5 +#target_fps: 30