From 31348708dd69cea97359e3cb52a87723e1aca33f Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Tue, 21 Apr 2020 20:31:14 -0400 Subject: [PATCH] add option gcode header with settings. add missing boolean save in device --- js/kiri-driver-cam.js | 11 +++++++++++ js/kiri-init.js | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/js/kiri-driver-cam.js b/js/kiri-driver-cam.js index bb7dc017..d13542ac 100644 --- a/js/kiri-driver-cam.js +++ b/js/kiri-driver-cam.js @@ -1734,6 +1734,17 @@ var gs_kiri_cam = exports; points++; } + if (!stripComments) { + append(`; Generated by Kiri:Moto ${exports.VERSION}`); + append(`; ${new Date().toString()}`); + filterEmit(["; Bed left:{left} right:{right} top:{top} bottom:{bottom}"], consts); + append(`; Target: ${settings.filter[settings.mode]}`); + append("; --- process ---"); + for (let pk in spro) { + append("; " + pk + " = " + spro[pk]); + } + } + // emit gcode preamble filterEmit(gcodes.gcodePre, consts); diff --git a/js/kiri-init.js b/js/kiri-init.js index 0b654b87..ca109639 100644 --- a/js/kiri-init.js +++ b/js/kiri-init.js @@ -1180,8 +1180,8 @@ var gs_kiri_init = exports; gcodeFan: UC.newInput(LANG.dv_fanp_s, {title:LANG.dv_fanp_l, modes:FDM, size:"40%", text:true}), gcodeTrack: UC.newInput(LANG.dv_prog_s, {title:LANG.dv_prog_l, modes:FDM, size:"40%", text:true}), gcodeLayer: UC.newText(LANG.dv_layr_s, {title:LANG.dv_layr_l, modes:FDM, size:14, height: 2}), - gcodeSpace: UC.newBoolean(LANG.dv_tksp_s, null, {title:LANG.dv_tksp_l, modes:CAM_LASER}), - gcodeStrip: UC.newBoolean(LANG.dv_strc_s, null, {title:LANG.dv_strc_l, modes:CAM}), + gcodeSpace: UC.newBoolean(LANG.dv_tksp_s, onBooleanClick, {title:LANG.dv_tksp_l, modes:CAM_LASER}), + gcodeStrip: UC.newBoolean(LANG.dv_strc_s, onBooleanClick, {title:LANG.dv_strc_l, modes:CAM}), gcodeFExt: UC.newInput(LANG.dv_fext_s, {title:LANG.dv_fext_l, modes:CAM_LASER, size:7, text:true}), gcodeDwell: UC.newText(LANG.dv_dwll_s, {title:LANG.dv_dwll_l, modes:CAM, size:14, height:2}), gcodeChange: UC.newText(LANG.dv_tool_s, {title:LANG.dv_tool_l, modes:CAM, size:14, height:2}),