Merge branch 'master' into neil

modules/path/formats/g-code

@@ -37,10 +37,10 @@ var name = 'path to G-code'
 // initialization
 //
 var init = function() {
-   mod.cutspeed.value = '2.5'
-   mod.plungespeed.value = '2.5'
+   mod.cutspeed.value = '1'
+   mod.plungespeed.value = '1'
    mod.jogheight.value = '2'
-   mod.spindlespeed.value = '11000'
+   mod.spindlespeed.value = '10000'
    mod.tool.value = '1'
    mod.coolantoff.checked = true
    mod.formatMm.checked = true
@@ -224,14 +224,14 @@ function make_path() {
    str += "G80\n" // cancel canned cycles
    str += "G90\n" // absolute coordinates
    str += "G94\n" // feed/minute units
-   str += "T"+tool+"M06\n" // tool selection, tool change
+   //str += "T"+tool+"M06\n" // tool selection, tool change // some interpreters have trouble with this
    str += "F"+cut_speed.toFixed(4)+"\n" // feed rate
    str += "S"+spindle_speed+"\n" // spindle speed
    if (mod.coolanton.checked)
       str += "M08\n" // coolant on
    str += "G00Z"+jog_height.toFixed(4)+"\n" // move up before starting spindle
    str += "M03\n" // spindle on clockwise
-   str += "G04 P1\n" // give spindle 1 second to spin up
+   //str += "G04 P1000\n" // give spindle 1 second to spin up // some interpreters have trouble with this
    //
    // follow segments
    //
@@ -262,7 +262,8 @@ function make_path() {
    //
    // finish
    //
-   str += "G00Z"+jog_height.toFixed(4)+"\n" // move up before stopping spindle
+   str += "G00Z"+jog_height.toFixed(4)+"\n" // move up
+   str += "G00X0.0000Y0.0000"+"Z"+jog_height.toFixed(4)+"\n" // finish at origin
    str += "M05\n" // spindle stop
    if (mod.coolanton.checked)
       str += "M09\n" // coolant off