From 9a2457d0f33946fafcfe76eb90d1684d1b12a1cc Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Mon, 8 Jul 2024 17:35:51 +0530 Subject: [PATCH] updating in mach --- src/js/control-view.js | 21 +++++++++++---------- src/py/bbctrl/Mach.py | 10 +++++++--- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/js/control-view.js b/src/js/control-view.js index a87e9b2..b81bbd2 100644 --- a/src/js/control-view.js +++ b/src/js/control-view.js @@ -776,16 +776,17 @@ module.exports = { }, set_position: async function (axis, position) { - this.update_config(); - if (!this.config.axes) { - this.config.axes = {}; - } - this.config.axes[axis] = { - abs: position + this.state["offset_" + axis], - off: this.state["offset_" + axis], - }; - console.log(this.config); - await api.put(`position/${axis}`, { position: parseFloat(position) }); + api.put(`position/${axis}`, { position: parseFloat(position) }); + // this.update_config(); + // if (!this.config.axes) { + // this.config.axes = {}; + // } + // this.config.axes[axis] = { + // abs: position + this.state["offset_" + axis], + // off: this.state["offset_" + axis], + // }; + // console.log(this.config); + // await this.save_config(this.config); }, zero_all: function () { diff --git a/src/py/bbctrl/Mach.py b/src/py/bbctrl/Mach.py index dd838af..afa82b9 100644 --- a/src/py/bbctrl/Mach.py +++ b/src/py/bbctrl/Mach.py @@ -358,7 +358,7 @@ class Mach(Comm): def set_position(self, axis, position): axis = axis.lower() state = self.ctrl.state - # config = self.ctrl.config + config = self.ctrl.config if state.is_axis_homed(axis): # If homed, change the offset rather than the absolute position @@ -374,9 +374,13 @@ class Mach(Comm): # json_data = config.values # axes = json_data.setdefault('axes', {}) # axes[axis] = { 'abs' : target, 'off' : state.get('offset_' + axis)} - self.mlog.info('target ' + target) - self.mlog.info('state.get ' + state.get('offset_' + axis)) + self.mlog.info('target ' + str(target)) + self.mlog.info('state.get ' + str(state.get('offset_' + axis))) state.set(axis + 'p', target) + if 'axes' in config.values: + config.values['axes'][axis] = { 'abs' : target, 'off' : state.get('offset_' + axis) } + else: + config.values['axes'] = { axis : { 'abs' : target, 'off' : state.get('offset_' + axis) } } super().queue_command(Cmd.set_axis(axis, target))