diff --git a/js/commongcode.js b/js/commongcode.js index ff4ac8f..29e8810 100644 --- a/js/commongcode.js +++ b/js/commongcode.js @@ -4,8 +4,8 @@ var commonStart =`; G-Code originally generated by Simplify3D(R) Version 4.1.2 G90 M82 M106 S0 -M140 S60 -M190 S60 +;bed0a +;bed0b ;temp0a ;temp0b G28 ; home all axes diff --git a/js/gcodeprocessing.js b/js/gcodeprocessing.js index 93d28d0..df563bb 100644 --- a/js/gcodeprocessing.js +++ b/js/gcodeprocessing.js @@ -253,11 +253,11 @@ function processGcode(formName) { // bed temp var gcode = commonStart; if(bedTemp == 0){ - gcode = gcode.replace(/M140 S60/g, "; no heated bed"); - gcode = gcode.replace(/M190 S60/g, "; no heated bed"); + gcode = gcode.replace(/;bed0a/g, "; no heated bed"); + gcode = gcode.replace(/;bed0b/g, "; no heated bed"); } else { - gcode = gcode.replace(/M140 S60/g, "M140 S"+bedTemp+" ; custom bed temp"); - gcode = gcode.replace(/M190 S60/g, "M190 S"+bedTemp+" ; custom bed temp"); + gcode = gcode.replace(/;bed0a/g, "M140 S"+bedTemp+" ; custom bed temp"); + gcode = gcode.replace(/;bed0b/g, "M190 S"+bedTemp+" ; custom bed temp"); } // start hot end emp if(abl != 4){ @@ -285,8 +285,14 @@ function processGcode(formName) { gcode = gcode.replace(/;M420 S1 ; restore ABL mesh/, "M109 S"+hotendTemp+" T0 ; custom hot end temp"); } if(abl == 5){ + gcode = gcode.replace(/;G29 ; probe ABL/, "G29 L0 ; Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh"); + } + if(abl == 6){ gcode = gcode.replace(/;G29 ; probe ABL/, "G29 L1 ; Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh"); } + if(abl == 7){ + gcode = gcode.replace(/;G29 ; probe ABL/, "G29 L2 ; Load the mesh stored in slot 1\nG29 J ; Probe 3 points to tilt mesh"); + } // firstlayer test square array if(name == "firstlayerForm"){ var originalSquare = firstlayer[nozzleLayer]; @@ -477,7 +483,6 @@ function processGcode(formName) { gcode = gcode.replace(/;process Process-5/, "M104 S"+e1+" T0 ; custom hot end temp - E"); } } - // final tweaks for start and end gcode if(formName.psuon.checked == true) { @@ -494,10 +499,6 @@ function processGcode(formName) { } // process finished gcode file downloadFile(description+'.gcode', gcode); - - - - } function processFirstlayer(){