muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logging the place to set state vars, settings config vars

Browse Source
This commit is contained in:
sanjayk03-dev
2024-07-17 20:16:42 +05:30
parent 39c5867710
commit 2e2dff2d32
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/py/bbctrl/Mach.py
View File

@@ -275,6 +275,7 @@ class Mach(Comm):
def home(self, axis, position = None): def home(self, axis, position = None):
state = self.ctrl.state state = self.ctrl.state
config = self.ctrl.config
if axis is None: axes = 'zxyabc' # TODO This should be configurable if axis is None: axes = 'zxyabc' # TODO This should be configurable
else: axes = '%c' % axis else: axes = '%c' % axis
@@ -312,6 +313,10 @@ class Mach(Comm):
self.planner.mdi(gcode, False) self.planner.mdi(gcode, False)
super().resume() super().resume()
if 'offset_' + axis in config.values:
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))
def unhome(self, axis): self.mdi('G28.2 %c0' % axis) def unhome(self, axis): self.mdi('G28.2 %c0' % axis)

1
src/py/bbctrl/Pwr.py
View File

@@ -161,7 +161,6 @@ class Pwr():
else: value /= 100.0 else: value /= 100.0
key = reg_names[i] key = reg_names[i]
self.log.info('164 pwr: {}:{}'.format(key,value))
self.ctrl.state.set(key, value) self.ctrl.state.set(key, value)
if self.regs[i] != value: if self.regs[i] != value:

5
src/py/bbctrl/State.py
View File

@@ -233,10 +233,11 @@ class State(object):
keys = ['xp', 'yp', 'zp', 'offset_x', 'offset_y', 'offset_z'] keys = ['xp', 'yp', 'zp', 'offset_x', 'offset_y', 'offset_z']
if name in keys and 'cycle' in self.vars: if name in keys and 'cycle' in self.vars:
self.log.info('236 sanjay cycle: %s'%self.vars['cycle']) self.log.info('236 cycle:{} name:{} value:{}'.format(self.vars['cycle'], name, value))
if self.vars['cycle'] == 'mdi': if self.vars['cycle'] == 'mdi':
self.log.info('238 changing data %s : %d , %d' % (name, value, self.vars[name])) self.log.info('238 changing data %s : %d , %d' % (name, value, self.vars[name]))
# self.ctrl.config.set('axes',{name: value}) self.ctrl.config.set('axes', {name: value})
if not name in self.vars or self.vars[name] != value: if not name in self.vars or self.vars[name] != value:
self.vars[name] = value self.vars[name] = value