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-testing): Automatically build visualizations for LLD testing #15276

Merged
merged 38 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
d60b733
sync pressure data using adjusted Z mount to help with visualization
andySigler Apr 30, 2024
709c5dd
reduce minimum allowable step size in opentrons_hardware to 0.01mm
andySigler Apr 30, 2024
952b9f2
default 5x trials
andySigler May 15, 2024
c53291e
start probing relative to meniscus, not well top
andySigler May 15, 2024
58bf635
define number of seconds for probe to last
andySigler May 15, 2024
4a3e9b4
use vial for P1000S
andySigler May 15, 2024
b2f00d1
added google sheet upload - WIP
rclarke0 May 16, 2024
331dbd4
allow right pipette to be used
andySigler May 17, 2024
7e44cd9
google-sheet-edits
rclarke0 May 17, 2024
fc87cef
update some variable names and gate some stuff behind simulating for CI
ryanthecoder May 17, 2024
24e8438
tip argument, google sheet try except
rclarke0 May 17, 2024
66ef404
allow right pipette to be used
andySigler May 17, 2024
ead4b57
tip
rclarke0 May 17, 2024
1302811
fixups from reabse
ryanthecoder May 17, 2024
0b431ca
google sheet edits
rclarke0 May 20, 2024
58289cb
move deck slots for LLD test labware
andySigler May 20, 2024
6e4d804
all tip-racks share slot 3
andySigler May 20, 2024
b5bd82f
load trash into protocol
andySigler May 20, 2024
5d1b4da
uses google sheet arg
rclarke0 May 21, 2024
f5763b8
push labware also with calling push-ot3 in hardware-testing
andySigler May 22, 2024
da58e1d
simulation works
andySigler May 22, 2024
3b0fe40
added retract after drop tip
thassyopinto May 22, 2024
0a33113
copy google-sheets file to this repo
andySigler May 22, 2024
8d0873c
store run-id in CSV
andySigler May 23, 2024
70bbd97
fix error in calculating range
andySigler May 23, 2024
b5ad7e6
return a very bad height on a failed trial so script can continue
ryanthecoder May 28, 2024
72ad61b
add new python requirements to pipfile
ryanthecoder May 28, 2024
380cf99
format, lint, test, and style fixes
ryanthecoder May 28, 2024
d6a57c6
remove unmergable code
ryanthecoder May 28, 2024
84ee594
google drive upload
rclarke0 May 29, 2024
b201860
Allow pspeed 0 moves
ryanthecoder May 30, 2024
f755147
fix a few things that get logged into the sheet
ryanthecoder May 31, 2024
3f89e16
format
ryanthecoder May 31, 2024
1df2742
remove google stuff from pipfile
ryanthecoder May 31, 2024
0666f02
make abr_testing a pushable package
ryanthecoder May 31, 2024
d4d36fc
switch over to using abt_testing for google sheets tools
ryanthecoder May 31, 2024
5e50c2d
tweak a few things to avoid explicit dependency on gspread in hardwar…
ryanthecoder May 31, 2024
249e6fc
forgot to add the new dummy file
ryanthecoder May 31, 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
10 changes: 10 additions & 0 deletions abr-testing/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ package_version = $(call python_package_version,abr-testing,$(project_rs_default
wheel_file = dist/$(call python_get_wheelname,abr-testing,$(project_rs_default),$(package_name),$(BUILD_NUMBER))
sdist_file = dist/$(call python_get_sdistname,abr-testing,$(project_rs_default),$(package_name))

# Find the branch, sha, version that will be used to update the VERSION.json file
version_file = $(call python_get_git_version,abr-testing,$(project_rs_default),abr-testing)

tests ?= tests
test_opts ?=

Expand Down Expand Up @@ -78,3 +81,10 @@ format:
.PHONY: test
test:
@echo "No tests yet"

.PHONY: push-no-restart-ot3
push-no-restart-ot3: sdist Pipfile.lock
$(call push-python-sdist,$(host),$(ssh_key),$(ssh_opts),$(sdist_file),/opt/opentrons-robot-server,"abr_testing",,,$(version_file))

.PHONY: push-ot3
push-ot3: push-no-restart-ot3
6 changes: 6 additions & 0 deletions abr-testing/abr_testing/automation/google_sheets_tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
"""


class google_interaction_error(gspread.exceptions.APIError):
"""Internal use exception so we don't need to import gspread directly in other projects."""

pass


class google_sheet:
"""Google Sheets Tool."""

Expand Down
24 changes: 17 additions & 7 deletions hardware-testing/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,6 @@ test-scripts:
test-liquid-sense:
$(python) -m hardware_testing.liquid_sense --simulate --pipette 1000 --channels 1
$(python) -m hardware_testing.liquid_sense --simulate --pipette 50 --channels 1
$(python) -m hardware_testing.liquid_sense --simulate --pipette 1000 --channels 8
$(python) -m hardware_testing.liquid_sense --simulate --pipette 50 --channels 8
$(python) -m hardware_testing.liquid_sense --simulate --pipette 1000 --channels 96

.PHONY: test-integration
test-integration: test-production-qc test-examples test-scripts test-gravimetric
Expand Down Expand Up @@ -198,6 +195,11 @@ push-description-ot3:
$(python) -c "from hardware_testing.data import create_git_description_file; create_git_description_file()"
scp $(ssh_helper_ot3) ./.hardware-testing-description root@$(host):/data/

.PHONY: push-labware-ot3
push-labware-ot3:
ssh $(ssh_helper_ot3) root@$(host) "mkdir -p /data/labware/v2/custom_definitions/custom_beta"
scp $(ssh_helper_ot3) -r hardware_testing/labware/* root@$(host):/data/labware/v2/custom_definitions/custom_beta/

.PHONY: restart
restart:
$(call restart-service,$(host),$(ssh_key),$(ssh_opts),"opentrons-robot-server")
Expand All @@ -218,10 +220,10 @@ push-no-restart-ot3: sdist Pipfile.lock
$(call push-python-sdist,$(host),$(ssh_key),$(ssh_opts),$(sdist_file),/opt/opentrons-robot-server,"hardware_testing",,,$(version_file))

.PHONY: push-ot3
push-ot3: push-no-restart-ot3 push-plot-webpage-ot3 push-description-ot3
push-ot3: push-no-restart-ot3 push-plot-webpage-ot3 push-description-ot3 push-labware-ot3

.PHONY: push-all
push-all: clean wheel push-no-restart push-plot-webpage
push-all: clean wheel push-no-restart push-plot-webpage-ot3

.PHONY: term
term:
Expand Down Expand Up @@ -275,6 +277,16 @@ push-ot3-fixture:
$(MAKE) remove-patches-fixture


.PHONY: push-ot3-lld
push-ot3-lld:
$(MAKE) apply-patches-fixture
cd ../ && $(MAKE) -C shared-data push-ot3
cd ../ && $(MAKE) -C hardware push-ot3
cd ../ && $(MAKE) -C hardware_testing push-ot3
cd ../ && $(MAKE) -C api push-ot3
$(MAKE) remove-patches-fixture


.PHONY: apply-patches-fixture
apply-patches-fixture:
cd ../ && git apply ./hardware-testing/fixture_overrides/*.patch --allow-empty
Expand All @@ -294,8 +306,6 @@ sync-ot3: sync-sw-ot3 sync-fw-ot3
.PHONY: push-ot3-gravimetric
push-ot3-gravimetric:
$(MAKE) push-ot3
ssh $(ssh_helper_ot3) root@$(host) "mkdir -p /data/labware/v2/custom_definitions/custom_beta"
scp $(ssh_helper_ot3) -r hardware_testing/labware/* root@$(host):/data/labware/v2/custom_definitions/custom_beta/
$(MAKE) apply-patches-gravimetric
cd ../ && $(MAKE) -C shared-data push-ot3
$(MAKE) remove-patches-gravimetric
Expand Down
1 change: 1 addition & 0 deletions hardware-testing/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ opentrons = {editable = true, path = "./../api", extras=['flex-hardware']}
opentrons-shared-data = {editable = true, path = "./../shared-data/python"}
opentrons-hardware = {editable = true, path = "./../hardware", extras=['FLEX']}
hardware-testing = { editable = true, path = "." }
abr-testing = { editable = true, path = "./../abr-testing" }
pyserial = "==3.5"

[dev-packages]
Expand Down
130 changes: 67 additions & 63 deletions hardware-testing/Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading