AWD

2022-12-28 20:13:47 -08:00
9 changed files with 93 additions and 31 deletions
--- a/basic_macros.cfg
+++ b/basic_macros.cfg
@ -206,3 +206,10 @@ gcode:
    #       %}{'%s=%s' % (p, params[p])}{% 
    #      endfor %}

+[gcode_macro ENABLE_MOTORS]
+gcode:
+    SET_STEPPER_ENABLE STEPPER=stepper_x ENABLE=1
+    SET_STEPPER_ENABLE STEPPER=stepper_x1 ENABLE=1
+    SET_STEPPER_ENABLE STEPPER=stepper_y ENABLE=1
+    SET_STEPPER_ENABLE STEPPER=stepper_y1 ENABLE=1
+    SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1
--- a/calibration_macros.cfg
+++ b/calibration_macros.cfg
@ -88,7 +88,7 @@ gcode:


    # Go to starting position
-    G0 X{x_min} Y{y_min} Z{10} F{speed*60}
+    G0 X{x_min} Y{y_min} Z{20} F{speed*60}

    {% for i in range(iterations) %}
        # Large pattern
--- a/fans.cfg
+++ b/fans.cfg
@ -1,11 +1,17 @@
 [multi_pin driver_fan_pins]
 pins: PD12, PD13

-[temperature_sensor mcu_temp]
+[temperature_sensor Octopus Pro]
 sensor_type: temperature_mcu
 min_temp: 10
 max_temp: 100

+[temperature_sensor SKR Mini V2]
+sensor_type: temperature_mcu
+sensor_mcu: skr
+min_temp: 10
+max_temp: 100
+
 [fan]
 ##	Print Cooling Fan - FAN0 Connector
 pin: PA8
--- a/moonraker.conf
+++ b/moonraker.conf
@ -1,11 +1,9 @@
 [server]
 host: 0.0.0.0
 port: 7125
-enable_debug_logging: False
 klippy_uds_address: /tmp/klippy_uds

 [database]
-database_path: /home/kdb424/.moonraker_database

 [authorization]
 trusted_clients:
@ -29,8 +27,6 @@ cors_domains:
    http://*://app.fluidd.xyz

 [file_manager]
-config_path: /home/kdb424/klipper_config
-log_path: /home/kdb424/klipper_logs
 enable_object_processing: True

 [octoprint_compat]
--- a/printer.cfg
+++ b/printer.cfg
@ -30,6 +30,9 @@ square_corner_velocity: 8
 [mcu]
 serial: /dev/serial/by-id/usb-Klipper_stm32f446xx_3F003E001650534E4E313420-if00

+[mcu skr]
+serial: /dev/serial/by-id/usb-Klipper_stm32f103xe_33FFD8055646303527842243-if00
+
 [heater_bed]
 heater_pin: PA3
 sensor_type: NTC 100K MGB18-104F39050L32
--- a/purge_bucket.cfg
+++ b/purge_bucket.cfg
@ -18,7 +18,7 @@ variable_purge_ret:            0                 ; Retract length, in mm, after
 variable_ooze_dwell:           1                 ; Dwell/wait time, in seconds, after purging and retracting.

 # Adjust this so that your nozzle scrubs within the brush. Currently defaulted to be a lot higher for safety. Be careful not to go too low!
-variable_brush_top:            6
+variable_brush_top:            8

 # These parameters define your scrubbing, travel speeds, safe z clearance and how many times you want to wipe. Update as necessary. Wipe 
 # direction is randomized based off whether the left or right bucket is randomly selected in the purge & scrubbing routine.
--- a/sensorless.cfg
+++ b/sensorless.cfg
@ -9,7 +9,7 @@ gcode:
    {action_respond_info("Sensorless home x")}
    # Set current for sensorless homing
    SET_TMC_CURRENT STEPPER=stepper_x CURRENT={HOME_CUR}
-    #SET_TMC_CURRENT STEPPER=stepper_x1 CURRENT={HOME_CUR}  # AWD
+    SET_TMC_CURRENT STEPPER=stepper_x1 CURRENT={HOME_CUR}  # AWD
    # Pause to ensure driver stall flag is clear
    G4 P2200
    # Home
@ -20,7 +20,7 @@ gcode:
    G91
    # Set current during print
    SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CUR}
-    #SET_TMC_CURRENT STEPPER=stepper_x1 CURRENT={RUN_CUR}  # AWD
+    SET_TMC_CURRENT STEPPER=stepper_x1 CURRENT={RUN_CUR}  # AWD

 [gcode_macro SENSORLESS_HOME_Y]
 gcode:
@ -33,7 +33,7 @@ gcode:
    {action_respond_info("Sensorless home Y")}
    # Set current for sensorless homing
    SET_TMC_CURRENT STEPPER=stepper_y CURRENT={HOME_CUR}
-    #SET_TMC_CURRENT STEPPER=stepper_y1 CURRENT={HOME_CUR}  # AWD
+    SET_TMC_CURRENT STEPPER=stepper_y1 CURRENT={HOME_CUR}  # AWD
    # Pause to ensure driver stall flag is clear
    G4 P2200
    # Home
@ -44,7 +44,7 @@ gcode:
    G90
    # Set current during print
    SET_TMC_CURRENT STEPPER=stepper_y CURRENT={RUN_CUR}
-    #SET_TMC_CURRENT STEPPER=stepper_y1 CURRENT={RUN_CUR}  # AWD
+    SET_TMC_CURRENT STEPPER=stepper_y1 CURRENT={RUN_CUR}  # AWD

 [homing_override]
 axes: xyz
--- a/sherpa_mini.cfg
+++ b/sherpa_mini.cfg
@ -16,9 +16,9 @@ max_extrude_only_accel: 1500
 min_temp: 0
 max_temp: 500

-step_pin: PG4
-dir_pin: !PC1
-enable_pin: !PA0
+step_pin: skr:PB3
+dir_pin: !skr:PB4
+enable_pin: !skr:PD2
 heater_pin: PA2
 sensor_type: PT1000
 sensor_pin: PF4
@ -42,7 +42,10 @@ pid_Kd = 130.787

 #settings for NEMA14 Stepper
 [tmc2209 extruder]
-uart_pin: PC7
+uart_pin: skr:PC11
+tx_pin: skr:PC10
+uart_address: 3
+interpolate: False
 #Run current is listed in RMS
 #run_current: 0.30 #min current, equivalent to 0.42A peak (Peak = RMS/0.707)
 run_current: 0.35 #max current, equivalent to 0.49A peak (Peak = RMS/0.707)
--- a/steppers.cfg
+++ b/steppers.cfg
@ -3,7 +3,7 @@ step_pin: PF13  # Drive0
 dir_pin: PF12
 enable_pin: !PF14
 endstop_pin: tmc2209_stepper_x:virtual_endstop
-microsteps: 32
+microsteps: 16
 rotation_distance: 40
 position_endstop: -3
 position_min: -3
@ -21,7 +21,30 @@ run_current: 2
 sense_resistor: 0.110
 stealthchop_threshold: 0
 diag_pin: ^PG6      # Set to MCU pin connected to TMC DIAG pin
-driver_SGTHRS: 60  # 255 is most sensitive value, 0 is least sensitive
+driver_SGTHRS: 70  # 255 is most sensitive value, 0 is least sensitive
+driver_TBL: 1
+driver_TOFF: 3
+driver_HSTRT: 1
+driver_HEND: 3
+
+[stepper_x1]
+step_pin: PG4  # Drive 3
+dir_pin: PC1
+enable_pin: !PA0
+endstop_pin: tmc2209_stepper_x:virtual_endstop
+microsteps: 16
+rotation_distance: 40
+full_steps_per_rotation: 200
+step_pulse_duration: 0.000001
+
+#LDO 48mm 1.8 42STH48-2004AC - 1.4Ohm 3mH
+[tmc2209 stepper_x1]
+uart_pin: PC7
+run_current: 2
+sense_resistor: 0.110
+stealthchop_threshold: 0
+diag_pin: ^PG11     # Set to MCU pin connected to TMC DIAG pin
+driver_SGTHRS: 70  # 255 is most sensitive value, 0 is least sensitive
 driver_TBL: 1
 driver_TOFF: 3
 driver_HSTRT: 1
@ -32,7 +55,7 @@ step_pin: PF9  # Drive4
 dir_pin: PF10
 enable_pin: !PG2
 endstop_pin: tmc2209_stepper_y:virtual_endstop
-microsteps: 32
+microsteps: 16
 rotation_distance: 40
 position_endstop: 328
 position_min: 0
@ -50,21 +73,44 @@ run_current: 2
 sense_resistor: 0.110
 stealthchop_threshold: 0
 diag_pin: ^PG12      # Set to MCU pin connected to TMC DIAG pin
-driver_SGTHRS: 90    # 255 is most sensitive value, 0 is least sensitive
+driver_SGTHRS: 60    # 255 is most sensitive value, 0 is least sensitive
+driver_TBL: 1
+driver_TOFF: 3
+driver_HSTRT: 1
+driver_HEND: 3
+
+[stepper_y1]
+step_pin: PC13  # Drive5
+dir_pin: PF0
+enable_pin: !PF1
+endstop_pin: tmc2209_stepper_y:virtual_endstop
+microsteps: 16
+rotation_distance: 40
+full_steps_per_rotation: 200
+step_pulse_duration: 0.000001
+
+#LDO 48mm 1.8 42STH48-2004AC - 1.4Ohm 3mH
+[tmc2209 stepper_y1]
+uart_pin: PE4
+run_current: 2
+sense_resistor: 0.110
+stealthchop_threshold: 0
+diag_pin: ^PG13      # Set to MCU pin connected to TMC DIAG pin
+driver_SGTHRS: 60    # 255 is most sensitive value, 0 is least sensitive
 driver_TBL: 1
 driver_TOFF: 3
 driver_HSTRT: 1
 driver_HEND: 3

 [stepper_z]
-step_pin: PC13  # Drive5
-dir_pin: !PF0
-enable_pin: !PF1
-microsteps: 16
+step_pin: skr:PB0  # SKR Z
+dir_pin: !skr:PC5
+enable_pin: !skr:PB1
+microsteps: 32
 rotation_distance: 4
 #endstop_pin: PG11  # Bed Endstop
-endstop_pin: PG10  # Nozzle Endstop
-position_endstop: 3.45
+endstop_pin: skr:PC2  # Nozzle Endstop
+position_endstop: 3.44
 position_min: -1
 position_max: 400
 full_steps_per_rotation: 200
@ -76,11 +122,12 @@ step_pulse_duration: 0.000004

 [tmc2209 stepper_z]
 interpolate: false
-uart_pin: PE4
-run_current: 1.0
+uart_pin: skr:PC11
+tx_pin: skr:PC10
+uart_address: 1
+run_current: 0.9
 sense_resistor: 0.110
 stealthchop_threshold: 0
-driver_TBL: 1
-driver_TOFF: 3
-driver_HSTRT: 0
-
+# driver_TBL: 1
+# driver_TOFF: 3
+# driver_HSTRT: 0