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.

Sign up for GitHub

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

Jump to bottom

fix(hardware): didn't mean to take this out #15770

Merged
merged 2 commits into from
Jul 23, 2024
Merged

fix(hardware): didn't mean to take this out #15770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37a5a53
didn't mean to take this out
ryanthecoder Jul 23, 2024
945dff4
format
ryanthecoder Jul 23, 2024
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
2 changes: 2 additions & 0 deletions hardware/opentrons_hardware/hardware_control/tool_sensors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@
# FIXME we should organize all of these functions to use the sensor drivers.
# FIXME we should restrict some of these functions by instrument type.

PLUNGER_SOLO_MOVE_TIME = 0.2


def _fix_pass_step_for_buffer(
move_group: MoveGroupStep,
Expand Down
6 changes: 3 additions & 3 deletions scripts/push.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# utilities for pushing things to robots in a reusable fashion

find_robot=$(shell yarn run -s discovery find -i 169.254)
default_ssh_key := ~/.ssh/robot_key
default_ssh_key := ~/.ssh/id_rsa
default_ssh_opts := -o stricthostkeychecking=no -o userknownhostsfile=/dev/null
version_dict=$(shell ssh $(call id-file-arg,$(2)) $(3) root@$(1) cat /etc/VERSION.json)
is-ot3=$(findstring OT-3, $(version_dict))
Expand All @@ -19,7 +19,7 @@ is-in-version=$(findstring $(firstword $(checked-ssh-version)),$(allowed-ssh-ver
# when using an OpenSSH version larger than 8.9,
# we need to add a flag to use legacy scp with SFTP protocol
scp-legacy-option-flag = $(if $(is-in-version),,-O)
# when using windows, make is running against a different openSSH than the OS.
# when using windows, make is running against a different openSSH than the OS.
# adding the -O flag to scp will fail if the openSSH on OS is less than 9.
# if openSSH on OS is 9 or more please add the -O flag to scp.
PLATFORM := $(shell uname -s)
Expand Down Expand Up @@ -80,7 +80,7 @@ ssh $(call id-file-arg,$(2)) $(3) root@$(1) \
endef

# push-systemd-unit: move a systemd unit file to the robot
#
#
# argument 1 is the host to push to
# argument 2 is the identity file to use, if any
# argument 3 is any further ssh options, quoted
Expand Down
Loading