Fixed issues with fusion gcode motion control

This commit is contained in:
David Carley
2021-03-30 11:34:48 -07:00
parent 47cec0dae3
commit e63d8db595
7 changed files with 21 additions and 9 deletions

View File

@@ -164,6 +164,10 @@ class Config(object):
motor['max-jerk'] = 1000
motor['zero-backoff'] = 1
if version < (1, 0, 8):
config['settings']['max-deviation'] = 0.05
config['settings']['junction-accel'] = 200000
config['version'] = self.version.split('b')[0]
config['full_version'] = self.version

View File

@@ -83,6 +83,7 @@ class Planner():
state = self.ctrl.state
config = self.ctrl.config
is_pwm = config.get('tool-type') == 'PWM Spindle'
deviation = config.get('max-deviation')
cfg = {
# NOTE Must get current units not configured default units
@@ -91,8 +92,9 @@ class Planner():
'max-accel': state.get_axis_vector('am', 1000000),
'max-jerk': state.get_axis_vector('jm', 1000000),
'rapid-auto-off': config.get('rapid-auto-off') and is_pwm,
'max-blend-error': config.get('max-deviation'),
'max-merge-error': config.get('max-deviation'),
'max-blend-error': deviation,
'max-merge-error': deviation,
'max-arc-error': deviation / 10,
'junction-accel': config.get('junction-accel'),
}

View File

@@ -9,7 +9,7 @@
"help":
"Default allowed deviation from programmed path. Also see G64 & G61.",
"type": "float",
"min": 0.001,
"min": 0.05,
"max": 100,
"unit": "mm",
"default": 0.1

View File

@@ -28,7 +28,7 @@
},
"settings": {
"junction-accel": 200000,
"max-deviation": 0.001,
"max-deviation": 0.05,
"units": "METRIC",
"probing-prompts": true
},

View File

@@ -28,7 +28,7 @@
},
"settings": {
"junction-accel": 200000,
"max-deviation": 0.001,
"max-deviation": 0.05,
"units": "METRIC",
"probing-prompts": true
},