From 780e2839312f33787fa93bb4e37968df21743ece Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Fri, 12 Apr 2019 12:47:22 -0400 Subject: [PATCH] more LANG entries --- js/kiri-driver-fdm.js | 2 +- js/kiri-lang.js | 20 +++++++++++++++++--- js/kiri.js | 18 +++++++++--------- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/js/kiri-driver-fdm.js b/js/kiri-driver-fdm.js index f78b5b3e..ed1d0f7f 100644 --- a/js/kiri-driver-fdm.js +++ b/js/kiri-driver-fdm.js @@ -461,7 +461,7 @@ var gs_kiri_fdm = exports; } } - append("; Generated by KIRI:MOTO " + exports.VERSION); + append("; Generated by Kiri:Moto " + exports.VERSION); append("; "+new Date().toString()); append(constReplace("; Bed left:{left} right:{right} top:{top} bottom:{bottom}", consts)); append("; --- process ---"); diff --git a/js/kiri-lang.js b/js/kiri-lang.js index 7b176064..6d7159da 100644 --- a/js/kiri-lang.js +++ b/js/kiri-lang.js @@ -33,10 +33,24 @@ var gs_kiri_lang = exports; LANG.en = { version: "version", dev_name: "name", - dev_filament: "filament", + dev_fil: "filament", dev_fil_desc: "diameter in millimeters", - dev_nozzle: "nozzle", - dev_noz_desc: "diameter in millimeters" + dev_nozl: "nozzle", + dev_nozl_desc: "diameter in millimeters", + dev_bedw: "bed width", + dev_bedw_desc: "millimeters", + dev_bedd: "bed depth", + dev_bedd_desc: "millimeters", + dev_bedhm: "max height", + dev_bedhm_desc: "max build height\nin millimeters", + dev_spmax: "max spindle rpm", + dev_spmax_desc: "max spindle speed\n0 to disable", + dev_extab: "extrude absolute", + dev_extab_desc: "extrusion moves absolute", + dev_orgc: "origin center", + dev_orgc_desc: "bed origin center", + dev_orgt: "origin top", + dev_orgt_desc: "part z origin top" }; LANG.test = { diff --git a/js/kiri.js b/js/kiri.js index 1da68592..14992ba0 100644 --- a/js/kiri.js +++ b/js/kiri.js @@ -2306,15 +2306,15 @@ self.kiri.license = exports.LICENSE; device: UC.newGroup("device", $('device')), deviceName: UC.newInput(LANG.dev_name, {size:20}), - setDeviceFilament: UC.newInput(LANG.dev_filament, {title:LANG.dev_fil_desc, convert:UC.toFloat, modes:FDM}), - setDeviceNozzle: UC.newInput(LANG.dev_nozzle, {title:LANG.dev_noz_desc, convert:UC.toFloat, modes:FDM}), - setDeviceWidth: UC.newInput("bed width", {title:"millimeters", convert:UC.toInt}), - setDeviceDepth: UC.newInput("bed depth", {title:"millimeters", convert:UC.toInt}), - setDeviceHeight: UC.newInput("max height", {title:"max build height\nin millimeters", convert:UC.toInt, modes:FDM}), - setDeviceMaxSpindle: UC.newInput("max spindle rpm", {title:"max spindle speed\n0 to disable", convert:UC.toInt, modes:CAM}), - setDeviceExtrusion: UC.newBoolean("extrude absolute", onBooleanClick, {title:"extrusion moves absolute"}), - setDeviceOrigin: UC.newBoolean("origin center", onBooleanClick, {title:"bed origin center"}), - setDeviceOriginTop: UC.newBoolean("origin top", onBooleanClick, {title:"part z origin top", modes:CAM}), + setDeviceFilament: UC.newInput(LANG.dev_fil, {title:LANG.dev_fil_desc, convert:UC.toFloat, modes:FDM}), + setDeviceNozzle: UC.newInput(LANG.dev_nozl, {title:LANG.dev_nozl_desc, convert:UC.toFloat, modes:FDM}), + setDeviceWidth: UC.newInput(LANG.dev_bedw, {title:LANG.dev_bedw_desc, convert:UC.toInt}), + setDeviceDepth: UC.newInput(LANG.dev_bedd, {title:LANG.dev_bedd_desc, convert:UC.toInt}), + setDeviceHeight: UC.newInput(LANG.dev_bedhm, {title:LANG.dev_bedhm_desc, convert:UC.toInt, modes:FDM}), + setDeviceMaxSpindle: UC.newInput(LANG.dev_spmax, {title:LANG.dev_spmax_desc, convert:UC.toInt, modes:CAM}), + setDeviceExtrusion: UC.newBoolean(LANG.dev_extab, onBooleanClick, {title:LANG.dev_extab_desc}), + setDeviceOrigin: UC.newBoolean(LANG.dev_orgc, onBooleanClick, {title:LANG.dev_orgc_desc}), + setDeviceOriginTop: UC.newBoolean(LANG.dev_orgt, onBooleanClick, {title:LANG.dev_orgt_desc, modes:CAM}), setDevice: UC.newGroup("gcode", $('device')), setDeviceFan: UC.newInput("fan power", {title:"set cooling fan power", modes:FDM, size:15}),