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

Merge pull request #22 from dacarley/config-upgrade

Browse Source 
Force set a handful of config values for 1.0.7
This commit is contained in:
OneFinityCNC
2021-03-06 11:54:44 -05:00
committed by GitHub
parent 392c3b3834 b3c21a9831
commit c10c7f0d60
1 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/py/bbctrl/Config.py
View File

@@ -141,35 +141,23 @@ class Config(object):
version = version.split('b')[0] # Strip off any "beta" suffix version = version.split('b')[0] # Strip off any "beta" suffix
version = tuple(map(int, version.split('.'))) # Break it into a tuple of integers version = tuple(map(int, version.split('.'))) # Break it into a tuple of integers
if version < (0, 2, 4): if version < (1, 0, 7):
config['settings']['max-deviation'] = 0.001
config['settings']['junction-accel'] = 200000
for motor in config['motors']: for motor in config['motors']:
for key in 'max-jerk max-velocity'.split(): motor['stall-microstep'] = 8
if key in motor: motor[key] /= 1000 motor['stall-current'] = 1
motor['max-accel'] = 750
if version < (0, 3, 4): if motor['axis'] == 'X' or motor['axis'] == 'Y':
for motor in config['motors']: motor['search-velocity'] = 1.688
for key in 'max-accel latch-velocity search-velocity'.split(): motor['max-velocity'] = 10
if key in motor: motor[key] /= 1000 motor['max-jerk'] = 15000
motor['zero-backoff'] = 1.5
if version <= (0, 3, 22): if motor['axis'] == 'Z':
if 'tool' in config: motor['search-velocity'] = 0.675
if 'spindle-type' in config['tool']: motor['max-velocity'] = 3
type = config['tool']['spindle-type'] motor['max-jerk'] = 1000
if type == 'PWM': type = 'PWM Spindle' motor['zero-backoff'] = 1
if type == 'Huanyang': type = 'Huanyang VFD'
config['tool']['tool-type'] = type
del config['tool']['spindle-type']
if 'spin-reversed' in config['tool']:
reversed = config['tool']['spin-reversed']
config['tool']['tool-reversed'] = reversed
del config['tool']['spin-reversed']
if version <= (0, 4, 6):
for motor in config['motors']:
if 2 < motor.get('idle-current', 0): motor['idle-current'] = 2
if 'enabled' not in motor:
motor['enabled'] = motor.get('power-mode', '') != 'disabled'
config['version'] = self.version config['version'] = self.version