From 0de9bde0fb5e0ad0c70ccfee210ca43dcd6d5398 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Wed, 17 Jul 2024 16:36:11 +0530 Subject: [PATCH] auto homing, logging --- src/js/axis-vars.js | 7 ++++--- src/js/control-view.js | 7 ++++--- src/py/bbctrl/State.py | 8 ++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/js/axis-vars.js b/src/js/axis-vars.js index 92fc20f..e563f57 100644 --- a/src/js/axis-vars.js +++ b/src/js/axis-vars.js @@ -240,9 +240,10 @@ module.exports = { if (!homed && this.ask_home) { this.ask_home = false; - SvelteComponents.showDialog("HomeMachine", { - home: () => this.home() - }); + this.home() + // SvelteComponents.showDialog("HomeMachine", { + // home: () => this.home() + // }); } return { diff --git a/src/js/control-view.js b/src/js/control-view.js index ae58bea..0b31c51 100644 --- a/src/js/control-view.js +++ b/src/js/control-view.js @@ -743,13 +743,14 @@ module.exports = { this.confirmDelete = false; }, - home: function (axis) { + home: async function (axis) { this.ask_home = false; if (typeof axis == "undefined") { - api.put("home"); + await api.put("home"); + console.log('store data') } else if (this[axis].homingMode != "manual") { - api.put(`home/${axis}`); + await api.put(`home/${axis}`); } else { SvelteComponents.showDialog("ManualHomeAxis", { axis }); } diff --git a/src/py/bbctrl/State.py b/src/py/bbctrl/State.py index 0570cf3..39cd9ac 100644 --- a/src/py/bbctrl/State.py +++ b/src/py/bbctrl/State.py @@ -230,6 +230,9 @@ class State(object): def set(self, name, value): name = self.resolve(name) + keys = ['xp', 'yp', 'zp', 'offset_x', 'offset_y', 'offset_z'] + self.log.info('234 Sanjay %s : %f' % (name,value)) + if not name in self.vars or self.vars[name] != value: self.vars[name] = value @@ -238,6 +241,10 @@ class State(object): # Trigger listener notify if self.timeout is None: self.timeout = self.ctrl.ioloop.call_later(0.25, self._notify) + + if name in keys: + self.log.info('246 cycle: %s'%self.vars['cycle']) + self.log.info('247 Sanjay %s : %f , %f' % (name,value,self.vars[name])) def update(self, update): @@ -246,6 +253,7 @@ class State(object): self.set(name, value) if 'cycle' in self.vars and name in keys: if self.vars['cycle'] == 'idle': + self.log.info('256 cycle: %s'%self.vars['cycle']) self.log.info('Sanjay %s : %f' % (name,value)) self.ctrl.config.set('axes',{name: value})