diff --git a/src/js/control-view.js b/src/js/control-view.js index 13db9e2..7c740aa 100644 --- a/src/js/control-view.js +++ b/src/js/control-view.js @@ -783,7 +783,6 @@ module.exports = { try { for (const axis of axes) { if (this.config.axes["offset_" + axis]) { - console.log(axis, this.config.axes["offset_" + axis]); this.set_position(axis, -this.config.axes["offset_" + axis]); } } diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug index 2b84f54..0e91255 100644 --- a/src/pug/templates/control-view.pug +++ b/src/pug/templates/control-view.pug @@ -131,7 +131,7 @@ script#control-view-template(type="text/x-template") .fa.fa-home button.pure-button(:disabled="!is_idle", @click=`load_position('xyz')`, - title=`Load all origin.`, style="height:60px;width:60px") + title=`Load all axis origin.`, style="height:60px;width:60px") .fa.fa-map-pin each axis in 'xyzabc' diff --git a/src/py/bbctrl/Config.py b/src/py/bbctrl/Config.py index 66cb5de..99cbdca 100644 --- a/src/py/bbctrl/Config.py +++ b/src/py/bbctrl/Config.py @@ -102,7 +102,6 @@ class Config(object): config_data[name] = default self.save(config_data) - # self.log.info('105: name:{} default:{}'.format(name, default)) except Exception: self.log.exception('Internal error: Failed to upgrade config') def save(self, config): diff --git a/src/py/bbctrl/Mach.py b/src/py/bbctrl/Mach.py index b588dea..2aee1ef 100644 --- a/src/py/bbctrl/Mach.py +++ b/src/py/bbctrl/Mach.py @@ -275,7 +275,6 @@ class Mach(Comm): def home(self, axis, position = None): state = self.ctrl.state - # config = self.ctrl.config if axis is None: axes = 'zxyabc' # TODO This should be configurable else: axes = '%c' % axis @@ -313,19 +312,6 @@ class Mach(Comm): self.planner.mdi(gcode, False) super().resume() - # if 'offset_' + axis and axis + 'p' in config.values: - # state.set('offset_' + axis, config.values['offset_' + axis]) - # state.set(axis + 'p', 0) - # self.log.info('Set the state value from config: {} = {}'.format('offset_' + axis , config.values['offset_' + axis])) - # else: - # self.log.info('Values is not present in config:{}'.format('offset_' + axis)) - - # self.log.info('324: Cycle : {}'.format(state.get('cycle'))) - - # for axis in axes: - # if 'offset_' + axis in config.values: - # self.log.info('327 axis: {} == {}'.format(axis, config.values['offset_' + axis])) - # self.set_position(axis, -float(config.values['offset_' + axis])) def unhome(self, axis): self.mdi('G28.2 %c0' % axis) diff --git a/src/py/bbctrl/State.py b/src/py/bbctrl/State.py index 0afa7be..6fa9221 100644 --- a/src/py/bbctrl/State.py +++ b/src/py/bbctrl/State.py @@ -233,9 +233,7 @@ class State(object): keys = ['offset_x', 'offset_y', 'offset_z'] if name in keys and 'cycle' in self.vars: - # self.log.info('236 cycle:{} name:{} value:{}'.format(self.vars['cycle'], name, value)) if self.vars['cycle'] == 'mdi': - # self.log.info('238 changing data %s : %d , %d' % (name, value, self.vars[name])) self.ctrl.config.set('axes', {name: value})