diff --git a/src/py/bbctrl/Web.py b/src/py/bbctrl/Web.py index c3cc22f..be2c18c 100644 --- a/src/py/bbctrl/Web.py +++ b/src/py/bbctrl/Web.py @@ -660,13 +660,14 @@ class RotaryHandler(bbctrl.APIHandler): path = ctrl.get_path('config.json') rotary_config = { - 'min-soft-limit': -720, - 'max-soft-limit': 720, - 'max-velocity': 100, + 'min-soft-limit': -3600, + 'max-soft-limit': 3600, + 'max-velocity': 6.696, 'max-accel': 500, - 'max-jerk': 750, + 'max-jerk': 1000, 'step-angle': 0.25714, - 'travel-per-rev': 360 + 'travel-per-rev': 360, + "microsteps": 16, } try: diff --git a/src/resources/config-template.json b/src/resources/config-template.json index dc3d01d..1947acb 100644 --- a/src/resources/config-template.json +++ b/src/resources/config-template.json @@ -278,6 +278,10 @@ "travel-per-rev": { "type": "float", "default": 5 + }, + "microsteps": { + "type": "int", + "default": 32 } } }, diff --git a/src/resources/onefinity_defaults.json b/src/resources/onefinity_defaults.json index 58eb52e..e6607ad 100644 --- a/src/resources/onefinity_defaults.json +++ b/src/resources/onefinity_defaults.json @@ -385,7 +385,8 @@ "max-accel": 750, "max-jerk": 1000, "step-angle": 1.8, - "travel-per-rev": 10 + "travel-per-rev": 10, + "microsteps": 16 }, { "axis": "Y", @@ -395,7 +396,8 @@ "max-accel": 750, "max-jerk": 1000, "step-angle": 1.8, - "travel-per-rev": 10 + "travel-per-rev": 10, + "microsteps": 16 }, { "axis": "Y", @@ -405,7 +407,8 @@ "max-accel": 750, "max-jerk": 1000, "step-angle": 1.8, - "travel-per-rev": 10 + "travel-per-rev": 10, + "microsteps": 16 }, { "axis": "Z", @@ -415,7 +418,8 @@ "max-accel": 750, "max-jerk": 1000, "step-angle": 1.8, - "travel-per-rev": 4 + "travel-per-rev": 4, + "microsteps": 16 } ],