Mirrored_Repos/teachingtechYT.github.io
1
0
Fork 0
mirror of https://github.com/teachingtechYT/teachingtechYT.github.io.git synced 2024-08-30 18:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into UBL-ABL

Browse Source
This commit is contained in:
teachingtechYT
2020-08-16 14:49:15 +10:00
committed by GitHub
parent 5ce198f70a 9dcdaf95b9
commit 0f68e45100
4 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
calibration.html
View File

@ -212,6 +212,8 @@
<p>You may wish to repeat this test with the new E-steps value to verify.</p>
</div>
</form>
<p>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:</p>
<pre>G90</pre>
</div>
<div id="flow">
@ -934,6 +936,7 @@
</div>
</div>
<div id="footer">
<p style="text-align: center;">This page is fully <a href="https://github.com/teachingtechYT/teachingtechYT.github.io" target="_blank">open source</a>. If you find a bug or have a feature request, please post in the issues section there.</p>
<p style="text-align: center;">This page was created using:</p>
<ul style="margin-top:-20px;">
<li><a href="https://jquery.com/" target="_blank">jQuery</a></li>

4
css/styles.css
View File

@ -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;
}
}

34
js/gcodeprocessing.js
View File

@ -328,13 +328,13 @@ 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");
}
if(abl == 5){
temperature = temperature.replace(/;G29 ; probe ABL/, "G29 L1 ; Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh");
}
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);
@ -380,17 +380,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);
}
@ -523,11 +523,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);

12
js/temperature.js
View File

@ -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