Merge branch 'master' of g.lgeex.com:3dprinting/duet_vcore3

Fixing:
* bed screws location
* bed screws order
* X max 510 -> 500

Improvements:
* Probing points
* Home all speed
* Probing speed (decreased speed for increased accuracy)

README.md

@@ -7,6 +7,19 @@ Parts of the g code are not mine and were extracted from the ratrig config, duet
 
 Pay special attention to the stepper direction and stepper step/angle, these are not standard.
 
+## Git structure
+### V1 branch 
+
+* Tries to keep compatibility with the default RR HW
+* Can be used as a default config
+
+### Master
+
+* It uses my personal config
+* It supports or will support newer/better hw, pwm fans, camera, thermal camera, etc
+* Better HW monitoring
+* Better automation 
+
 ## HW Config
 #####
 - 1x [Duet 3 6HC](https://www.123-3d.nl/Duet3D-Duet-3-Mainboard-6HC-v1-0-origineel-Duet-3-MB6HC-v1-00-i4602.html)

bed.g

@@ -2,11 +2,13 @@
 ; so if G31 P500 X-30 Y-15 Z1.7 then first probe will be at
 ; X30 Y20 (when G30 P0 X0 Y5)
 
+
 M561 ; clear any bed transform
 
-G30 P0 X25 Y25 Z-99999 ; probe near a leadscrew
-G30 P1 X250 Y475 Z-99999 ; probe near a leadscrew
-G30 P2 X475 Y25 Z-99999 S3 ; probe near a leadscrew and calibrate 3 motors
+G30 P0 X20 Y20 Z-99999 ; probe near a leadscrew
+G30 P1 X250 Y480 Z-99999 ; probe near a leadscrew
+G30 P2 X480 Y20 Z-99999 S3 ; probe near a leadscrew and calibrate 3 motors
 
-G29  ; probe the bed and enable compensation
+M280 P0 S160 ; clear and reset BL touch
+;G29  ; probe the bed and enable compensation
 

config.g

@@ -18,16 +18,16 @@ M569 P0.5 S0 D3 H50 V50                        ; physical drive 0.5 goes backwar
 M584 X0.3 Y0.4 Z0.0:0.1:0.2 E0.5               ; set drive mapping
 M350 X16 Y16 Z16 E16 I1                        ; configure microstepping with interpolation
 
-M92 X160.00 Y160.00 Z1600.00 E833.32               ; set steps per mm
-M566 X400.00 Y400.00 Z6.00 E120.00                 ; set maximum instantaneous speed changes (mm/min)
-M203 X10800.00 Y10800.00 Z1000.00 E1600.00         ; set maximum speeds (mm/min)
-M201 X3000.00 Y3000.00 Z100.00 E3600.00            ; set accelerations (mm/s^2)
-M906 X1200 Y1200 Z1200 E800 I30                    ; set motor currents (mA) and motor idle factor in per cent
+M92 X160.00 Y160.00 Z1600.00 E830                  ; set steps per mm
+M566 X400.00 Y400.00 Z6.00 E120.00 P1              ; set maximum instantaneous speed changes (mm/min)
+M203 X10800.00 Y10800.00 Z1000.00 E3600.00         ; set maximum speeds (mm/min)
+M201 X3000.00 Y3000.00 Z1000.00 E3600.00           ; set accelerations (mm/s^2)
+M906 X1200 Y1200 Z1200 E900 I30                    ; set motor currents (mA) and motor idle factor in per cent
 M84 S30                                            ; Set idle timeout
 
 ; Axis Limits
 M208 X0 Y0 Z0 S1                                   ; set axis minima
-M208 X510 Y500 Z500 S0                             ; set axis maxima
+M208 X500 Y500 Z500 S0                             ; set axis maxima
 
 ; Endstops
 M574 X1 S1 P"io2.in"                               ; configure active-high endstop
@@ -36,14 +36,15 @@ M574 Y2 S1 P"io1.in"                               ; configure active-high endst
 
 ; Z-Probe
 M950 S0 C"io7.out"                                 ; create servo pin 0 for BLTouch
-M558 P9 C"^io7.in" H3 F500 T12000                  ; set Z probe type to bltouch and the dive height + speeds
+M558 P9 C"^io7.in" H3 F250 T12000                  ; set Z probe type to bltouch and the dive height + speeds
 ;; Pay special attention to the values bellow on G31, the Z value needs to be validated for your printer
 ;; Start with something like 0.5
 ;; Documentation available: https://duet3d.dozuki.com/Wiki/Test_and_calibrate_the_Z_probe
-G31 P500 X-28 Y-13 Z2.235                          ; set Z probe trigger value, offset and trigger height
+G31 P500 X-28 Y-13 Z2.205                          ; set Z probe trigger value, offset and trigger height
 ;;
-M671 X-4.5:250:504.5 Y-4.52:505:-4.52 S5           ; define positions of Z leadscrews or bed levelling screws
-M557 X25:475 Y25:475 P10                           ; define 10x10 mesh grid
+M671 X506.5:250:-2.5 Y0:508.5:0 S6                 ; define positions of Z leadscrews or bed levelling screws
+
+M557 X15:465 Y15:465 P15                           ; define 15x15 mesh grid
 
 ; Heaters
 ;; BED
@@ -62,9 +63,11 @@ M143 H1 S280                                       ; set temperature limit for h
 ; Fans
 M950 F0 C"out7" Q500                               ; create fan 0 on pin out7 and set its frequency
 M106 P0 C"Hotend fan" S1 H1 T45                    ; set fan 0 value. Thermostatic control is turned on
-M950 F1 C"out4" 20           ; create fan 1 on pin out4
+M950 F1 C"out4" Q20                                ; create fan 1 on pin out4
+;M950 F1 C"!out4+out4.tach" Q25000                 ; create fan 1 on  pin out4 pwm fan (4 wires)
 M106 P1 C"Layer fan" S0 H-1 -L255                  ; set fan 1 value. Thermostatic control is turned off
 
+
 ; Lights
 M950 P2 C"out8"                                    ; create output for lighning via DC DC SSR
 
@@ -80,4 +83,5 @@ M575 P1 S1 B57600                                  ; enable support for PanelDue
 M501                                               ; load saved parameters from non-volatile memory
 M911 S10 R11 P"M913 X0 Y0 G91 M83 G1 Z3 E-5 F1000" ; set tension thresholds and actions to run on power loss
 M404 N1.75 D0.4                                    ; Filament width and nozzle diameter
+M572 D0 S0.10  	                                   ; Pressure Advance
 T0                                                 ; Define default tool

homeall.g

@@ -2,19 +2,23 @@
 ; called to home all axes
 ;
 
+; BLTouch
+M280 P0 S160           ; Precautionary alarm release
+M280 P0 S90            ; Ensure the pin is raised
+;
 M280 P0 S160            ; Reset probe
 G91                     ; relative positioning
 G1 H2 Z5 F6000          ; lift Z relative to current position
-G1 H1 X-625 Y625 F1800  ; move quickly to X and Y axis endstops and stop there (first pass)
-G1 H1 X-625 F900        ; move quickly to X axis endstops and stop there (first pass)
-G1 H1 Y625 F900         ; move quickly to Y axis endstops and stop there (first pass)
-G1 H2 X5 Y-10 F1800     ; go back a few mm
+G1 H1 X-625 Y625 F3600  ; move quickly to X and Y axis endstops and stop there (first pass)
+G1 H1 X-625 F1800       ; move quickly to X axis endstops and stop there (first pass)
+G1 H1 Y625 F1800         ; move quickly to Y axis endstops and stop there (first pass)
+G1 H2 X20 Y-20 F6000     ; go back a few mm
 G1 H1 X-625 Y625 F256   ; move slowly to X and Y axis endstops once more (second pass)
 G1 H1 X-625 F256        ; move slowly to X axis endstops once more (second pass)
 G1 H1 Y625 F256         ; move slowly to Y axis endstops once more (second pass)
 
 G90                     ; absolute positioning
-G1 X250 Y250 F10000     ; go to first probe point
+G1 X275 Y250 F10000     ; go to first probe point
 G30                     ; home Z by probing the bed
 
 G91                     ; relative positioning

homex.g

@@ -7,6 +7,6 @@ G1 H2 Z2 F10800   ; lift Z relative to current position
 G1 H1 X-625 F3600 ; move quickly to X axis endstop and stop there (first pass)
 G1 H2 X5 F6000    ; go back a few mm
 G1 H1 X-625 F360  ; move slowly to X axis endstop once more (second pass)
-G1 H2 Z-2 F10800  ; lower Z again
+;G1 H2 Z-2 F10800  ; lower Z again
 G90               ; absolute positioning
 G1 X10 F6000      ; move forward 10mm 

homey.g

@@ -7,6 +7,6 @@ G1 H2 Z2 F10800   ; lift Z relative to current position
 G1 H1 Y625 F3600  ; move quickly to Y axis endstop and stop there (first pass)
 G1 Y-10 F6000     ; go back a few mm
 G1 H1 Y625 F360   ; move slowly to Y axis endstop once more (second pass)
-G1 H2 Z-2 F10800  ; lower Z again
+;G1 H2 Z-2 F10800  ; lower Z again
 G90               ; absolute positioning
 G1 Y-10 F6000     ; move forward 10 mm

homez.g

@@ -6,7 +6,7 @@ M280 P0 S160        ; Reset probe
 G91                 ; relative positioning
 G1 H2 Z5 F10800     ; lift Z relative to current position
 G90                 ; absolute positioning
-G1 X250 Y250 F10800 ; go to first probe point
+G1 X275 Y250 F10800 ; go to first probe point
 G30                 ; home Z by probing the bed
 
 ; Uncomment the following lines to lift Z after probing

macros/1_Preheat PLA

@@ -1,29 +0,0 @@
-; Raise temp of heated bed to 60 and nozzle to 210
-;
-
-M291 P"Setting PID and retraction values for PLA" R"Proceed?" S3 
-
-; New values
-;M307 H0 A82.6 C112.0 D2.7 S1.00 V24.0 B0 ; PID tune for bed at 60c
-;M307 H1 A460.6 C173.6 D3.1 S1.00 V23.9 B0 ; Pid tune for hotend at 210c
-M572 D0 S0.05   ; Pressure advance for PLA
-M207 S0.7 R-0.000 F8000 T1500   ; retraction settings for PLA
-
-T0
-
-M140 S60			; Set bed temp to 80
-M116				; Wait for temps to be reached...
-G10 P0 S180			; Set extruder temp (tool 0) to 200
-M116
-M117 PLA Preheat complete	; and send a notice to the screen that temps have been reached
-;Play a tone
-M300 S1250 P200
-G4 P201
-M300 S1500 P200
-G4 P201
-M300 S1100 P200
-G4 P201
-M300 S950 P300
-G4 P400
-M300 S1175 P300
-G4 S1

macros/2_Preheat PETG

@@ -13,9 +13,9 @@ M207 S0.8 R-0.000 F8000 T1500   ; retraction settings for Edge PETG
 
 T0
 
-M140 S80			; Set bed temp to 80
+M140 S85			; Set bed temp to 85
 M116				; Wait for temps to be reached...
-G10 P0 S240			; Set extruder temp (tool 0) to 200
+G10 P0 S200			; Set extruder temp (tool 0) to 200
 M116
 M117 PETG Preheat complete	; and send a notice to the screen that temps have been reached
 ;Play a tone

macros/Calibration/Reset BLTouch.g

@@ -0,0 +1 @@
+M280 P0 S160 ; clear and reset BL touch