diff --git a/src/py/bbctrl/Config.py b/src/py/bbctrl/Config.py index 5dc39ac..ab557a8 100644 --- a/src/py/bbctrl/Config.py +++ b/src/py/bbctrl/Config.py @@ -147,7 +147,9 @@ class Config(object): for motor in config['motors']: motor['stall-microstep'] = 8 motor['stall-current'] = 1 + motor['idle-current'] = 1 motor['max-accel'] = 750 + motor['latch-backoff'] = 5 if motor['axis'] == 'X' or motor['axis'] == 'Y': motor['search-velocity'] = 1.688 motor['max-velocity'] = 10 diff --git a/src/resources/onefinity_machinist_defaults.json b/src/resources/onefinity_machinist_defaults.json index 544e478..1fc9a26 100644 --- a/src/resources/onefinity_machinist_defaults.json +++ b/src/resources/onefinity_machinist_defaults.json @@ -38,9 +38,9 @@ "max-velocity": 10, "search-velocity": 1.688, "travel-per-rev": 10, - "idle-current": 0.5, + "idle-current": 1, "drive-current": 2.8, - "latch-backoff": 5.001, + "latch-backoff": 5, "enabled": true, "homing-mode": "stall-min", "reverse": false, @@ -48,7 +48,7 @@ "min-soft-limit": 0, "max-switch": "disabled", "step-angle": 1.8, - "stall-current": 1.0, + "stall-current": 1, "stall-sample-time": 200, "microsteps": 16, "stall-volts": 2, @@ -64,9 +64,9 @@ "max-velocity": 10, "search-velocity": 1.688, "travel-per-rev": 10, - "idle-current": 0.5, + "idle-current": 1, "drive-current": 2.8, - "latch-backoff": 5.001, + "latch-backoff": 5, "enabled": true, "homing-mode": "stall-min", "reverse": false, @@ -86,29 +86,29 @@ }, { "latch-velocity": 0.1, - "max-accel": 10, - "max-velocity": 17, - "search-velocity": 0.5, + "max-accel": 750, + "max-velocity": 10, + "search-velocity": 1.688, "travel-per-rev": 10, - "idle-current": 0.5, + "idle-current": 1, "drive-current": 2.8, "latch-backoff": 5, "enabled": true, - "homing-mode": "manual", + "homing-mode": "stall-min", "reverse": false, "stall-microstep": 8, "min-soft-limit": 0, "max-switch": "disabled", "step-angle": 1.8, - "stall-current": 1.5, - "stall-sample-time": 50, + "stall-current": 1, + "stall-sample-time": 200, "microsteps": 16, - "stall-volts": 6, + "stall-volts": 2, "axis": "Y", "min-switch": "disabled", - "max-jerk": 50, - "max-soft-limit": 752, - "zero-backoff": 1 + "max-jerk": 1000, + "max-soft-limit": 410, + "zero-backoff": 1.5 }, { "latch-velocity": 0.1, @@ -116,9 +116,9 @@ "max-velocity": 3, "search-velocity": 0.675, "travel-per-rev": 4, - "idle-current": 0.5, + "idle-current": 1, "drive-current": 2.8, - "latch-backoff": 5.001, + "latch-backoff": 5, "enabled": true, "homing-mode": "stall-max", "reverse": true, diff --git a/src/resources/onefinity_woodworker_defaults.json b/src/resources/onefinity_woodworker_defaults.json index 9eec222..c6de435 100644 --- a/src/resources/onefinity_woodworker_defaults.json +++ b/src/resources/onefinity_woodworker_defaults.json @@ -38,9 +38,9 @@ "max-velocity": 10, "search-velocity": 1.688, "travel-per-rev": 10, - "idle-current": 0.5, + "idle-current": 1, "drive-current": 2.8, - "latch-backoff": 5.001, + "latch-backoff": 5, "enabled": true, "homing-mode": "stall-min", "reverse": false, @@ -64,9 +64,9 @@ "max-velocity": 10, "search-velocity": 1.688, "travel-per-rev": 10, - "idle-current": 0.5, + "idle-current": 1, "drive-current": 2.8, - "latch-backoff": 5.001, + "latch-backoff": 5, "enabled": true, "homing-mode": "stall-min", "reverse": false, @@ -86,29 +86,29 @@ }, { "latch-velocity": 0.1, - "max-accel": 10, - "max-velocity": 17, - "search-velocity": 0.5, + "max-accel": 750, + "max-velocity": 10, + "search-velocity": 1.688, "travel-per-rev": 10, - "idle-current": 0.5, + "idle-current": 1, "drive-current": 2.8, "latch-backoff": 5, "enabled": true, - "homing-mode": "manual", + "homing-mode": "stall-min", "reverse": false, "stall-microstep": 8, "min-soft-limit": 0, "max-switch": "disabled", "step-angle": 1.8, - "stall-current": 1.5, - "stall-sample-time": 50, + "stall-current": 1, + "stall-sample-time": 200, "microsteps": 16, - "stall-volts": 6, + "stall-volts": 2, "axis": "Y", "min-switch": "disabled", - "max-jerk": 50, - "max-soft-limit": 752, - "zero-backoff": 1 + "max-jerk": 1000, + "max-soft-limit": 816, + "zero-backoff": 1.5 }, { "latch-velocity": 0.1, @@ -116,9 +116,9 @@ "max-velocity": 3, "search-velocity": 0.675, "travel-per-rev": 4, - "idle-current": 0.5, + "idle-current": 1, "drive-current": 2.8, - "latch-backoff": 5.001, + "latch-backoff": 5, "enabled": true, "homing-mode": "stall-max", "reverse": true,