Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(hardware): add acceleration to pick up tip for 96 channel #12944

Merged
merged 28 commits into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
95d068b
add acceleration to tip_action
caila-marashaj Jun 15, 2023
b4d4bee
pick up tip move happens, but rumbly
caila-marashaj Jun 21, 2023
bdea049
linter stuff cleanup
caila-marashaj Jun 21, 2023
782a760
fixed position of acceleration in tipaction msg
caila-marashaj Jun 22, 2023
73d26bf
moving but delayed
caila-marashaj Jun 27, 2023
c3e044a
modify tip action, debugging code still in there
caila-marashaj Jun 28, 2023
a85074e
mostly working but returning position too early
caila-marashaj Jun 29, 2023
1952348
need to update tests
caila-marashaj Jul 6, 2023
fa194a3
updated unit test args for tip_action
caila-marashaj Jul 17, 2023
d2e7927
rebase
caila-marashaj Jul 17, 2023
2b20a20
rough final draft
caila-marashaj Jul 18, 2023
8cf3c15
cleanup
caila-marashaj Jul 18, 2023
7e5b7ef
format
caila-marashaj Jul 18, 2023
8ace0ef
remove redundant data check from gear motors
caila-marashaj Jul 18, 2023
155738b
hardware controller changes
caila-marashaj Jul 19, 2023
0aede03
increase backward distances
caila-marashaj Jul 20, 2023
97e12e9
changed helpers_ot3 function
caila-marashaj Jul 21, 2023
1550c9a
format
caila-marashaj Jul 21, 2023
735ebe7
helpers_ot3 function change
caila-marashaj Jul 21, 2023
af1eefa
got rid of copysign call
caila-marashaj Jul 21, 2023
e2280aa
check if speed exists
caila-marashaj Jul 21, 2023
5be4492
add deafult value to axis convert call
caila-marashaj Jul 24, 2023
93ef4ca
update gear motor position handling after move
caila-marashaj Jul 25, 2023
f1a42d1
test fix
caila-marashaj Jul 25, 2023
2b71f07
moved comments
caila-marashaj Jul 26, 2023
57bb955
remove updategearmotorpositionestimation msg
caila-marashaj Jul 26, 2023
e201a43
removed more unneeded code
caila-marashaj Jul 26, 2023
6eb76e6
address change reqs
caila-marashaj Jul 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove updategearmotorpositionestimation msg
  • Loading branch information
caila-marashaj committed Jul 26, 2023
commit 57bb955d81766b9ce892f8f71882325f975014f2
3 changes: 3 additions & 0 deletions api/src/opentrons/hardware_control/backends/ot3controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,8 @@ async def tip_action(
back_off: Optional[bool] = False,
) -> None:
move_group = []
# make sure either moves or distance and velocity is not None
assert any([moves, distance and velocity])
caila-marashaj marked this conversation as resolved.
Show resolved Hide resolved
if moves is not None:
move_group = create_tip_action_group(
moves, [NodeId.pipette_left], tip_action
Expand All @@ -639,6 +641,7 @@ async def tip_action(
move_group = create_gear_motor_home_group(
float(distance), float(velocity), back_off
)

runner = MoveGroupRunner(
move_groups=[move_group],
ignore_stalls=True if not ff.stall_detection_enabled() else False,
Expand Down
4 changes: 0 additions & 4 deletions api/src/opentrons/hardware_control/backends/ot3simulator.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,6 @@ async def update_motor_status(self) -> None:
(node, MotorStatus(True, True)) for node in self._present_nodes
)

@ensure_yield
async def update_gear_motor_position(self) -> None:
return None

@ensure_yield
async def home_gear_motors(
caila-marashaj marked this conversation as resolved.
Show resolved Hide resolved
self,
Expand Down
2 changes: 0 additions & 2 deletions hardware/opentrons_hardware/firmware_bindings/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,6 @@ class MessageId(int, Enum):
motor_position_response = 0x14
update_motor_position_estimation_request = 0x21
update_motor_position_estimation_response = 0x22
update_gear_motor_position_estimation_request = 0x23
update_gear_motor_position_estimation_response = 0x24

set_motion_constraints = 0x101
get_motion_constraints_request = 0x102
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,24 +272,6 @@ class UpdateMotorPositionEstimationResponse(BaseMessage): # noqa: D101
] = MessageId.update_motor_position_estimation_response


@dataclass
class UpdateGearMotorPositionEstimationRequest(EmptyPayloadMessage): # noqa: D101
message_id: Literal[
MessageId.update_gear_motor_position_estimation_request
] = MessageId.update_gear_motor_position_estimation_request


@dataclass
class UpdateGearMotorPositionEstimationResponse(BaseMessage): # noqa: D101
payload: payloads.GearMotorPositionResponse
payload_type: Type[
payloads.GearMotorPositionResponse
] = payloads.GearMotorPositionResponse
message_id: Literal[
MessageId.update_gear_motor_position_estimation_response
] = MessageId.update_gear_motor_position_estimation_response


@dataclass
class SetMotionConstraints(BaseMessage): # noqa: D101
payload: payloads.MotionConstraintsPayload
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
defs.MotorPositionResponse,
defs.UpdateMotorPositionEstimationRequest,
defs.UpdateMotorPositionEstimationResponse,
defs.UpdateGearMotorPositionEstimationRequest,
defs.UpdateGearMotorPositionEstimationResponse,
defs.SetMotionConstraints,
defs.GetMotionConstraintsRequest,
defs.GetMotionConstraintsResponse,
Expand Down