diff --git a/3dsprinter_data/config/printer.cfg b/3dsprinter_data/config/printer.cfg deleted file mode 100644 index b2e1099..0000000 --- a/3dsprinter_data/config/printer.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[include shell_command.cfg] -[include fluidd.cfg] -[mcu] -serial: /dev/serial/by-id/ - -[virtual_sdcard] -path: /home/jeka/3dsprinter_data/gcodes -on_error_gcode: CANCEL_PRINT - -[printer] -kinematics: none -max_velocity: 1000 -max_accel: 1000 diff --git a/3dsprinter_data/config/crowsnest.conf b/printer_data/config/crowsnest.conf similarity index 98% rename from 3dsprinter_data/config/crowsnest.conf rename to printer_data/config/crowsnest.conf index 8d293a9..9829b07 100644 --- a/3dsprinter_data/config/crowsnest.conf +++ b/printer_data/config/crowsnest.conf @@ -29,7 +29,7 @@ [crowsnest] -log_path: /home/jeka/3dsprinter_data/logs/crowsnest.log +log_path: /home/jeka/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 diff --git a/printer_data/config/crowsnest.conf.2024-07-05-2151 b/printer_data/config/crowsnest.conf.2024-07-05-2151 new file mode 100644 index 0000000..9829b07 --- /dev/null +++ b/printer_data/config/crowsnest.conf.2024-07-05-2151 @@ -0,0 +1,47 @@ +#### crowsnest.conf +#### This is a typical default config. +#### Also used as default in mainsail / MainsailOS +#### See: +#### https://github.com/mainsail-crew/crowsnest/blob/master/README.md +#### for details to configure to your needs. + + +##################################################################### +#### ##### +#### Information about ports and according URL's ##### +#### ##### +##################################################################### +#### ##### +#### Port 8080 equals /webcam/?action=[stream/snapshot] ##### +#### Port 8081 equals /webcam2/?action=[stream/snapshot] ##### +#### Port 8082 equals /webcam3/?action=[stream/snapshot] ##### +#### Port 8083 equals /webcam4/?action=[stream/snapshot] ##### +#### ##### +#### Note: These ports are default for most Mainsail ##### +#### installations. To use any other port would involve ##### +#### changing the proxy configuration or using directly ##### +#### http://:/?action=[stream/snapshot] ##### +#### ##### +##################################################################### +#### RTSP Stream URL: ( if enabled and supported ) ##### +#### rtsp://:/stream.h264 ##### +##################################################################### + + +[crowsnest] +log_path: /home/jeka/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 + +[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/video0 # 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. diff --git a/printer_data/config/macros.cfg b/printer_data/config/macros.cfg new file mode 100644 index 0000000..19985bc --- /dev/null +++ b/printer_data/config/macros.cfg @@ -0,0 +1,221 @@ +# This file provides examples of Klipper G-Code macros. The snippets +# in this file may be copied into the main printer.cfg file and +# customized. + +# See docs/Config_Reference.md for a description of parameters. +# +# 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 + + +###################################################################### +# Start Print and End Print +###################################################################### + +# Replace the slicer's custom start and end g-code scripts with +# START_PRINT and END_PRINT. See docs/Slicers.md for more information on using these macros. + +[gcode_macro START_PRINT] +gcode: + {% set BED_TEMP = params.BED_TEMP|default(60)|float %} + {% set EXTRUDER_TEMP = params.EXTRUDER_TEMP|default(190)|float %} + # Start bed heating + M140 S{BED_TEMP} + # Use absolute coordinates + G90 + # Reset the G-Code Z offset (adjust Z offset if needed) + SET_GCODE_OFFSET Z=0.0 + # Home the printer + G28 + BED_MESH_PROFILE LOAD=default + # Move the nozzle near the bed + G1 Z5 F3000 + # Move the nozzle very close to the bed + G1 Z0.15 F300 + # Wait for bed to reach temperature + M190 S{BED_TEMP} + # Set and wait for nozzle to reach temperature + M109 S{EXTRUDER_TEMP} + +[gcode_macro END_PRINT] +gcode: + # Turn off bed, extruder, and fan + M140 S0 + M104 S0 + M106 S0 + # Move nozzle away from print while retracting + G91 + G1 X-2 Y-2 E-3 F300 + # Raise nozzle by 10mm + G1 Z10 F3000 + G90 + # Disable steppers + M84 + + +###################################################################### +# Beeper +###################################################################### + +# M300 : Play tone. Beeper support, as commonly found on usual LCD +# displays (i.e. RepRapDiscount 2004 Smart Controller, RepRapDiscount +# 12864 Full Graphic). This defines a custom I/O pin and a custom +# GCODE macro. Usage: +# M300 [P] [S] +# P is the tone duration, S the tone frequency. +# The frequency won't be pitch perfect. + +[pwm_cycle_time BEEPER_pin] +pin: EXP1_1 +# Beeper pin. This parameter must be provided. +# ar37 is the default RAMPS/MKS pin. +value: 0 +# Silent at power on, set to 1 if active low. +shutdown_value: 0 +# Disable at emergency shutdown (no PWM would be available anyway). +cycle_time: 0.001 +# Default PWM frequency : 0.001 = 1ms will give a tone of 1kHz +# Although not pitch perfect. + +[gcode_macro M300] +gcode: + # Use a default 1kHz tone if S is omitted. + {% set S = params.S|default(1000)|int %} + # Use a 10ms duration is P is omitted. + {% set P = params.P|default(100)|int %} + SET_PIN PIN=BEEPER_pin VALUE=0.5 CYCLE_TIME={ 1.0/S if S > 0 else 1 } + G4 P{P} + SET_PIN PIN=BEEPER_pin VALUE=0 + + +###################################################################### +# Filament Change +###################################################################### + +# M600: Filament Change. This macro will pause the printer, move the +# tool to the change position, and retract the filament 50mm. Adjust +# the retraction settings for your own extruder. After filament has +# been changed, the print can be resumed from its previous position +# with the "RESUME" gcode. + +[pause_resume] + +[gcode_macro M600] +gcode: + {% set X = params.X|default(50)|float %} + {% set Y = params.Y|default(0)|float %} + {% set Z = params.Z|default(10)|float %} + SAVE_GCODE_STATE NAME=M600_state + PAUSE + G91 + G1 E-.8 F2700 + G1 Z{Z} + G90 + G1 X{X} Y{Y} F3000 + G91 + G1 E-50 F1000 + RESTORE_GCODE_STATE NAME=M600_state + +###################################################################### +# Override M117 command with rawparams +###################################################################### + +# The macro below will override the default M117 command to echo the message. +# +# It uses the rawparams pseudo-variable that contains the full unparsed +# parameters that was passed to the M117 command. +# +# As this can include comments, we are trimming the text when a `;` or `#` is +# found, and escaping any existing `"` + +[gcode_macro M117] +rename_existing: M117.1 +gcode: + {% if rawparams %} + {% set escaped_msg = rawparams.split(';', 1)[0].split('\x23', 1)[0]|replace('"', '\\"') %} + SET_DISPLAY_TEXT MSG="{escaped_msg}" + RESPOND TYPE=command MSG="{escaped_msg}" + {% else %} + SET_DISPLAY_TEXT + {% endif %} + +# SDCard 'looping' (aka Marlin M808 commands) support +# +# Support SDCard looping +[sdcard_loop] + +# 'Marlin' style M808 compatibility macro for SDCard looping +[gcode_macro M808] +gcode: + {% if params.K is not defined and params.L is defined %}SDCARD_LOOP_BEGIN COUNT={params.L|int}{% endif %} + {% if params.K is not defined and params.L is not defined %}SDCARD_LOOP_END{% endif %} + {% if params.K is defined and params.L is not defined %}SDCARD_LOOP_DESIST{% endif %} + +# Cancel object (aka Marlin/RRF M486 commands) support +# +# Enable object exclusion +[exclude_object] + +[gcode_macro M486] +gcode: + # Parameters known to M486 are as follows: + # [C] Cancel the current object + # [P] Cancel the object with the given index + # [S] Set the index of the current object. + # If the object with the given index has been canceled, this will cause + # the firmware to skip to the next object. The value -1 is used to + # indicate something that isn’t an object and shouldn’t be skipped. + # [T] Reset the state and set the number of objects + # [U] Un-cancel the object with the given index. This command will be + # ignored if the object has already been skipped + + {% if 'exclude_object' not in printer %} + {action_raise_error("[exclude_object] is not enabled")} + {% endif %} + + {% if 'T' in params %} + EXCLUDE_OBJECT RESET=1 + + {% for i in range(params.T | int) %} + EXCLUDE_OBJECT_DEFINE NAME={i} + {% endfor %} + {% endif %} + + {% if 'C' in params %} + EXCLUDE_OBJECT CURRENT=1 + {% endif %} + + {% if 'P' in params %} + EXCLUDE_OBJECT NAME={params.P} + {% endif %} + + {% if 'S' in params %} + {% if params.S == '-1' %} + {% if printer.exclude_object.current_object %} + EXCLUDE_OBJECT_END NAME={printer.exclude_object.current_object} + {% endif %} + {% else %} + EXCLUDE_OBJECT_START NAME={params.S} + {% endif %} + {% endif %} + + {% if 'U' in params %} + EXCLUDE_OBJECT RESET=1 NAME={params.U} + {% endif %} diff --git a/3dsprinter_data/config/moonraker.conf b/printer_data/config/moonraker.conf similarity index 68% rename from 3dsprinter_data/config/moonraker.conf rename to printer_data/config/moonraker.conf index c7f37fc..86f5a17 100644 --- a/3dsprinter_data/config/moonraker.conf +++ b/printer_data/config/moonraker.conf @@ -1,7 +1,7 @@ [server] host: 0.0.0.0 port: 7125 -klippy_uds_address: /home/jeka/3dsprinter_data/comms/klippy.sock +klippy_uds_address: /home/jeka/printer_data/comms/klippy.sock [authorization] trusted_clients: @@ -10,6 +10,9 @@ trusted_clients: 169.254.0.0/16 172.16.0.0/12 192.168.0.0/16 + 192.168.77.0/24 + 192.168.75.0/24 + 192.168.47.0/24 FE80::/10 ::1/128 cors_domains: @@ -35,12 +38,6 @@ path: ~/fluidd-config origin: https://github.com/fluidd-core/fluidd-config.git managed_services: klipper -[update_manager fluidd] -type: web -channel: stable -repo: fluidd-core/fluidd -path: ~/fluidd - [update_manager moonraker-telegram-bot] type: git_repo path: ~/moonraker-telegram-bot @@ -49,34 +46,31 @@ env: ~/moonraker-telegram-bot-env/bin/python requirements: scripts/requirements.txt install_script: scripts/install.sh -[spoolman] -server: http://192.168.47.44:7912 - - -[update_manager Spoolman] -type: zip -channel: stable -repo: Donkie/Spoolman -path: /home/jeka/Spoolman -virtualenv: .venv -requirements: requirements.txt -persistent_files: - .venv - .env -managed_services: Spoolman - - -# 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 klipper-macros] +type: git_repo +origin: https://github.com/jschuh/klipper-macros.git +path: ~/klipper-macros +primary_branch: main +is_system_service: False +managed_services: klipper + +[update_manager klipper-backup-3dsprinter] +type: git_repo +path: ~/klipper-backup-3dsprinter +origin: https://github.com/Staubgeborener/klipper-backup.git +managed_services: moonraker +primary_branch: main + [power printer] type: gpio pin: gpiochip1/gpio26 off_when_shutdown: true restart_klipper_when_powered: true initial_state: off + diff --git a/3dsprinter_data/config/moonraker.conf.backup b/printer_data/config/moonraker.conf.backup similarity index 66% rename from 3dsprinter_data/config/moonraker.conf.backup rename to printer_data/config/moonraker.conf.backup index 2d04399..e8d95be 100644 --- a/3dsprinter_data/config/moonraker.conf.backup +++ b/printer_data/config/moonraker.conf.backup @@ -1,7 +1,7 @@ [server] host: 0.0.0.0 port: 7125 -klippy_uds_address: /home/jeka/3dsprinter_data/comms/klippy.sock +klippy_uds_address: /home/jeka/printer_data/comms/klippy.sock [authorization] trusted_clients: @@ -35,12 +35,6 @@ path: ~/fluidd-config origin: https://github.com/fluidd-core/fluidd-config.git managed_services: klipper -[update_manager fluidd] -type: web -channel: stable -repo: fluidd-core/fluidd -path: ~/fluidd - [update_manager moonraker-telegram-bot] type: git_repo path: ~/moonraker-telegram-bot @@ -48,20 +42,3 @@ origin: https://github.com/nlef/moonraker-telegram-bot.git env: ~/moonraker-telegram-bot-env/bin/python requirements: scripts/requirements.txt install_script: scripts/install.sh - -[spoolman] -server: http://192.168.47.44:7912 - - -[update_manager Spoolman] -type: zip -channel: stable -repo: Donkie/Spoolman -path: /home/jeka/Spoolman -virtualenv: .venv -requirements: requirements.txt -persistent_files: - .venv - .env -managed_services: Spoolman - diff --git a/printer_data/config/printer.cfg b/printer_data/config/printer.cfg new file mode 100644 index 0000000..ec39269 --- /dev/null +++ b/printer_data/config/printer.cfg @@ -0,0 +1,194 @@ +[include shell_command.cfg] +[include fluidd.cfg] + +[virtual_sdcard] +path: /home/jeka/printer_data/gcodes +on_error_gcode: CANCEL_PRINT + +[include macros.cfg] + +[mcu] +serial: /dev/serial/by-id/usb-Arduino__www.arduino.cc__0042_75638303037351301112-if00 + +[bed_screws] +screw1: 15,5 +screw1_name: Front left screw +screw2: 15,180 +screw2_name: Rear left screw +screw3: 285,5 +screw3_name: Front right screw +screw4: 285,180 +screw4_name: Rear right screw + +[screws_tilt_adjust] +horizontal_move_z: 5 +screw1: 8,181 +screw1_name: back left +screw2: 298,181 +screw2_name: back right +screw3: 8,21 +screw3_name: front left +screw4: 298,21 +screw4_name: front right +screw_thread: CW-M3 + +[bltouch] +sensor_pin: PD3 #^PD3 +control_pin: PB5 +x_offset: 0 +y_offset: -20 +speed: 10.0 +samples: 2 +speed: 2 +#z_offset: 0.0 +pin_up_reports_not_triggered: True +pin_up_touch_mode_reports_triggered: False +#pin_up_touch_mode_reports_triggered: True + + +[safe_z_home] +home_xy_position: 145, 95# Change coordinates to the center of your print bed +speed: 50 +z_hop: 10 # Move up 10mm +z_hop_speed: 5 + +[bed_mesh] +speed: 60 +horizontal_move_z: 5 +mesh_min: 20,20 +mesh_max: 285,150 +probe_count: 5,3 +mesh_pps: 2,2 +fade_start: 1 +fade_end: 10 +fade_target: 0 + +[stepper_x] +step_pin: PF0 +dir_pin: !PF1 +enable_pin: !PD7 +microsteps: 16 +rotation_distance: 40 +endstop_pin: ^!PE5 +position_endstop: 0 +position_max: 305 +homing_speed: 50 + +[stepper_y] +step_pin: PF6 +dir_pin: !PF7 +enable_pin: !PF2 +microsteps: 16 +rotation_distance: 40 +endstop_pin: ^!PJ0 +position_endstop: 189 +position_max: 189 +homing_speed: 50 + +[stepper_z] +step_pin: PL3 +dir_pin: PL1 +enable_pin: !PK0 +microsteps: 16 +rotation_distance: 8 +endstop_pin: ^!PD2 +endstop_pin: probe:z_virtual_endstop +#homing_positive_dir: true +#position_endstop: 278 +position_max: 270 +position_min: -6 +homing_speed = 15 + +[extruder] +max_extrude_only_distance: 101.0 +step_pin: PA4 +dir_pin: PA6 +enable_pin: !PA2 +microsteps: 16 +rotation_distance: 7.920 +nozzle_diameter: 0.400 +filament_diameter: 1.750 +heater_pin: PB4 +sensor_type: EPCOS 100K B57560G104F +sensor_pin: PK5 +#control: pid +#pid_Kp: 22.2 +#pid_Ki: 1.08 +#pid_Kd: 114 +min_temp: 0 +max_temp: 250 + +[heater_bed] +heater_pin: PH5 +sensor_type: EPCOS 100K B57560G104F +sensor_pin: PK6 +control: watermark +min_temp: 0 +max_temp: 130 + +[fan] +pin: PH6 + +[printer] +kinematics: corexy +max_velocity: 500 +max_accel: 5000 +max_z_accel: 30 +max_z_velocity: 30 + +[display] +lcd_type: hd44780 +rs_pin: EXP1_4 +e_pin: EXP1_3 +d4_pin: EXP1_5 +d5_pin: EXP1_6 +d6_pin: EXP1_7 +d7_pin: EXP1_8 +encoder_pins: ^EXP2_3, ^EXP2_5 +click_pin: ^!EXP1_2 + + +[board_pins] +aliases: + # Common EXP1 header found on many "all-in-one" ramps clones + EXP1_1=PC0, EXP1_3=PH0, EXP1_5=PA1, EXP1_7=PA5, EXP1_9=, + EXP1_2=PC2, EXP1_4=PH1, EXP1_6=PA3, EXP1_8=PA7, EXP1_10=<5V>, + # EXP2 header + EXP2_1=PB3, EXP2_3=PC6, EXP2_5=PC4, EXP2_7=PL0, EXP2_9=, + EXP2_2=PB1, EXP2_4=PB0, EXP2_6=PB2, EXP2_8=PG0, EXP2_10= + # Pins EXP2_1, EXP2_6, EXP2_2 are also MISO, MOSI, SCK of bus "spi" + # Note, some boards wire: EXP2_8=, EXP2_10=PG0 + +#*# <---------------------- 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 +#*# x_count = 5 +#*# y_count = 3 +#*# mesh_x_pps = 2 +#*# mesh_y_pps = 2 +#*# algo = lagrange +#*# tension = 0.2 +#*# min_x = 20.0 +#*# max_x = 285.0 +#*# min_y = 20.0 +#*# max_y = 150.0 +#*# +#*# [bltouch] +#*# z_offset = 2.290 diff --git a/3dsprinter_data/config/shell_command.cfg b/printer_data/config/shell_command.cfg similarity index 96% rename from 3dsprinter_data/config/shell_command.cfg rename to printer_data/config/shell_command.cfg index 34e7581..74f0b06 100644 --- a/3dsprinter_data/config/shell_command.cfg +++ b/printer_data/config/shell_command.cfg @@ -1,7 +1,7 @@ -[gcode_shell_command hello_world] -command: echo hello world -timeout: 2. -verbose: True -[gcode_macro HELLO_WORLD] -gcode: +[gcode_shell_command hello_world] +command: echo hello world +timeout: 2. +verbose: True +[gcode_macro HELLO_WORLD] +gcode: RUN_SHELL_COMMAND CMD=hello_world \ No newline at end of file diff --git a/3dsprinter_data/config/telegram.conf b/printer_data/config/telegram.conf similarity index 62% rename from 3dsprinter_data/config/telegram.conf rename to printer_data/config/telegram.conf index 6d5b90b..f681308 100644 --- a/3dsprinter_data/config/telegram.conf +++ b/printer_data/config/telegram.conf @@ -1,12 +1,13 @@ # Please refer to the wiki(https://github.com/nlef/moonraker-telegram-bot/wiki) for detailed information on how to configure the bot [bot] -server: localhost -bot_token: AweSomeBotToken -chat_id: 0 +server: 192.168.47.5:7125 +bot_token: 7093071502:AAFGW5ygvu9oRgsZsS0CpU8-hy8x_oaxlsc +chat_id: 158812314 [camera] -host: http://localhost:8080/?action=stream +host: http://192.168.47.5:7575/webcam/?action=stream + [progress_notification] percent: 5