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

fixing validationError

Browse Source
This commit is contained in:
sanjayk03-dev
2025-06-05 01:27:33 +05:30
parent f6bff7176c
commit a49bf15da5
1 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/py/bbctrl/Web.py
View File

@@ -634,7 +634,7 @@ class RotaryHandler(bbctrl.APIHandler):
motor_1 = motors[1] motor_1 = motors[1]
motor_2 = motors[2] 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)) log.info("motor_2_backup: {}".format(motor_2_backup))
is_axis_A = motor_2.get("axis") == "A" 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 motor_1["max-velocity"] *= 2 if is_axis_A else 0.5
if is_axis_A: if is_axis_A:
required_keys = [ motor_2['min-soft-limit'] = motor_2_backup['min-soft-limit']
'min-soft-limit-backup', motor_2['max-soft-limit'] = motor_2_backup['max-soft-limit']
'max-soft-limit-backup', motor_2['max-velocity'] = motor_2_backup["max-velocity"]
'max-velocity-backup', motor_2['max-accel'] = motor_2_backup["max-accel"]
'max-accel-backup', motor_2['max-jerk'] = motor_2_backup["max-jerk"]
'max-jerk-backup', motor_2['step-angle'] = motor_2_backup["step-angle"]
'step-angle-backup', motor_2['travel-per-rev'] = motor_2_backup["travel-per-rev"]
'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.")
else: 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['min-soft-limit'] = motor_2['min-soft-limit']
motor_2_backup['max-soft-limit'] = motor_2['max-soft-limit'] motor_2_backup['max-soft-limit'] = motor_2['max-soft-limit']
motor_2_backup['max-velocity'] = motor_2["max-velocity"] motor_2_backup['max-velocity'] = motor_2["max-velocity"]