diff --git a/src/py/bbctrl/Web.py b/src/py/bbctrl/Web.py index fdd15a1..03c4780 100644 --- a/src/py/bbctrl/Web.py +++ b/src/py/bbctrl/Web.py @@ -634,7 +634,7 @@ class RotaryHandler(bbctrl.APIHandler): motor_1 = motors[1] motor_2 = motors[2] - motor_2_backup = motors_backup.get(2, {}) + motor_2_backup = motors_backup[2] log.info("motor_2_backup: {}".format(motor_2_backup)) is_axis_A = motor_2.get("axis") == "A" @@ -645,34 +645,14 @@ class RotaryHandler(bbctrl.APIHandler): motor_1["max-velocity"] *= 2 if is_axis_A else 0.5 if is_axis_A: - required_keys = [ - 'min-soft-limit-backup', - 'max-soft-limit-backup', - 'max-velocity-backup', - 'max-accel-backup', - 'max-jerk-backup', - 'step-angle-backup', - 'travel-per-rev-backup' - ] - if all(key in motor_2 for key in required_keys): - motor_2['min-soft-limit'] = motor_2['min-soft-limit-backup'] - motor_2['max-soft-limit'] = motor_2['max-soft-limit-backup'] - motor_2['max-velocity'] = motor_2["max-velocity-backup"] - motor_2['max-accel'] = motor_2["max-accel-backup"] - motor_2['max-jerk'] = motor_2["max-jerk-backup"] - motor_2['step-angle'] = motor_2["step-angle-backup"] - motor_2['travel-per-rev'] = motor_2["travel-per-rev-backup"] - else: - raise ValueError("Backup values limits are missing for motor_2.") + motor_2['min-soft-limit'] = motor_2_backup['min-soft-limit'] + motor_2['max-soft-limit'] = motor_2_backup['max-soft-limit'] + motor_2['max-velocity'] = motor_2_backup["max-velocity"] + motor_2['max-accel'] = motor_2_backup["max-accel"] + motor_2['max-jerk'] = motor_2_backup["max-jerk"] + motor_2['step-angle'] = motor_2_backup["step-angle"] + motor_2['travel-per-rev'] = motor_2_backup["travel-per-rev"] else: - motor_2['min-soft-limit-backup'] = motor_2['min-soft-limit'] - motor_2['max-soft-limit-backup'] = motor_2['max-soft-limit'] - motor_2['max-velocity-backup'] = motor_2["max-velocity"] - motor_2['max-accel-backup'] = motor_2["max-accel"] - motor_2['max-jerk-backup'] = motor_2["max-jerk"] - motor_2['step-angle-backup'] = motor_2["step-angle"] - motor_2['travel-per-rev-backup'] = motor_2["travel-per-rev"] - motor_2_backup['min-soft-limit'] = motor_2['min-soft-limit'] motor_2_backup['max-soft-limit'] = motor_2['max-soft-limit'] motor_2_backup['max-velocity'] = motor_2["max-velocity"]