Version 1.04b

Improved speed of integer square root function
Fixed bug in GCodeBuffer IsEmpty function (thanks zpl)
Changed tool numbers to start at T0 in all /sys files
Added sample macro files

29 files changed, 81 insertions, 48 deletions

diff --git a/SD-image/macros/E motors off b/SD-image/macros/E motors off
new file mode 100644
index 00000000..44b82fd2
--- /dev/null
+++ b/SD-image/macros/E motors off
@@ -0,0 +1,2 @@
+; Turn extruder motors off
+M84 P3 E0:1
diff --git a/SD-image/macros/Extrude 5mm b/SD-image/macros/Extrude 5mm
new file mode 100644
index 00000000..24f6dc26
--- /dev/null
+++ b/SD-image/macros/Extrude 5mm
@@ -0,0 +1,2 @@
+; Extrude 5mm filament
+G1 E5 F300
diff --git a/SD-image/macros/Load filament b/SD-image/macros/Load filament
new file mode 100644
index 00000000..feb8e29f
--- /dev/null
+++ b/SD-image/macros/Load filament
@@ -0,0 +1,3 @@
+; Load filament
+G1 E400 F3600
+M84 P3 E0:1		; turn extruder motors off so the user can feed by hand
diff --git a/SD-image/macros/Retract 5mm b/SD-image/macros/Retract 5mm
new file mode 100644
index 00000000..ef1ca468
--- /dev/null
+++ b/SD-image/macros/Retract 5mm
@@ -0,0 +1,2 @@
+; Retract 5mm filament
+G1 E-5 F2000
diff --git a/SD-image/macros/Unload filament b/SD-image/macros/Unload filament
new file mode 100644
index 00000000..71ce180a
--- /dev/null
+++ b/SD-image/macros/Unload filament
@@ -0,0 +1,3 @@
+; Unload filament
+G1 E-5 F500
+G1 E-500 F3600
diff --git a/SD-image/sys-MiniKossel/config.g b/SD-image/sys-MiniKossel/config.g
index 90dc4ca4..995bd269 100644
--- a/SD-image/sys-MiniKossel/config.g
+++ b/SD-image/sys-MiniKossel/config.g
@@ -37,12 +37,12 @@ M305 P1 T100000 B3974 R1000 H30 L0	; Put your own H and/or L values here to set
 M305 P2 T100000 B3974 R1000 H30 L0	; Put your own H and/or L values here to set the second nozzle thermistor ADC correction
 
 ; Tool definitions
-M563 P1 D0 H1                       ; Define tool 1
-G10 P1 S0 R0                        ; Set tool 1 operating and standby temperatures
+M563 P0 D0 H1                       ; Define tool 0
+G10 P0 S0 R0                        ; Set tool 0 operating and standby temperatures
 M92 E663:663                       	; Set extruder steps per mm
 ;*** If you have a dual-nozzle build, un-comment the next 2 lines
-;M563 P2 D1 H2                      ; Define tool 2
-;G10 P2 S0 R0                       ; Set tool 2 operating and standby temperatures
+;M563 P1 D1 H2                      ; Define tool 1
+;G10 P1 S0 R0                       ; Set tool 1 operating and standby temperatures
 
 // Z probe and compensation definition
 ;*** If you have an IR zprobe instead of a switch, change P4 to P1 in the following M558 command
diff --git a/SD-image/sys-MiniKossel/pause.g b/SD-image/sys-MiniKossel/pause.g
new file mode 100644
index 00000000..18855ff7
--- /dev/null
+++ b/SD-image/sys-MiniKossel/pause.g
@@ -0,0 +1,6 @@
+; Pause macro file
+G1 E-4 F2500		; retract 4mm
+G91					; relative moves
+G1 Z5 F5000			; raise nozzle 2mm
+G90					; absolute moves
+G1 X0 Y85 F5000		; move head out of the way of the print
diff --git a/SD-image/sys-MiniKossel/resume.g b/SD-image/sys-MiniKossel/resume.g
new file mode 100644
index 00000000..03b672dc
--- /dev/null
+++ b/SD-image/sys-MiniKossel/resume.g
@@ -0,0 +1,4 @@
+; Resume macro file
+G1 R1 Z2		; move to 2mm above resume point
+G1 R1			; lower nozzle to resume point
+G1 E4 F2500		; undo the retraction
\ No newline at end of file
diff --git a/SD-image/sys-Ormerod1/config.g b/SD-image/sys-Ormerod1/config.g
index 31f4e165..3b8d7a35 100644
--- a/SD-image/sys-Ormerod1/config.g
+++ b/SD-image/sys-Ormerod1/config.g
@@ -13,12 +13,12 @@ G90                                 ; Send absolute coordinates...
 M83                                 ; ...but relative extruder moves
 M574 X0 Y2 Z0 S1					; set endstop configuration (Y endstop only, at high end, active high)
 M906 X800 Y1000 Z800 E800           ; Set motor currents (mA)
-M563 P1 D0 H1                       ; Define tool 1
-G10 P1 S0 R0                        ; Set tool 1 operating and standby temperatures
+M563 P0 D0 H1                       ; Define tool 0
+G10 P0 S0 R0                        ; Set tool 1 operating and standby temperatures
 M92 E420                        	; Set extruder steps per mm (single nozzle)
 ;*** If you have a dual-nozzle build, remove or comment out the previous line, and un-comment the following 3 lines
-;M563 P2 D1 H2                      ; Define tool 2
-;G10 P2 S0 R0                       ; Set tool 2 operating and standby temperatures
+;M563 P1 D1 H2                      ; Define tool 1
+;G10 P1 S0 R0                       ; Set tool 1 operating and standby temperatures
 ;M92 E420:420						; Set extruder steps/mm (dual nozzle)
 ;*** If you have a modulated IR probe without on-board microcontroller, change P1 to P2 in the following
 M558 P1                             ; Use an unmodulated Z probe or an intelligent Z probe
diff --git a/SD-image/sys-Ormerod1/pause.g b/SD-image/sys-Ormerod1/pause.g
index c64f0ed8..b098f19f 100644
--- a/SD-image/sys-Ormerod1/pause.g
+++ b/SD-image/sys-Ormerod1/pause.g
@@ -1,5 +1,6 @@
 ; Pause macro file
-G91
-G1 Z5 F5000
-G90
-G1 X0 Y0 F5000
+G1 E-4 F2500		; retract 4mm
+G91					; relative moves
+G1 Z5 F5000			; raise nozzle 2mm
+G90					; absolute moves
+G1 X0 Y200 F5000	; move head out of the way of the print
diff --git a/SD-image/sys-Ormerod1/resume.g b/SD-image/sys-Ormerod1/resume.g
index e13db2f8..03b672dc 100644
--- a/SD-image/sys-Ormerod1/resume.g
+++ b/SD-image/sys-Ormerod1/resume.g
@@ -1,4 +1,4 @@
 ; Resume macro file
-G91
-;G1 Z-5 F5000
-G90
+G1 R1 Z2		; move to 2mm above resume point
+G1 R1			; lower nozzle to resume point
+G1 E4 F2500		; undo the retraction
\ No newline at end of file
diff --git a/SD-image/sys-Ormerod1/tfree0.g b/SD-image/sys-Ormerod1/tfree0.g
new file mode 100644
index 00000000..8d3f6bf3
--- /dev/null
+++ b/SD-image/sys-Ormerod1/tfree0.g
@@ -0,0 +1,2 @@
+; tfree1.g
+; Put G/M Codes in here to run when Tool 1 is freed
diff --git a/SD-image/sys-Ormerod1/tfree1.g b/SD-image/sys-Ormerod1/tfree1.g
index 8d3f6bf3..61345c2c 100644
--- a/SD-image/sys-Ormerod1/tfree1.g
+++ b/SD-image/sys-Ormerod1/tfree1.g
@@ -1,2 +1,2 @@
-; tfree1.g
-; Put G/M Codes in here to run when Tool 1 is freed
+; tfree2.g
+; Put G/M Codes in here to run when Tool 2 is freed
diff --git a/SD-image/sys-Ormerod1/tfree2.g b/SD-image/sys-Ormerod1/tfree2.g
deleted file mode 100644
index 61345c2c..00000000
--- a/SD-image/sys-Ormerod1/tfree2.g
+++ /dev/null
@@ -1,2 +0,0 @@
-; tfree2.g
-; Put G/M Codes in here to run when Tool 2 is freed
diff --git a/SD-image/sys-Ormerod1/tpost0.g b/SD-image/sys-Ormerod1/tpost0.g
new file mode 100644
index 00000000..91a45dc6
--- /dev/null
+++ b/SD-image/sys-Ormerod1/tpost0.g
@@ -0,0 +1,5 @@
+; tpost1.g
+; Put G/M Codes in here to run after Tool 1 is selected
+; un-comment the following line if you have a dual-nozzle build
+;M116 P1
+
diff --git a/SD-image/sys-Ormerod1/tpost1.g b/SD-image/sys-Ormerod1/tpost1.g
index 91a45dc6..fc9861e1 100644
--- a/SD-image/sys-Ormerod1/tpost1.g
+++ b/SD-image/sys-Ormerod1/tpost1.g
@@ -1,5 +1,5 @@
-; tpost1.g
-; Put G/M Codes in here to run after Tool 1 is selected
+; tpost2.g
+; Put G/M Codes in here to run after Tool 2 is selected
 ; un-comment the following line if you have a dual-nozzle build
-;M116 P1
+;M116 P2
 
diff --git a/SD-image/sys-Ormerod1/tpost2.g b/SD-image/sys-Ormerod1/tpost2.g
deleted file mode 100644
index fc9861e1..00000000
--- a/SD-image/sys-Ormerod1/tpost2.g
+++ /dev/null
@@ -1,5 +0,0 @@
-; tpost2.g
-; Put G/M Codes in here to run after Tool 2 is selected
-; un-comment the following line if you have a dual-nozzle build
-;M116 P2
-
diff --git a/SD-image/sys-Ormerod1/tpre2.g b/SD-image/sys-Ormerod1/tpre0.g
index 3e6083a8..d679d11f 100644
--- a/SD-image/sys-Ormerod1/tpre2.g
+++ b/SD-image/sys-Ormerod1/tpre0.g
@@ -1,4 +1,4 @@
-; tpre2.g
-; Put G/M Codes in here to run before Tool 2 is selected
+; tpre1.g
+; Put G/M Codes in here to run before Tool 1 is selected
 ; un-comment the following line if you have a dual-nozzle build
 ;G1 X1 Y205 F6000
diff --git a/SD-image/sys-Ormerod1/tpre1.g b/SD-image/sys-Ormerod1/tpre1.g
index d679d11f..3e6083a8 100644
--- a/SD-image/sys-Ormerod1/tpre1.g
+++ b/SD-image/sys-Ormerod1/tpre1.g
@@ -1,4 +1,4 @@
-; tpre1.g
-; Put G/M Codes in here to run before Tool 1 is selected
+; tpre2.g
+; Put G/M Codes in here to run before Tool 2 is selected
 ; un-comment the following line if you have a dual-nozzle build
 ;G1 X1 Y205 F6000
diff --git a/SD-image/sys-Ormerod2/config.g b/SD-image/sys-Ormerod2/config.g
index 3d52b140..6ecfd29f 100644
--- a/SD-image/sys-Ormerod2/config.g
+++ b/SD-image/sys-Ormerod2/config.g
@@ -13,12 +13,12 @@ G90                                 ; Send absolute coordinates...
 M83                                 ; ...but relative extruder moves
 M574 X0 Y1 Z0 S1					; set endstop configuration (Y endstop only, at low end, active high)
 M906 X800 Y1000 Z800 E800           ; Set motor currents (mA)
-M563 P1 D0 H1                       ; Define tool 1
-G10 P1 S0 R0                        ; Set tool 1 operating and standby temperatures
+M563 P0 D0 H1                       ; Define tool 0
+G10 P0 S0 R0                        ; Set tool 0 operating and standby temperatures
 M92 E420                        	; Set extruder steps per mm (single nozzle)
 ;*** If you have a dual-nozzle build, remove or comment out the previous line, and un-comment the following 3 lines
-;M563 P2 D1 H2                      ; Define tool 2
-;G10 P2 S0 R0                       ; Set tool 2 operating and standby temperatures
+;M563 P1 D1 H2                      ; Define tool 1
+;G10 P1 S0 R0                       ; Set tool 1 operating and standby temperatures
 ;M92 E420:420						; Set extruder steps/mm (dual nozzle)
 ;*** If you have a modulated IR probe with on-board microcontroller, change P2 to P1 in the following
 M558 P2                             ; Use a simple modulated Z probe (change to P1 for an intelligent Z probe)
diff --git a/SD-image/sys-Ormerod2/pause.g b/SD-image/sys-Ormerod2/pause.g
new file mode 100644
index 00000000..b098f19f
--- /dev/null
+++ b/SD-image/sys-Ormerod2/pause.g
@@ -0,0 +1,6 @@
+; Pause macro file
+G1 E-4 F2500		; retract 4mm
+G91					; relative moves
+G1 Z5 F5000			; raise nozzle 2mm
+G90					; absolute moves
+G1 X0 Y200 F5000	; move head out of the way of the print
diff --git a/SD-image/sys-Ormerod2/resume.g b/SD-image/sys-Ormerod2/resume.g
new file mode 100644
index 00000000..03b672dc
--- /dev/null
+++ b/SD-image/sys-Ormerod2/resume.g
@@ -0,0 +1,4 @@
+; Resume macro file
+G1 R1 Z2		; move to 2mm above resume point
+G1 R1			; lower nozzle to resume point
+G1 E4 F2500		; undo the retraction
\ No newline at end of file
diff --git a/SD-image/sys-Ormerod2/tfree0.g b/SD-image/sys-Ormerod2/tfree0.g
new file mode 100644
index 00000000..8d3f6bf3
--- /dev/null
+++ b/SD-image/sys-Ormerod2/tfree0.g
@@ -0,0 +1,2 @@
+; tfree1.g
+; Put G/M Codes in here to run when Tool 1 is freed
diff --git a/SD-image/sys-Ormerod2/tfree1.g b/SD-image/sys-Ormerod2/tfree1.g
index 8d3f6bf3..61345c2c 100644
--- a/SD-image/sys-Ormerod2/tfree1.g
+++ b/SD-image/sys-Ormerod2/tfree1.g
@@ -1,2 +1,2 @@
-; tfree1.g
-; Put G/M Codes in here to run when Tool 1 is freed
+; tfree2.g
+; Put G/M Codes in here to run when Tool 2 is freed
diff --git a/SD-image/sys-Ormerod2/tfree2.g b/SD-image/sys-Ormerod2/tfree2.g
deleted file mode 100644
index 61345c2c..00000000
--- a/SD-image/sys-Ormerod2/tfree2.g
+++ /dev/null
@@ -1,2 +0,0 @@
-; tfree2.g
-; Put G/M Codes in here to run when Tool 2 is freed
diff --git a/SD-image/sys-Ormerod2/tpost0.g b/SD-image/sys-Ormerod2/tpost0.g
new file mode 100644
index 00000000..91a45dc6
--- /dev/null
+++ b/SD-image/sys-Ormerod2/tpost0.g
@@ -0,0 +1,5 @@
+; tpost1.g
+; Put G/M Codes in here to run after Tool 1 is selected
+; un-comment the following line if you have a dual-nozzle build
+;M116 P1
+
diff --git a/SD-image/sys-Ormerod2/tpost2.g b/SD-image/sys-Ormerod2/tpost2.g
deleted file mode 100644
index fc9861e1..00000000
--- a/SD-image/sys-Ormerod2/tpost2.g
+++ /dev/null
@@ -1,5 +0,0 @@
-; tpost2.g
-; Put G/M Codes in here to run after Tool 2 is selected
-; un-comment the following line if you have a dual-nozzle build
-;M116 P2
-
diff --git a/SD-image/sys-Ormerod2/tpre2.g b/SD-image/sys-Ormerod2/tpre0.g
index 3e6083a8..d679d11f 100644
--- a/SD-image/sys-Ormerod2/tpre2.g
+++ b/SD-image/sys-Ormerod2/tpre0.g
@@ -1,4 +1,4 @@
-; tpre2.g
-; Put G/M Codes in here to run before Tool 2 is selected
+; tpre1.g
+; Put G/M Codes in here to run before Tool 1 is selected
 ; un-comment the following line if you have a dual-nozzle build
 ;G1 X1 Y205 F6000
diff --git a/SD-image/sys-Ormerod2/tpre1.g b/SD-image/sys-Ormerod2/tpre1.g
index d679d11f..3e6083a8 100644
--- a/SD-image/sys-Ormerod2/tpre1.g
+++ b/SD-image/sys-Ormerod2/tpre1.g
@@ -1,4 +1,4 @@
-; tpre1.g
-; Put G/M Codes in here to run before Tool 1 is selected
+; tpre2.g
+; Put G/M Codes in here to run before Tool 2 is selected
 ; un-comment the following line if you have a dual-nozzle build
 ;G1 X1 Y205 F6000