Merge pull request #17 from synthread/2.0.1

2.0.1

config/adv3-macros.cfg

@@ -21,44 +21,29 @@ gcode:
 
 [gcode_macro END_PRINT]
 gcode:
-    # Retract and move nozzle away from print
-    G10
-    G91
-    G1 X-2 Y-2 F6000
-    # Turn off bed, extruder, and fan
+    G10 # Retract
+    G90 # Use absolute positioning
+    G1 X161 Y154 F7500 # Move X/Y away from print
+    G1 Z154 F30 # Move Z away from print
+    # Turn off bed, extruder, part cooling fan, and chamber fan
     M140 S0
     M104 S0
     M106 S0
     SET_FAN_SPEED  FAN=chamber_fan SPEED=0.00
-    # Home nozzle position
-    G28
-    G90
-    #Present the print
-    G1 Y145 F4000
     # Disable steppers
     M84
 
 [gcode_macro CANCEL_PRINT]
 gcode:
-    # Retract filament
-    G10
-    # Turn off bed, extruder, and fans
-    M140 S0
-    M104 S0
-    M106 S0
-    SET_FAN_SPEED  FAN=chamber_fan SPEED=0.00
-    # Home all axes
-    G28
-    # Disable steppers
-    M84
-
+    END_PRINT
+
 [gcode_macro FILAMENT_LOAD]
 gcode:
  M106
  M109 S230
  M83                    # Put the extruder into relative mode
  G92 E0.0               # Reset the extruder position to zero
- G1 E430 F1000          # Move the extruder forward 430mm at a speed of 1000mm/minute
+ G1 E465 F1500          # Move the extruder forward 465mm at a speed of 1500mm/minute
  G1 E25 F150            # Slow down for the last 25mm to 150mm/minute
  G92 E0.0               # Reset the extruder again
  M82                    # Put the extruder back into absolute mode.
@@ -70,7 +55,7 @@ gcode:
  M109 S230
  M83                   # Put the extruder into relative mode
  G92 E0.0              # Reset the extruder position to zero
- G1 E-450 F1000        # Retract the filament 450mm at a speed of 1000mm/minute
+ G1 E-530 F2000        # Retract the filament 530mm at a speed of 2000mm/minute
  G92 E0.0              # Reset the extruder again
  M82                   # Put the extruder back into absolute mode.
  M107

config/mobileraker.conf

@@ -0,0 +1,42 @@
+[general]
+language: en
+# one of the supported languages defined in i18n.py#languages (de,en,...)
+# Default: en
+timezone: CET
+# The system's timezone e.g. Europe/Berlin for Berlin time or US/Central.
+# For more values see https://gist.github.com/heyalexej/8bf688fd67d7199be4a1682b3eec7568
+# Default: Tries to use system timezone
+# Optional
+eta_format: %%d.%%m.%%Y, %%H:%%M:%%S
+# Format used for eta and adaptive_eta placeholder variables
+# For available options see https://strftime.org/
+# Note that you will have to escape the % char by using a 2nd one e.g.: %d/%m/%Y -> %%d/%%m/%%Y
+# Default: %%d.%%m.%%Y, %%H:%%M:%%S
+# Optional
+include_snapshot: True
+# !! SUPPORTER ONLY - This feature requires beeing a supporter of Mobileraker as of now!
+# Include a snapshot of the webcam in any print status/progress update notifications
+# Default: True
+# Optional
+
+[printer default]
+moonraker_uri: ws://127.0.0.1:7125/websocket
+# Define the uri to the moonraker instance.
+# Default value: ws://127.0.0.1:7125/websocket
+# Optional
+moonraker_api_key: False
+# Moonraker API key if force_logins or trusted clients is active!
+# Default value: False
+# Optional
+snapshot_uri: http://127.0.0.1/webcam/?action=snapshot
+# !! SUPPORTER ONLY - This feature requires beeing a supporter of Mobileraker as of now!
+# The ABSOLUT url to the webcam, the companion should make a screenshot of.
+# Example MJPEG SnapShot url: http://192.168.178.135/webcam/?action=snapshot
+# Optional
+snapshot_rotation: 0
+# !! SUPPORTER ONLY - This feature requires beeing a supporter of Mobileraker as of now!
+# The rotation of the snapshot in degrees
+# Default value: 0
+# Valud Values: 0,90,180,270
+# Optional
+

config/moonraker.conf

@@ -51,3 +51,13 @@ primary_branch: main
 
 [file_manager]
 enable_object_processing: True
+
+[update_manager mobileraker]
+type: git_repo
+path: /home/pi/mobileraker_companion
+origin: https://github.com/Clon1998/mobileraker_companion.git
+primary_branch:main
+managed_services: mobileraker
+env: /home/pi/mobileraker-env/bin/python
+requirements: scripts/mobileraker-requirements.txt
+install_script: scripts/install.sh

config/printer.cfg

@@ -32,8 +32,9 @@ enable_pin: !PB7
 microsteps: 32
 rotation_distance: 33.9
 endstop_pin: ^PC14
-position_endstop: 159
-position_max: 159
+position_endstop: 159 # Set this to the distance between the endstop trigger point and touching the left side of the axis
+position_max: 161 # Set this to the distance between the endstop and touching the right side of the axis, PLUS position_endstop
+position_min: 0 # Leave this alone
 homing_speed: 75
 
 [stepper_y]
@@ -43,8 +44,8 @@ enable_pin: !PC0
 microsteps: 32
 rotation_distance: 33.9
 endstop_pin: ^PB3
-position_endstop: 0
-position_max: 151
+position_endstop: 4 # Set this to the distance between the endstop trigger point and touching the back side of the axis
+position_max: 151 # Set this to the distance between the endstop and touching the front side of the axis
 homing_speed: 75
 
 [stepper_z]
@@ -54,8 +55,9 @@ enable_pin: !PC7
 microsteps: 16
 rotation_distance: 6.25
 endstop_pin: !PC13
-position_min: -1
-position_max: 153
+position_min: -2 # This is slightly lower than the bed surface to allow for mesh leveling
+#position_endstop: 148 # Leave this alone, use fluidd to calibrate your Z offset.
+position_max: 155 # Set this to the distance between the endstop trigger point and touching the top of the axis. If you see the axis skew diagonally at this position, it's too high
 homing_speed: 25
 second_homing_speed: 15
 
@@ -80,8 +82,8 @@ sensor_type: adv3_ntc
 sensor_pin: PA5
 min_temp: -237.15
 max_temp: 500
-max_extrude_only_distance: 500
-max_extrude_only_velocity: 1200
+max_extrude_only_distance: 550
+max_extrude_only_velocity: 2000
 max_extrude_cross_section: 5
 pressure_advance: 2.1
 pressure_advance_smooth_time: 0.1
@@ -99,25 +101,26 @@ sensor_type: temperature_mcu
 min_temp: -40
 max_temp: 85
 
-#part cooling fan and heatbreak fan
+# Part cooling fan and heatbreak fan
 [fan]
 pin: PB10
+cycle_time: 0.1
 
-#mainboard cooling fan
+# Mainboard cooling fan
 [controller_fan mainboard]
 pin: PA4
 heater: extruder, heater_bed
 
-#chamber ventilation fan
+# Chamber ventilation fan
 [fan_generic chamber_fan]
 pin: PB13
+cycle_time: 0.1
 
 [output_pin led]
 pin: PB12
 value: 1
 pwm: true
-cycle_time: 0.008333
-#This PWM frequency should stop the LED from flickering on video when dimming
+cycle_time: 0.008333 # This PWM frequency should stop the LED from flickering on video
 
 [homing_override]
 axes: zxy
@@ -143,7 +146,7 @@ shaper_freq_y: 197.126
 shaper_type: ei
 
 [firmware_retraction]
-retract_length: 2.2
+retract_length: 3.8
 retract_speed: 25
 unretract_extra_length: 0
 unretract_speed: 25
@@ -176,7 +179,7 @@ stealthchop_threshold: 999999
 [tmc2208 extruder]
 uart_pin: PC10
 select_pins:  PB0,  PB1, !PD1
-run_current: 0.900
+run_current: 0.800
 sense_resistor: 0.220
 
 #*# <---------------------- SAVE_CONFIG ---------------------->
@@ -192,4 +195,24 @@ sense_resistor: 0.220
 #*# control = pid
 #*# pid_kp = 71.615
 #*# pid_ki = 3.913
-#*# pid_kd = 327.640
+#*# pid_kd = 327.640
+#*#
+#*# [stepper_z]
+#*# position_endstop = 151.315
+#*#
+#*# [bed_mesh default]
+#*# version = 1
+#*# points =
+#*# 	-0.088984, 0.127813, 0.323125
+#*# 	0.037969, 0.155156, 0.278203
+#*# 	0.049688, 0.164922, 0.266484
+#*# x_count = 3
+#*# y_count = 3
+#*# mesh_x_pps = 2
+#*# mesh_y_pps = 2
+#*# algo = lagrange
+#*# tension = 0.2
+#*# min_x = 5.0
+#*# max_x = 150.0
+#*# min_y = 5.0
+#*# max_y = 145.0