add disabled drag knife menu and parameters. remove tile scaling as it is duplicative

src/kiri/conf.js

@@ -481,8 +481,8 @@
                     laserSliceHeight: 1,
                     laserSliceHeightMin: 0,
                     laserSliceSingle: false,
+                    laserKnife: false,
                     outputTileSpacing: 1,
-                    outputTileScaling: 1,
                     outputLaserPower: 100,
                     outputLaserSpeed: 1000,
                     outputLaserGroup: true,
@@ -491,7 +491,10 @@
                     outputLaserMerged: false,
                     outputOriginCenter: true,
                     outputInvertX: false,
-                    outputInvertY: false
+                    outputInvertY: false,
+                    outputKnifeDepth: 1,
+                    outputKnifePasses: 1,
+                    outputTipOffset: 2
                 }
             }
         },

src/kiri/export.js

@@ -238,7 +238,6 @@
                 $('send-to-gridhead').style.display = '';
                 $('send-to-gridspool').style.display = '';
             }
-
         }
 
         function sendto_gridlocal() {

src/kiri/init.js

@@ -1466,13 +1466,19 @@
             camFastFeed:         UC.newInput(LANG.cc_rapd_s, {title:LANG.cc_rapd_l, convert:UC.toInt, modes:CAM}),
             camTolerance:        UC.newInput(LANG.ou_toll_s, {title:LANG.ou_toll_l, convert:UC.toFloat, bound:UC.bound(0.001,1.0), modes:CAM}),
 
-            output:              UC.newGroup(LANG.ou_menu, null, {modes:GCODE}),
+            laserLayout:         UC.newGroup(LANG.lo_menu, null, {modes:GCODE}),
             outputTileSpacing:   UC.newInput(LANG.ou_spac_s, {title:LANG.ou_spac_l, convert:UC.toInt, modes:LASER}),
-            outputTileScaling:   UC.newInput(LANG.ou_scal_s, {title:LANG.ou_scal_l, convert:UC.toInt, bound:UC.bound(0.1,100), modes:LASER}),
-            outputLaserPower:    UC.newInput(LANG.ou_powr_s, {title:LANG.ou_powr_l, convert:UC.toInt, bound:UC.bound(1,100), modes:LASER}),
-            outputLaserSpeed:    UC.newInput(LANG.ou_sped_s, {title:LANG.ou_sped_l, convert:UC.toInt, modes:LASER}),
             outputLaserMerged:   UC.newBoolean(LANG.ou_mrgd_s, onBooleanClick, {title:LANG.ou_mrgd_l, modes:LASER}),
             outputLaserGroup:    UC.newBoolean(LANG.ou_grpd_s, onBooleanClick, {title:LANG.ou_grpd_l, modes:LASER}),
+
+            knife:               UC.newGroup(LANG.dk_menu, null, {modes:LASER, show:showLaserKnife }),
+            outputKnifeDepth:    UC.newInput(LANG.dk_dpth_s, {title:LANG.ou_exml_l, convert:UC.toFloat, bound:UC.bound(0.0,5.0), modes:LASER, show:showLaserKnife}),
+            outputKnifePasses:   UC.newInput(LANG.dk_pass_s, {title:LANG.dk_pass_l, convert:UC.toInt, bound:UC.bound(0,5), modes:LASER, show:showLaserKnife}),
+            outputTipOffset:     UC.newInput(LANG.dk_offs_s, {title:LANG.dk_offs_l, convert:UC.toFloat, bound:UC.bound(0.0,10.0), modes:LASER, show:showLaserKnife}),
+
+            output:              UC.newGroup(LANG.ou_menu, null, {modes:GCODE}),
+            outputLaserPower:    UC.newInput(LANG.ou_powr_s, {title:LANG.ou_powr_l, convert:UC.toInt, bound:UC.bound(1,100), modes:LASER}),
+            outputLaserSpeed:    UC.newInput(LANG.ou_sped_s, {title:LANG.ou_sped_l, convert:UC.toInt, modes:LASER}),
             outputLaserZColor:   UC.newBoolean(LANG.ou_layo_s, onBooleanClick, {title:LANG.ou_layo_l, modes:LASER, show:() => { return UI.outputLaserMerged.checked === false }}),
             outputLaserLayer:    UC.newBoolean(LANG.ou_layr_s, onBooleanClick, {title:LANG.ou_layr_l, modes:LASER}),
             outputTemp:          UC.newInput(LANG.ou_nozl_s, {title:LANG.ou_nozl_l, convert:UC.toInt, modes:FDM}),
@@ -1491,6 +1497,7 @@
             outputOriginBounds:  UC.newBoolean(LANG.or_bnds_s, onBooleanClick, {title:LANG.or_bnds_l, modes:LASER}),
             outputOriginCenter:  UC.newBoolean(LANG.or_cntr_s, onBooleanClick, {title:LANG.or_cntr_l, modes:CAM_LASER}),
             camOriginTop:        UC.newBoolean(LANG.or_topp_s, onBooleanClick, {title:LANG.or_topp_l, modes:CAM}),
+            laserKnife:          UC.newBoolean(LANG.ou_drkn_s, onBooleanClick, {title:LANG.ou_drkn_l, modes:[]}),
 
             advanced:            UC.newGroup(LANG.ad_menu, null, {modes:FDM, expert:true}),
             outputRetractDist:   UC.newInput(LANG.ad_rdst_s, {title:LANG.ad_rdst_l, convert:UC.toFloat, modes:FDM, expert:true}),
@@ -1574,6 +1581,10 @@
             layerMoves:    UC.newBoolean(LANG.la_move, onLayerToggle, {modes:GCODE})
         });
 
+        function showLaserKnife() {
+            return UI.laserKnife.checked;
+        }
+
         function spindleShow() {
             return settings().device.spindleMax > 0;
         }

src/mode/laser/driver.js

@@ -230,8 +230,6 @@
                 point = out.point;
                 if (process.outputInvertX) point.x = -point.x;
                 if (process.outputInvertY) point.y = -point.y;
-                point.x *= process.outputTileScaling;
-                point.y *= process.outputTileScaling;
                 min.x = Math.min(min.x, point.x);
                 max.x = Math.max(max.x, point.x);
                 min.y = Math.min(min.y, point.y);

web/kiri/lang/en.js

@@ -320,6 +320,15 @@ kiri.lang['en-us'] = {
     // OUTPUT
     ou_menu:        "output",
 
+    // LASER KNIFE
+    dk_menu:        "knife",
+    dk_dpth_s:      "cut depth",
+    dk_dpth_l:      "cut depth per pass\nin millimeters",
+    dk_pass_s:      "cut passes",
+    dk_pass_l:      "number of passes\neach pass is deeper",
+    dk_offs_s:      "tip offset",
+    dk_offs_l:      "distance from blade tip\nto center of tool\nin millimeters",
+
     // OUTPUT LASER
     ou_spac_s:      "spacing",
     ou_spac_l:      "distance between layer output\nin millimeters",
@@ -337,6 +346,8 @@ kiri.lang['en-us'] = {
     ou_layr_l:      "output layer order\nfrom top right to\nbottom left",
     ou_layo_s:      "layer color",
     ou_layo_l:      "output layer colors\nfor each z index\noverridden by merged",
+    ou_drkn_s:      "drag knife",
+    ou_drkn_l:      "enable drag knife\noutput menu",
 
     // OUTPUT FDM
     ou_nozl_s:      "nozzle temp",