diff options
author | David Crocker <dcrocker@eschertech.com> | 2014-11-01 16:59:51 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2014-11-01 16:59:51 +0300 |
commit | c71ecf1b8a92a9184276668b9f6852e3f4836e79 (patch) | |
tree | 72bf009d9c272e27f223f9d0adc9d9f3b50d1ae0 /SD-image | |
parent | 183f760fb1dbf29901f167d5d5c2e4b7172a7ea5 (diff) |
Version 0.78u
M0 no longer turns motors off
Updated M18 and M84 as per zpl fork
Don't insist that user provides values for all 5 possible extruders in
M906 command
Added Ormerod 2 sys files
Updated web interface files
Diffstat (limited to 'SD-image')
29 files changed, 146 insertions, 61 deletions
diff --git a/SD-image/sys/config.g b/SD-image/sys-Ormerod1/config.g index be1533d6..6789191b 100644 --- a/SD-image/sys/config.g +++ b/SD-image/sys-Ormerod1/config.g @@ -1,13 +1,13 @@ ; Configuration file for RepRap Ormerod ; RepRapPro Ltd -; M111 S0 ; Debug off -M550 PMy RepRapPro Ormerod ; Machine name (can be anything you like) +M550 PMy Ormerod ; Machine name (can be anything you like) M551 Preprap ; Machine password (currently not used) M540 P0xBE:0xEF:0xDE:0xAD:0xFE:0xED ; MAC Address +;*** Adjust the IP address and gateway in the following 2 lines to suit your network M552 P192.168.1.14 ; IP address -M553 P255.255.255.0 ; Netmask M554 P192.168.1.1 ; Gateway +M553 P255.255.255.0 ; Netmask M555 P2 ; Set output to look like Marlin G21 ; Work in millimetres G90 ; Send absolute coordinates... @@ -15,20 +15,26 @@ M83 ; ...but relative extruder moves 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 P2 D1 H2 ; Define tool 2 (un-comment this for dual nozzle machines) -;G10 P2 S0 R0 ; Set tool 2 operating and standby temperatures (un-comment this for dual nozzle machines) -M92 E420:420 ; Set extruder steps per mm +M92 E420 ; Set extruder steps per mm (single nozzle) +;*** If you have a dual-nozzle build, remove ot 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 +;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 G31 Z1.20 P500 ; Set the probe height and threshold (put your own values here) -M305 P0 H0 L0 ; Put your own H and/or L values here to set the bed thermistor ADC correction -M305 P1 H0 L0 ; Put your own H and/or L values here to set the first nozzle thermistor ADC correction -M305 P2 H0 L0 ; Put your own H and/or L values here to set the second nozzle thermistor ADC correction +;*** If you have a Duet 0.7 board, change R1000 to R4700 to the following M305 commands +M305 P0 R1000 H0 L0 ; Put your own H and/or L values here to set the bed thermistor ADC correction +M305 P1 R1000 H0 L0 ; Put your own H and/or L values here to set the first nozzle thermistor ADC correction +M305 P2 R1000 H0 L0 ; Put your own H and/or L values here to set the second nozzle thermistor ADC correction +;*** Adjust the XY coordinates in the following M557 commands to suit your build and the position of the IR sensor M557 P0 X60 Y0 ; Four... M557 P1 X60 Y165 ; ...probe points... M557 P2 X222 Y165 ; ...for bed... M557 P3 X222 Y0 ; ...levelling -;M557 P4 X141 Y82.5 ; 5th probe point for levelling (un-comment this if you are using a differential IR probe) -M556 S78 X0 Y0 Z0 ; Put your axis compensation here +;M557 P4 X141 Y82.5 ; 5th probe point for levelling (un-comment this if you are using a dc42 differential IR probe) +;*** if you are using axis compensation, put the figures in the following command +M556 S78 X0 Y0 Z0 ; Axis compensation here M201 X800 Y800 Z15 E1000 ; Accelerations (mm/s^2) M203 X15000 Y15000 Z100 E3600 ; Maximum speeds (mm/min) M566 X600 Y600 Z30 E20 ; Minimum speeds mm/minute diff --git a/SD-image/sys/homeall.g b/SD-image/sys-Ormerod1/homeall.g index e40e0ea9..e40e0ea9 100644 --- a/SD-image/sys/homeall.g +++ b/SD-image/sys-Ormerod1/homeall.g diff --git a/SD-image/sys/homex.g b/SD-image/sys-Ormerod1/homex.g index 8bd48085..8bd48085 100644 --- a/SD-image/sys/homex.g +++ b/SD-image/sys-Ormerod1/homex.g diff --git a/SD-image/sys/homey.g b/SD-image/sys-Ormerod1/homey.g index 381ac344..381ac344 100644 --- a/SD-image/sys/homey.g +++ b/SD-image/sys-Ormerod1/homey.g diff --git a/SD-image/sys/homez.g b/SD-image/sys-Ormerod1/homez.g index 3819eff6..3819eff6 100644 --- a/SD-image/sys/homez.g +++ b/SD-image/sys-Ormerod1/homez.g diff --git a/SD-image/sys/tfree1.g b/SD-image/sys-Ormerod1/tfree1.g index 8d3f6bf3..8d3f6bf3 100644 --- a/SD-image/sys/tfree1.g +++ b/SD-image/sys-Ormerod1/tfree1.g diff --git a/SD-image/sys/tfree2.g b/SD-image/sys-Ormerod1/tfree2.g index 61345c2c..61345c2c 100644 --- a/SD-image/sys/tfree2.g +++ b/SD-image/sys-Ormerod1/tfree2.g diff --git a/SD-image/sys-Ormerod1/tpost1.g b/SD-image/sys-Ormerod1/tpost1.g new file mode 100644 index 00000000..91a45dc6 --- /dev/null +++ b/SD-image/sys-Ormerod1/tpost1.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/tpost2.g b/SD-image/sys-Ormerod1/tpost2.g new file mode 100644 index 00000000..fc9861e1 --- /dev/null +++ b/SD-image/sys-Ormerod1/tpost2.g @@ -0,0 +1,5 @@ +; 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/tpre1.g b/SD-image/sys-Ormerod1/tpre1.g new file mode 100644 index 00000000..d679d11f --- /dev/null +++ b/SD-image/sys-Ormerod1/tpre1.g @@ -0,0 +1,4 @@ +; 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/tpre2.g b/SD-image/sys-Ormerod1/tpre2.g new file mode 100644 index 00000000..3e6083a8 --- /dev/null +++ b/SD-image/sys-Ormerod1/tpre2.g @@ -0,0 +1,4 @@ +; 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 new file mode 100644 index 00000000..6789191b --- /dev/null +++ b/SD-image/sys-Ormerod2/config.g @@ -0,0 +1,42 @@ +; Configuration file for RepRap Ormerod +; RepRapPro Ltd +M111 S0 ; Debug off +M550 PMy Ormerod ; Machine name (can be anything you like) +M551 Preprap ; Machine password (currently not used) +M540 P0xBE:0xEF:0xDE:0xAD:0xFE:0xED ; MAC Address +;*** Adjust the IP address and gateway in the following 2 lines to suit your network +M552 P192.168.1.14 ; IP address +M554 P192.168.1.1 ; Gateway +M553 P255.255.255.0 ; Netmask +M555 P2 ; Set output to look like Marlin +G21 ; Work in millimetres +G90 ; Send absolute coordinates... +M83 ; ...but relative extruder moves +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 +M92 E420 ; Set extruder steps per mm (single nozzle) +;*** If you have a dual-nozzle build, remove ot 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 +;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 +G31 Z1.20 P500 ; Set the probe height and threshold (put your own values here) +;*** If you have a Duet 0.7 board, change R1000 to R4700 to the following M305 commands +M305 P0 R1000 H0 L0 ; Put your own H and/or L values here to set the bed thermistor ADC correction +M305 P1 R1000 H0 L0 ; Put your own H and/or L values here to set the first nozzle thermistor ADC correction +M305 P2 R1000 H0 L0 ; Put your own H and/or L values here to set the second nozzle thermistor ADC correction +;*** Adjust the XY coordinates in the following M557 commands to suit your build and the position of the IR sensor +M557 P0 X60 Y0 ; Four... +M557 P1 X60 Y165 ; ...probe points... +M557 P2 X222 Y165 ; ...for bed... +M557 P3 X222 Y0 ; ...levelling +;M557 P4 X141 Y82.5 ; 5th probe point for levelling (un-comment this if you are using a dc42 differential IR probe) +;*** if you are using axis compensation, put the figures in the following command +M556 S78 X0 Y0 Z0 ; Axis compensation here +M201 X800 Y800 Z15 E1000 ; Accelerations (mm/s^2) +M203 X15000 Y15000 Z100 E3600 ; Maximum speeds (mm/min) +M566 X600 Y600 Z30 E20 ; Minimum speeds mm/minute +M208 X214 Y210 ; set axis maxima (adjust to suit your machine) +M208 X-8 S1 ; set axis minimum (adjust to make X=0 the edge of the bed) diff --git a/SD-image/sys-Ormerod2/homeall.g b/SD-image/sys-Ormerod2/homeall.g new file mode 100644 index 00000000..b8c62570 --- /dev/null +++ b/SD-image/sys-Ormerod2/homeall.g @@ -0,0 +1,16 @@ +G91 +G1 Z4 F200 +G1 X-240 F2000 S1 +G1 X4 F200 +G1 X-10 S1 +G1 Y220 F2000 S1 +G90 +G92 Y0 +G1 Y-240 F2000 S1 +G92 Y0 +G1 Y3 F200 +G1 Y-30 S1 +G92 Y0 +G1 Y3 F500 ; adjust the Y value to put the nozzle on the edge of the bed +G92 Y0 +G30 diff --git a/SD-image/sys-Ormerod2/homex.g b/SD-image/sys-Ormerod2/homex.g new file mode 100644 index 00000000..8bd48085 --- /dev/null +++ b/SD-image/sys-Ormerod2/homex.g @@ -0,0 +1,7 @@ +G91 +G1 Z4 F200 +G1 X-240 F2000 S1 +G1 X4 F200 +G1 X-10 S1 +G1 Z-4 F200 +G90 diff --git a/SD-image/sys-Ormerod2/homey.g b/SD-image/sys-Ormerod2/homey.g new file mode 100644 index 00000000..b73e06e3 --- /dev/null +++ b/SD-image/sys-Ormerod2/homey.g @@ -0,0 +1,16 @@ +G91 +G1 Z5 F200 +G1 X20 F2000 +G90 +G92 Y0 +G1 Y-250 F2000 S1 +G92 Y0 +G1 Y3 F200 +G1 Y-30 F200 S1 +G92 Y0 +G1 Y3 F500 ; adjust the Y value to put the nozzle on the edge of the bed +G92 Y0 +G91 +G1 X-20 F2000 +G1 Z-5 F200 +G90 diff --git a/SD-image/sys-Ormerod2/homez.g b/SD-image/sys-Ormerod2/homez.g new file mode 100644 index 00000000..3819eff6 --- /dev/null +++ b/SD-image/sys-Ormerod2/homez.g @@ -0,0 +1,5 @@ +G91 +G1 Z3 F200 +G90 +G1 X100 Y105 F12000 +G30 diff --git a/SD-image/sys-Ormerod2/tfree1.g b/SD-image/sys-Ormerod2/tfree1.g new file mode 100644 index 00000000..8d3f6bf3 --- /dev/null +++ b/SD-image/sys-Ormerod2/tfree1.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/tfree2.g b/SD-image/sys-Ormerod2/tfree2.g new file mode 100644 index 00000000..61345c2c --- /dev/null +++ b/SD-image/sys-Ormerod2/tfree2.g @@ -0,0 +1,2 @@ +; tfree2.g +; Put G/M Codes in here to run when Tool 2 is freed diff --git a/SD-image/sys-Ormerod2/tpost1.g b/SD-image/sys-Ormerod2/tpost1.g new file mode 100644 index 00000000..91a45dc6 --- /dev/null +++ b/SD-image/sys-Ormerod2/tpost1.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 new file mode 100644 index 00000000..fc9861e1 --- /dev/null +++ b/SD-image/sys-Ormerod2/tpost2.g @@ -0,0 +1,5 @@ +; 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/tpre1.g b/SD-image/sys-Ormerod2/tpre1.g new file mode 100644 index 00000000..d679d11f --- /dev/null +++ b/SD-image/sys-Ormerod2/tpre1.g @@ -0,0 +1,4 @@ +; 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/tpre2.g b/SD-image/sys-Ormerod2/tpre2.g new file mode 100644 index 00000000..3e6083a8 --- /dev/null +++ b/SD-image/sys-Ormerod2/tpre2.g @@ -0,0 +1,4 @@ +; 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/default.g b/SD-image/sys/default.g deleted file mode 100644 index 72be012a..00000000 --- a/SD-image/sys/default.g +++ /dev/null @@ -1,29 +0,0 @@ -; Configuration file for RepRap Ormerod -; RepRapPro Ltd -; -M111 S0 ; Debug off -M550 PMy RepRapPro Ormerod ; Machine name (can be anything you like) -M551 Preprap ; Machine password (currently not used) -M540 P0xBE:0xEF:0xDE:0xAD:0xFE:0xED ; MAC Address -M552 P192.168.1.14 ; IP address -M553 P255.255.255.0 ; Netmask -M554 P192.168.1.1 ; Gateway -M555 P2 ; Set output to look like Marlin -G21 ; Work in millimetres -G90 ; Send absolute corrdinates... -M83 ; ...but relative extruder moves -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 -M92 E420 ; Set extruder steps per mm -M558 P1 ; Use an unmodulated Z probe -G31 Z2.5 P370 ; Set the probe height and threshold -M557 P0 X60 Y0 ; Four... -M557 P1 X60 Y165 ; ...probe points... -M557 P2 X222 Y165 ; ...for bed... -M557 P3 X222 Y0 ; ...levelling -M556 S78 X0 Y0 Z0 ; Put your axis compensation here -M201 X800 Y800 Z15 E1000 ; Accelerations (mm/s^2) -M203 X15000 Y15000 Z100 E3600 ; Maximum speeds (mm/min) -M566 X600 Y600 Z30 E20 ; Minimum speeds mm/minute - diff --git a/SD-image/sys/tpost1.g b/SD-image/sys/tpost1.g deleted file mode 100644 index f72dfa13..00000000 --- a/SD-image/sys/tpost1.g +++ /dev/null @@ -1,4 +0,0 @@ -; tpost1.g -; Put G/M Codes in here to run after Tool 1 is selected -M116 P1 - diff --git a/SD-image/sys/tpost2.g b/SD-image/sys/tpost2.g deleted file mode 100644 index b74a917b..00000000 --- a/SD-image/sys/tpost2.g +++ /dev/null @@ -1,4 +0,0 @@ -; tpost2.g -; Put G/M Codes in here to run after Tool 2 is selected -M116 P2 - diff --git a/SD-image/sys/tpre1.g b/SD-image/sys/tpre1.g deleted file mode 100644 index a2ab9799..00000000 --- a/SD-image/sys/tpre1.g +++ /dev/null @@ -1,3 +0,0 @@ -; tpre1.g -; Put G/M Codes in here to run before Tool 1 is selected -G1 X1 Y205 F6000 diff --git a/SD-image/sys/tpre2.g b/SD-image/sys/tpre2.g deleted file mode 100644 index f4d7fb76..00000000 --- a/SD-image/sys/tpre2.g +++ /dev/null @@ -1,3 +0,0 @@ -; tpre2.g -; Put G/M Codes in here to run before Tool 2 is selected -G1 X1 Y205 F6000 diff --git a/SD-image/www/js/reprap.js b/SD-image/www/js/reprap.js index 5a87aefc..2e439596 100644 --- a/SD-image/www/js/reprap.js +++ b/SD-image/www/js/reprap.js @@ -1,6 +1,6 @@ /*! Reprap Ormerod Web Control | by Matt Burnett <matt@burny.co.uk>. | open license */ -var ver = 1.02; //App version +var ver = 1.03; //App version var polling = false; var printing = false; var paused = false; @@ -308,11 +308,7 @@ $('div#panicBtn button').on('click', function() { //reset printing after pause printing = false; paused = false; - btnVal = "M1"; - //switch off heaters - $.askElle('gcode', "M140 S0"); //bed off - $.askElle('gcode', "G10 P1 S0 R0\nT1"); //head 1 off - $.askElle('gcode', "G10 P2 S0 R0\nT1"); //head 2 off + btnVal = "M0"; resetLayerData(0, 0, false); //no break case "M24": diff --git a/SD-image/www/reprap.htm b/SD-image/www/reprap.htm index 9cacd699..38e9aaf2 100644 --- a/SD-image/www/reprap.htm +++ b/SD-image/www/reprap.htm @@ -1,7 +1,7 @@ <!DOCTYPE HTML>
<html>
<head>
-<title>Ormerod Control v1.02</title>
+<title>Ormerod Control v1.03</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Bootstrap -->
|