patch logging
This commit is contained in:
@@ -412,7 +412,7 @@ module.exports = new Vue({
|
|||||||
selected_tool !== "pwm" &&
|
selected_tool !== "pwm" &&
|
||||||
selected_tool !== "laser" &&
|
selected_tool !== "laser" &&
|
||||||
selected_tool !== "router";
|
selected_tool !== "router";
|
||||||
console.log("saveModBus: ", saveModbus);
|
console.log("saveModBus: ", saveModbus);
|
||||||
const settings = {
|
const settings = {
|
||||||
["tool"]: { ...this.config.tool },
|
["tool"]: { ...this.config.tool },
|
||||||
["pwm-spindle"]: { ...this.config["pwm-spindle"] },
|
["pwm-spindle"]: { ...this.config["pwm-spindle"] },
|
||||||
|
|||||||
@@ -161,7 +161,7 @@ module.exports = {
|
|||||||
this.config.tool = merge({}, this.config.tool, settings["tool"]);
|
this.config.tool = merge({}, this.config.tool, settings["tool"]);
|
||||||
this.config["pwm-spindle"] = merge({}, this.config["pwm-spindle"], settings["pwm-spindle"]);
|
this.config["pwm-spindle"] = merge({}, this.config["pwm-spindle"], settings["pwm-spindle"]);
|
||||||
this.config["modbus-spindle"] = merge({}, this.config["modbus-spindle"], settings["modbus-spindle"]);
|
this.config["modbus-spindle"] = merge({}, this.config["modbus-spindle"], settings["modbus-spindle"]);
|
||||||
console.log(config);
|
console.log(this.config);
|
||||||
const tool = this.toolList.find(tool => tool.id == this.config.tool["selected-tool"]);
|
const tool = this.toolList.find(tool => tool.id == this.config.tool["selected-tool"]);
|
||||||
console.log("tool: ", tool);
|
console.log("tool: ", tool);
|
||||||
this.config.tool["tool-type"] = tool.type || tool.name;
|
this.config.tool["tool-type"] = tool.type || tool.name;
|
||||||
|
|||||||
Reference in New Issue
Block a user