diff --git a/basic_macros.cfg b/basic_macros.cfg index 31aaad2..5de6f4c 100644 --- a/basic_macros.cfg +++ b/basic_macros.cfg @@ -15,6 +15,7 @@ gcode: SET_HEATER_TEMPERATURE HEATER=extruder TARGET={hotendTemp|float*0.6} # Set extruder chamber warm temp SET_HEATER_TEMPERATURE HEATER=heater_bed TARGET={bedTemp} # Set bed temp to warm while starting up + SET_DOCKABLE_PROBE AUTO_ATTACH_DETACH=1 # Disable probe attach/detach G28 # home after setting temps M117 Waiting for bed temperature... TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={bedTemp} MAXIMUM={bedTemp+1} # Wait for bed temp (within 1 degree) @@ -22,13 +23,16 @@ gcode: CHAMBER_WARMER TEMPERATURE={chamberTemp} # Warm chamber {% endif %} SET_HEATER_TEMPERATURE HEATER=extruder TARGET={hotendTemp|float*0.8} # Set extruder don't drip temp + SET_DOCKABLE_PROBE AUTO_ATTACH_DETACH=1 # Disable probe attach/detach + ATTACH_PROBE FAST_TILT # Z-Tilt after soak - DETACH_PROBE_CHECKED # Ensure probe is detached + DETACH_PROBE # Ensure probe is detached + SET_DOCKABLE_PROBE AUTO_ATTACH_DETACH=1 # Enable probe attach/detach G90 # Absolute positioning G1 X{x_park} Y{y_park} F{travel_speed * 60} # Move to park position G1 X{x_park} Y{y_park} Z{z_park} F{z_speed * 60} # Park nozzle on bed to prevent ooze M109 S{hotendTemp} # Set extruder to printing temperature - PURGE_Y # Purge + PURGE_X # Purge M117 Printing... [gcode_macro CHAMBER_WARMER] @@ -144,7 +148,7 @@ gcode: M117 Filament unload complete! [gcode_macro PURGE_X] -description: Purges along Y in the positive direction, and half a line back +description: Purges along X in the positive direction, and half a line back gcode: # User parameters {% set x_start = 20 %} @@ -158,7 +162,7 @@ gcode: G1 E10 F{10*60} # Prepurge in place before line G1 X{x_start + length} Y{y_start} E15 F{10*60} # Purge length in positive Y G1 X{x_start + length} Y{y_start + 0.5} F{10*60} # Move 0.5 positive in X for return line - G1 X{x_start + length - 2} Y{y_start + 0.5} E10 F{10*60} # Purge half a line the other direction + G1 X{x_start + length / 2} Y{y_start + 0.5} E10 F{10*60} # Purge half a line the other direction G92 E0 # Reset extruder position [gcode_macro PURGE_Y] diff --git a/moonraker.conf b/moonraker.conf index 1ff964a..fa70883 100644 --- a/moonraker.conf +++ b/moonraker.conf @@ -19,12 +19,17 @@ cors_domains: http://*.lan http://*.home http://*.far + http://vzbot.home + # Figure out why this is required. + # I don't open ports, so not a big deal + * trusted_clients: 10.0.0.0/8 127.0.0.0/8 169.254.0.0/16 172.16.0.0/12 192.168.0.0/16 + 192.168.2.0/24 192.168.25.0/24 FE80::/10 ::1/128 diff --git a/printer.cfg b/printer.cfg index ead94bf..f8121a4 100644 --- a/printer.cfg +++ b/printer.cfg @@ -42,6 +42,7 @@ max_z_velocity: 15 max_z_accel: 45 square_corner_velocity: 8 +[temperature_combined] [temperature_sensor Skr_Mini] sensor_type: temperature_mcu min_temp: 0 @@ -52,18 +53,23 @@ sensor_type: temperature_host min_temp: 0 max_temp: 100 -[temperature_sensor chamber] +[temperature_sensor _chamber1] sensor_type: Generic 3950 sensor_pin: skrPico:gpio27 min_temp: 0 max_temp: 100 -[temperature_sensor chamber2] +[temperature_sensor _chamber2] sensor_type: ATC Semitec 104GT-2 sensor_pin: skrPico:gpio26 min_temp: 0 max_temp: 100 +[temperature_sensor chamber] +sensor_type: temperature_combined +sensors: temperature_sensor _chamber1, temperature_sensor _chamber2 +type:mean + ##################################################################### # X/Y Stepper Settings ##################################################################### @@ -86,7 +92,7 @@ uart_pin: PC11 tx_pin: PC10 uart_address: 0 interpolate: False -run_current: 0.9 +run_current: 1.1 sense_resistor: 0.110 stealthchop_threshold: 0 driver_SGTHRS: 90 # 255 is most sensitive value, 0 is least sensitive @@ -110,10 +116,10 @@ uart_pin: PC11 tx_pin: PC10 uart_address: 2 interpolate: False -run_current: 0.9 +run_current: 1.1 sense_resistor: 0.110 stealthchop_threshold: 0 -driver_SGTHRS: 100 # 255 is most sensitive value, 0 is least sensitive +driver_SGTHRS: 90 # 255 is most sensitive value, 0 is least sensitive diag_pin: ^PC1 @@ -212,22 +218,22 @@ timeout: 1800 [dockable_probe] pin: skrPico:gpio25 -sample_retract_dist: 4.0 -samples: 1 -dock_position: 120, 115.5, 10 +dock_position: 120, 115.5 approach_position: 90, 115.5 detach_position: 120, 80 -check_open_attach: True -dock_fixed_z: True +z_hop: 20.0 dock_retries: 3 attach_speed: 50 detach_speed: 15 travel_speed: 500 -allow_delayed_detach: True +auto_attach_detach: True +check_open_attach: True +sample_retract_dist: 4.0 +samples: 1 x_offset: 30 y_offset: -2.4 -z_offset = 14.805 +z_offset = 9.355 [bed_mesh] speed: 120 diff --git a/sensorless.cfg b/sensorless.cfg index 35c5883..5290ba6 100644 --- a/sensorless.cfg +++ b/sensorless.cfg @@ -64,6 +64,9 @@ gcode: {% if home_all or 'Z' in params %} + G90 # Absolute positioning + # park above bed center + G1 X{(printer.toolhead.axis_maximum.x/2)-30} Y{(printer.toolhead.axis_maximum.y/2)+2.4} G28 Z G91 {% endif %} diff --git a/tri_zero.cfg b/tri_zero.cfg index b5e192d..4cdf149 100644 --- a/tri_zero.cfg +++ b/tri_zero.cfg @@ -83,13 +83,14 @@ retry_tolerance: 0.0125 [gcode_macro FAST_TILT] gcode: - Z_TILT_ADJUST horizontal_move_z=18 retry_tolerance=1.00 - Z_TILT_ADJUST horizontal_move_z=16.25 - G28 Z - -[gcode_macro DETACH_PROBE_CHECKED] -description: Only detaches the probe if it's attached -gcode: - {% if printer.probe.last_query == 1 %} - DETACH_PROBE + # Home first if needed + {% if printer.toolhead.homed_axes != "xyz" %} + G28 {% endif %} + SET_DOCKABLE_PROBE AUTO_ATTACH_DETACH=0 + ATTACH_PROBE + Z_TILT_ADJUST horizontal_move_z=18 retry_tolerance=1.00 + Z_TILT_ADJUST horizontal_move_z=16 + G28 Z + DETACH_PROBE +