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 pull request #365 from ChrisToxz/fix

Browse Source 
fix: Error when creating settings summary of acceleration calibration settings
This commit is contained in:
teachingtechYT
2021-09-13 10:51:26 +10:00
committed by GitHub
parent 57ed7acabd 538839fe30
commit 0261a819e5
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
js/gcodeprocessing.js
View File

@ -590,6 +590,15 @@ function outputSettings(formName) {
string += " form\n_________________________________________________________________________\n\n";
string += "G-Code originally generated by Simplify3D(R) Version 4.1.2\nThis calibration test gcode modified by the Teaching Tech Calibration website: https://teachingtechyt.github.io/calibration.html\n";
string += "All changes are marked in the gcode with 'custom' at the end of each line. Open the gcode in a text editor and search for this to your check inputs if needed.\n\n";
// Get selected value
var nozzleLayer = formName.nozzleLayer.value;
// Split Nozzle/Layer value
const nozzleLayerArr = nozzleLayer.split("_");
// Parse both values
string += "\nNozzle diameter: " + nozzleLayerArr[0]/100+" mm";
string += "\nLayer height: " + nozzleLayerArr[1]/100+" mm\n";
if(formName.psuon.checked == true) {
string += "Turn on PSU with M80 active\n"
}
@ -609,6 +618,15 @@ function outputSettings(formName) {
string += ", "+formName.beddia.value+" mm diameter";
}
}
if(formName.baseFeedrate != undefined){
string += "\n\nBase feedrate: "+formName.baseFeedrate.value+" mm/sec";
string += "\nPerimeters: "+document.querySelector( ".perimFeed" ).innerText+" mm/sec";
string += "\nSolid infill: "+document.querySelector( ".solidFeed" ).innerText+" mm/sec";
string += "\nTravel moves: "+document.querySelector( ".travelFeed" ).innerText+" mm/sec";
string += "\nFirst layer: "+document.querySelector( ".firstFeed" ).innerText+" mm/sec";
}
if(formName.name == "firstlayerForm") {
string += "\nExtra margin from edge: "+formName.margin.value+" mm";
}
@ -647,7 +665,8 @@ function outputSettings(formName) {
string += "Z hop: "+formName.zhop.value+" mm\n";
}
if(formName.name == "accelerationForm") {
string += "\nBase feedrate: "+formName.feedrate.value+" mm/s\n\n";
string += "\nInner perimeter feedrate: "+formName.innerFeedrate.value+" mm/s";
string += "\nOuter perimeter feedrate: "+formName.outerFeedrate.value+" mm/s\n\n";
var jjd = formName.jerk_or_jd.value;
if(jjd == "jerk") {
string += "Segment | M204 P Acceleration | M205 Jerk X | M205 Jerk Y| M205 Jerk Z \n";