From 7113d48b9adaee75e51ae401b2edaccdf45fea0b Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Sat, 15 Aug 2020 18:19:58 -0400 Subject: [PATCH 1/5] fix: Prevent donate container from encroaching on the page --- css/styles.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index 0146f14..f87b928 100644 --- a/css/styles.css +++ b/css/styles.css @@ -186,7 +186,7 @@ iframe { #donate { vertical-align: middle; float: right; - padding: 20px; + padding: 20px 20px 0 0; } #donate img { @@ -343,4 +343,4 @@ button { background-color: #fff; cursor: pointer; -} \ No newline at end of file +} From fdb56d0ff541fa3a999f563f5dfbb6a6847a39c7 Mon Sep 17 00:00:00 2001 From: lawgicau Date: Sun, 16 Aug 2020 13:58:39 +1000 Subject: [PATCH 2/5] Fix jerk value X instead of J --- js/gcodeprocessing.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/gcodeprocessing.js b/js/gcodeprocessing.js index 930e8a0..46bc01b 100644 --- a/js/gcodeprocessing.js +++ b/js/gcodeprocessing.js @@ -511,11 +511,11 @@ function processAcceleration(){ if(selector == "jerk"){ acceleration = acceleration.replace(/j1/g, "M205 X"+a2+" Y"+a3); - acceleration = acceleration.replace(/j2/g, "M205 J"+b2+" Y"+b3); - acceleration = acceleration.replace(/j3/g, "M205 J"+c2+" Y"+c3); - acceleration = acceleration.replace(/j4/g, "M205 J"+d2+" Y"+d3); - acceleration = acceleration.replace(/j5/g, "M205 J"+e2+" Y"+e3); - acceleration = acceleration.replace(/j6/g, "M205 J"+f2+" Y"+f3); + acceleration = acceleration.replace(/j2/g, "M205 X"+b2+" Y"+b3); + acceleration = acceleration.replace(/j3/g, "M205 X"+c2+" Y"+c3); + acceleration = acceleration.replace(/j4/g, "M205 X"+d2+" Y"+d3); + acceleration = acceleration.replace(/j5/g, "M205 X"+e2+" Y"+e3); + acceleration = acceleration.replace(/j6/g, "M205 X"+f2+" Y"+f3); } else { acceleration = acceleration.replace(/j1/g, "M205 J"+a4); acceleration = acceleration.replace(/j2/g, "M205 J"+b4); From 7d553fcf9e02a5d9f4d76c72dc843a9fd7d5ac35 Mon Sep 17 00:00:00 2001 From: lawgicau Date: Sun, 16 Aug 2020 14:20:15 +1000 Subject: [PATCH 3/5] Rewrite temp change logic to avoid possible double up and ignored user values --- js/gcodeprocessing.js | 24 ++++++++++++------------ js/temperature.js | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/js/gcodeprocessing.js b/js/gcodeprocessing.js index 46bc01b..358d9dd 100644 --- a/js/gcodeprocessing.js +++ b/js/gcodeprocessing.js @@ -322,10 +322,10 @@ function processTemperature(){ if(abl == 4){ temperature = temperature.replace(/G28 ; home all axes/, "M109 S170 T0 ; probing temperature\nG28 ; home all"); temperature = temperature.replace(/;G29 ; probe ABL/, "G29 ; probe ABL"); - temperature = temperature.replace(/;M420 S1 ; restore ABL mesh/, "M109 S500 T0"); + temperature = temperature.replace(/;M420 S1 ; restore ABL mesh/, "tempmini"); } - temperature = temperature.replace(/M140 S60/g, "M140 S"+bedTemp); - temperature = temperature.replace(/M190 S60/g, "M190 S"+bedTemp); + temperature = temperature.replace(/M140 S60/, "M140 S"+bedTemp); + temperature = temperature.replace(/M190 S60/, "M190 S"+bedTemp); temperature = temperature.replace(/G1 E-5.0000 F2400/g, "G1 E-"+retDist+" F"+retSpeed); temperature = temperature.replace(/G1 E0.0000 F2400/g, "G1 E0.0000 F"+retSpeed); @@ -371,17 +371,17 @@ function processTemperature(){ } } if(abl != 4){ - temperature = temperature.replace(/M104 S190/g, "M104 S"+a1); - temperature = temperature.replace(/M109 S190/g, "M109 S"+a1); + temperature = temperature.replace(/temp1a/, "M104 S"+a1+" T0"); + temperature = temperature.replace(/temp1b/, "M109 S"+a1+" T0"); } else { - temperature = temperature.replace(/M104 S190/g, "; Prusa Mini"); - temperature = temperature.replace(/M109 S190/g, "; Prusa Mini"); - temperature = temperature.replace(/M109 S500/g, "M109 S"+a1); + temperature = temperature.replace(/temp1a/, "; Prusa Mini"); + temperature = temperature.replace(/temp1b/, "; Prusa Mini"); + temperature = temperature.replace(/tempmini/, "M109 S"+a1+" T0"); } - temperature = temperature.replace(/M104 S195/g, "M104 S"+b1); - temperature = temperature.replace(/M104 S200/g, "M104 S"+c1); - temperature = temperature.replace(/M104 S205/g, "M104 S"+d1); - temperature = temperature.replace(/M104 S210/g, "M104 S"+e1); + temperature = temperature.replace(/temp2/, "M104 S"+b1+" T0"); + temperature = temperature.replace(/temp3/, "M104 S"+c1+" T0"); + temperature = temperature.replace(/temp4/, "M104 S"+d1+" T0"); + temperature = temperature.replace(/temp5/, "M104 S"+e1+" T0"); downloadFile('temperature.gcode', temperature); } diff --git a/js/temperature.js b/js/temperature.js index 03d222d..7049de9 100644 --- a/js/temperature.js +++ b/js/temperature.js @@ -4,8 +4,8 @@ M82 M106 S0 M140 S60 M190 S60 -M104 S190 T0 -M109 S190 T0 +temp1a +temp1b G28 ; home all axes ;G29 ; probe ABL ;M420 S1 ; restore ABL mesh @@ -8154,7 +8154,7 @@ G92 E0.0000 G1 E-5.0000 F2400 ; process Color1-6-2 ; layer 51, Z = 10.200 -M104 S195 T0 +temp2 ; feature inner perimeter ; tool H0.200 W0.480 G1 Z10.400 F1200 @@ -12148,7 +12148,7 @@ G92 E0.0000 G1 E-5.0000 F2400 ; process Color1-6-3 ; layer 91, Z = 18.200 -M104 S200 T0 +temp3 ; feature inner perimeter ; tool H0.200 W0.480 G1 Z18.400 F1200 @@ -16142,7 +16142,7 @@ G92 E0.0000 G1 E-5.0000 F2400 ; process Color1-6-4 ; layer 131, Z = 26.200 -M104 S205 T0 +temp4 ; feature inner perimeter ; tool H0.200 W0.480 G1 Z26.400 F1200 @@ -20136,7 +20136,7 @@ G92 E0.0000 G1 E-5.0000 F2400 ; process Color1-6-5 ; layer 171, Z = 34.200 -M104 S210 T0 +temp5 ; feature inner perimeter ; tool H0.200 W0.480 G1 Z34.400 F1200 From de2825ba982bea4ce36d43f1afcd7727216d911f Mon Sep 17 00:00:00 2001 From: lawgicau Date: Sun, 16 Aug 2020 14:27:56 +1000 Subject: [PATCH 4/5] Add G90 after E-steps testing --- calibration.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/calibration.html b/calibration.html index ebfd211..be42943 100644 --- a/calibration.html +++ b/calibration.html @@ -211,6 +211,8 @@

You may wish to repeat this test with the new E-steps value to verify.

+

Although starting a new print or power cycling will achieve this, it may be safer to put the printer back into absolute position mode after completing this calinration by sending:

+ 
G90
From f55d734d7b3ff04afaf19c68cc3c0f418e495892 Mon Sep 17 00:00:00 2001 From: lawgicau Date: Sun, 16 Aug 2020 14:41:40 +1000 Subject: [PATCH 5/5] Add open source link --- calibration.html | 1 + 1 file changed, 1 insertion(+) diff --git a/calibration.html b/calibration.html index be42943..7211934 100644 --- a/calibration.html +++ b/calibration.html @@ -932,6 +932,7 @@