diff --git a/calibration.html b/calibration.html index 014afe2..be24bea 100644 --- a/calibration.html +++ b/calibration.html @@ -226,6 +226,7 @@

If you don't know what to enter here, you can leave the retraction speed at 40 mm/sec. For a bowden tube printer, 6mm is a likely retraction distance. For direct drive, a starting value of 1mm may be suitable.


+


@@ -304,6 +305,7 @@

If you don't know what to enter here, you can leave the retraction speed at 40 mm/sec. For a bowden tube printer, 6mm is a likely retraction distance. For direct drive, a starting value of 1mm may be suitable.


+


@@ -888,6 +890,7 @@

For initial tests, you can leave the retraction speed at 40 mm/sec. For a bowden tube printer, 6mm is a likely retraction distance. For direct drive, a starting value of 1mm may be suitable. If you are following this guide in order, you should already know your ideal retraction values.


+


Hot end temperature

Typically, filament comes with a recommended hot end temperature. It is recommended to use values either side of this. For instance, if a PLA filament asked for 200 degrees, you may vary the temperature from 190, 195, 200, 205, 210 (the default values of the form). Typically, the first layer temperature will be elevated to increase adhesion with the bed, especially if a lower than usual temperature is being trialled for segment A.

@@ -1079,6 +1082,7 @@

For initial tests, you can leave the retraction speed at 40 mm/sec. For a bowden tube printer, 6mm is a likely retraction distance. For direct drive, a starting value of 1mm may be suitable. If you are following this guide in order, you should already know your ideal retraction values.


+


Base feedrate/speed

You can specify the feedrate for X and Y movements. The inner perimeter will be set to this speed and the outer perimeter 50% of this speed.

diff --git a/js/gcodeprocessing.js b/js/gcodeprocessing.js index 09d846f..4a00eaa 100644 --- a/js/gcodeprocessing.js +++ b/js/gcodeprocessing.js @@ -98,6 +98,7 @@ function processFirstlayer(){ var bedY = document.firstlayerForm.bedy.value - 50; var bedRad = Math.round((document.firstlayerForm.beddia.value)/2); var retDist = document.firstlayerForm.retdist.value; + var retDistExtra = document.firstlayerForm.retdistextra.value; var retSpeed = document.firstlayerForm.retspeed.value*60; var abl = document.firstlayerForm.abl.value; var customStart = document.firstlayerForm.startgcode.value; @@ -210,7 +211,7 @@ function processFirstlayer(){ } var firstlayer = firstlayerStart+skirts+squares+firstlayerEnd; firstlayer = firstlayer.replace(/G1 E-5.0000 F2400/g, "G1 E-"+retDist+" F"+retSpeed+" ; custom retraction"); - firstlayer = firstlayer.replace(/G1 E0.0000 F2400/g, "G1 E0.0000 F"+retSpeed+" ; custom un-retraction/prime"); + firstlayer = firstlayer.replace(/G1 E0.0000 F2400/g, "G1 E"+retDistExtra+" F"+retSpeed+" ; custom un-retraction/prime"); if(document.firstlayerForm.psuon.checked == true) { firstlayer = firstlayer.replace(/;M80/, "M80"); } @@ -227,6 +228,7 @@ function processBaseline(){ var bedX = Math.round((document.baselineForm.bedx.value-100)/2); var bedY = Math.round((document.baselineForm.bedy.value-100)/2); var retDist = document.baselineForm.retdist.value; + var retDistExtra = document.baselineForm.retdistextra.value; var retSpeed = document.baselineForm.retspeed.value*60; var abl = document.baselineForm.abl.value; var pc = document.baselineForm.pc.value; @@ -270,7 +272,7 @@ function processBaseline(){ baseline = baseline.replace(/M109 S210 T0/g, "; Prusa Mini"); } baseline = baseline.replace(/G1 E-5.0000 F2400/g, "G1 E-"+retDist+" F"+retSpeed+" ; custom retraction"); - baseline = baseline.replace(/G1 E0.0000 F2400/g, "G1 E0.0000 F"+retSpeed+" ; custom un-retraction/prime"); + baseline = baseline.replace(/G1 E0.0000 F2400/g, "G1 E"+retDistExtra+" F"+retSpeed+" ; custom un-retraction/prime"); if(abl == 1){ baseline = baseline.replace(/;G29 ; probe ABL/, "G29 ; probe ABL"); } @@ -528,6 +530,7 @@ function processTemperature(){ var bedX = Math.round((document.temperatureForm.bedx.value-100)/2); var bedY = Math.round((document.temperatureForm.bedy.value-100)/2); var retDist = document.temperatureForm.retdist.value; + var retDistExtra = document.temperatureForm.retdistextra.value; var retSpeed = document.temperatureForm.retspeed.value*60; var abl = document.temperatureForm.abl.value; var pc = document.temperatureForm.pc.value; @@ -589,7 +592,7 @@ function processTemperature(){ temperature = temperature.replace(/M140 S60/, "M140 S"+bedTemp+" ; custom bed temp"); temperature = temperature.replace(/M190 S60/, "M190 S"+bedTemp+" ; custom bed temp"); temperature = temperature.replace(/G1 E-5.0000 F2400/g, "G1 E-"+retDist+" F"+retSpeed+" ; custom retraction"); - temperature = temperature.replace(/G1 E0.0000 F2400/g, "G1 E0.0000 F"+retSpeed+" ; custom unretraction/prime"); + temperature = temperature.replace(/G1 E0.0000 F2400/g, "G1 E"+retDistExtra+" F"+retSpeed+" ; custom un-retraction/prime"); if(centre == true){ var temperatureArray = temperature.split(/\n/g); @@ -661,6 +664,7 @@ function processAcceleration(){ var bedX = Math.round((document.accelerationForm.bedx.value-100)/2); var bedY = Math.round((document.accelerationForm.bedy.value-100)/2); var retDist = document.accelerationForm.retdist.value; + var retDistExtra = document.accelerationForm.retdistextra.value; var retSpeed = document.accelerationForm.retspeed.value*60; var abl = document.accelerationForm.abl.value; var pc = document.accelerationForm.pc.value; @@ -730,7 +734,7 @@ function processAcceleration(){ acceleration = acceleration.replace(/M109 S210/g, "; Prusa Mini"); } acceleration = acceleration.replace(/G1 E-5.0000 F2400/g, "G1 E-"+retDist+" F"+retSpeed+" ; custom retraction"); - acceleration = acceleration.replace(/G1 E0.0000 F2400/g, "G1 E0.0000 F"+retSpeed+" ; custom un-retraction/prime"); + acceleration = acceleration.replace(/G1 E0.0000 F2400/g, "G1 E"+retDistExtra+" F"+retSpeed+" ; custom un-retraction/prime"); if(abl == 1){ acceleration = acceleration.replace(/;G29 ; probe ABL/, "G29 ; probe ABL"); }