feat(hardware-testing): grav script on ot3

api/src/opentrons/hardware_control/backends/ot3simulator.py

@@ -377,7 +377,7 @@ def _attached_pipette_to_mount(
             raise RuntimeError(
                 f"mount {mount.name} requested a {expected_instr} which is not supported on the OT3"
             )
-        if found_model and expected_instr and (expected_instr != found_model):
+        if found_model and expected_instr and (expected_instr not in found_model):
             if self._strict_attached:
                 raise RuntimeError(
                     "mount {}: expected instrument {} but got {}".format(

hardware-testing/Makefile

@@ -71,43 +71,55 @@ test:
 test-cov:
 	$(pytest) $(tests) $(test_opts) $(cov_opts)
 
-.PHONY: test-integration
-test-integration:
+.PHONY: test-gravimetric
+test-gravimetric:
+	$(python) -m hardware_testing.gravimetric --simulate --pipette 1000 --tip 1000 --trials 3 --starting-tip A1
+	$(python) -m hardware_testing.gravimetric --simulate --pipette 1000 --tip 200 --trials 3 --starting-tip A1
+	$(python) -m hardware_testing.gravimetric --simulate --pipette 1000 --tip 50 --trials 3 --starting-tip A1
+	$(python) -m hardware_testing.gravimetric --simulate --pipette 50 --tip 50 --trials 3 --starting-tip A1
+	$(python) -m hardware_testing.gravimetric --simulate --pipette 1000 --tip 1000 --trials 3 --starting-tip A1 --inspect
+	$(python) -m hardware_testing.gravimetric --simulate --pipette 1000 --tip 1000 --trials 3 --starting-tip A1 --increment
+
+.PHONY: test-production-qc
+test-production-qc:
 	$(python) -m hardware_testing.production_qc.pipette_assembly_qc_ot3 --operator test --simulate
 	$(python) -m hardware_testing.production_qc.robot_assembly_qc_ot3 --simulate
-	$(python) protocols/ot2_p300_single_channel_gravimetric.py --simulate
-	$(python) -m hardware_testing.examples.test_report
+
+.PHONY: test-examples
+test-examples:
+	$(python) -m hardware_testing.examples.csv_report
 	$(python) -m hardware_testing.examples.custom_axis_settings_ot3 --simulate
-	$(python) -m hardware_testing.examples.endstop_encoder_ot3 --simulate
 	$(python) -m hardware_testing.examples.pick_up_tip_ot3 --simulate
 	$(python) -m hardware_testing.examples.plunger_ot3 --simulate
 	$(python) -m hardware_testing.examples.capacitive_probe_ot3 --simulate
+
+.PHONY: test-scripts
+test-scripts:
 	$(python) -m hardware_testing.scripts.bowtie_ot3 --simulate
 
+.PHONY: test-integration
+test-integration: test-gravimetric test-production-qc test-examples test-scripts
+
 .PHONY: lint
 lint:
-	$(python) -m mypy hardware_testing tests protocols
-	$(python) -m black --check hardware_testing tests protocols setup.py
-	$(python) -m flake8 hardware_testing tests protocols setup.py
+	$(python) -m mypy hardware_testing tests
+	$(python) -m black --check hardware_testing tests setup.py
+	$(python) -m flake8 hardware_testing tests setup.py
 
 .PHONY: format
 format:
-	$(python) -m black hardware_testing tests protocols setup.py
+	$(python) -m black hardware_testing tests setup.py
 
-define move-plot-webpage
+define move-plot-webpage-ot3
 ssh -i $(2) $(3) root@$(1) \
 "function cleanup () { mount -o remount,ro / ; } ;\
 mount -o remount,rw / &&\
-mv /data/plot/index.html /usr/lib/python3.7/site-packages/hardware_testing/tools/plot &&\
-mv /data/plot/index.js /usr/lib/python3.7/site-packages/hardware_testing/tools/plot &&\
+mv /data/plot/index.html /opt/opentrons-robot-server/hardware_testing/tools/plot &&\
+mv /data/plot/index.js /opt/opentrons-robot-server/hardware_testing/tools/plot &&\
+rm -rf /data/plot &&\
 cleanup || cleanup"
 endef
 
-.PHONY: push-plot-webpage
-push-plot-webpage:
-	scp -r hardware_testing/tools/plot root@$(host):/data
-	$(call move-plot-webpage,$(host),$(br_ssh_key),$(ssh_opts))
-
 .PHONY: push-plot-webpage-ot3
 push-plot-webpage-ot3:
 	scp -r hardware_testing/tools/plot root@$(host):/data
@@ -135,19 +147,11 @@ push-no-restart-ot3: sdist Pipfile.lock
 .PHONY: push-ot3
 push-ot3: push-no-restart-ot3 restart-ot3
 
-.PHONY: push-protocols
-push-protocols:
-	scp -r protocols root@$(host):/data/user_storage/opentrons_data
-
-.PHONY: push-protocols-ot3
-push-protocols-ot3:
-	scp -r protocols root@$(host):/opt/opentrons-robot-server
-
 .PHONY: push-all
-push-all: clean wheel push-no-restart push-plot-webpage push-protocols
+push-all: clean wheel push-no-restart push-plot-webpage
 
 .PHONY: push-all-ot3
-push-all: clean wheel push-no-restart-ot3 push-plot-webpage-ot3 push-protocols-ot3
+push-all-ot3: push-ot3 push-plot-webpage-ot3
 
 .PHONY: term
 term:
@@ -197,7 +201,7 @@ sync-sw-ot3:
 	cd ../hardware && $(MAKE) push-no-restart-ot3 host=$(host)
 	cd ../api && $(MAKE) push-no-restart-ot3 host=$(host)
 	cd ../shared-data && $(MAKE) all push-no-restart-ot3 host=$(host)
-	cd ../hardware-testing && $(MAKE) push-no-restart-ot3 host=$(host)
+	cd ../hardware-testing && $(MAKE) push-all-ot3 host=$(host)
 
 .PHONY: sync-fw-ot3
 sync-fw-ot3:

hardware-testing/hardware_testing/data/csv_report.py

@@ -69,6 +69,11 @@ def __str__(self) -> str:
             _elapsed = round(self._elapsed_time, 1)
         return f"{_elapsed},{full_str}"
 
+    @property
+    def data(self) -> List[Any]:
+        """Data."""
+        return self._data
+
     @property
     def tag(self) -> str:
         """Line tag."""
@@ -268,18 +273,23 @@ def _generate_results_overview_section(tags: List[str]) -> CSVSection:
 class CSVReport:
     """CSV Report."""
 
-    def __init__(self, script_path: str, sections: List[CSVSection]) -> None:
+    def __init__(
+        self,
+        test_name: str,
+        sections: List[CSVSection],
+        run_id: Optional[str] = None,
+        start_time: Optional[float] = None,
+    ) -> None:
         """CSV Report init."""
-        self._script_path = script_path
-        self._test_name = data_io.create_test_name_from_file(script_path)
-        self._run_id = data_io.create_run_id()
+        self._test_name = test_name
+        self._run_id = run_id if run_id else data_io.create_run_id()
         self._tag: Optional[str] = None
         self._file_name: Optional[str] = None
         _section_meta = _generate_meta_data_section()
         _section_titles = [s.title for s in sections]
         _section_results = _generate_results_overview_section(_section_titles)
         self._sections = [_section_meta, _section_results] + sections
-        self._cache_start_time()  # must happen before storing any data
+        self._cache_start_time(start_time)  # must happen before storing any data
         self(META_DATA_TITLE, META_DATA_TEST_NAME, [self._test_name])
         self(META_DATA_TITLE, META_DATA_TEST_RUN_ID, [self._run_id])
         _now = datetime.utcnow().strftime("%Y/%m/%d-%H:%M:%S")
@@ -343,23 +353,29 @@ def parent(self) -> Path:
         """Parent directory of this report file."""
         return data_io.create_folder_for_test_data(self._test_name)
 
-    def _cache_start_time(self) -> None:
-        start_time = time()
+    @property
+    def tag(self) -> str:
+        """Tag."""
+        return f"{self.__class__.__name__}-{self._tag}"
+
+    def _cache_start_time(self, start_time: Optional[float] = None) -> None:
+        checked_start_time = start_time if start_time else time()
         for section in self._sections:
             for line in section.lines:
                 if isinstance(line, CSVLineRepeating):
                     for i in range(len(line)):
-                        line[i].cache_start_time(start_time)
+                        line[i].cache_start_time(checked_start_time)
                 else:
-                    line.cache_start_time(start_time)
+                    line.cache_start_time(checked_start_time)
 
     def set_tag(self, tag: str) -> None:
         """CSV Report set tag."""
         self._tag = tag
         self(META_DATA_TITLE, META_DATA_TEST_TAG, [self._tag])
         self._file_name = data_io.create_file_name(
-            self._test_name, self._run_id, self._tag
+            self._test_name, self._run_id, self.tag
         )
+        self.save_to_disk()
 
     def set_operator(self, operator: str) -> None:
         """Set operator."""

hardware-testing/hardware_testing/drivers/radwag/driver.py

@@ -2,7 +2,6 @@
 from abc import ABC, abstractmethod
 from typing import Tuple, Optional
 
-from random import uniform
 from serial import Serial  # type: ignore[import]
 
 from .commands import (
@@ -226,6 +225,15 @@ def read_mass(self) -> Tuple[float, bool]:
 class SimRadwagScale(RadwagScaleBase):
     """Simulating Radwag Scale Driver."""
 
+    def __init__(self) -> None:
+        """Constructor."""
+        self._mass: float = 0.0
+
+    @property
+    def sim_mass(self) -> float:
+        """Simulation mass."""
+        return self._mass
+
     def connect(self) -> None:
         """Connect."""
         return
@@ -268,4 +276,8 @@ def set_tare(self, tare: float) -> None:
 
     def read_mass(self) -> Tuple[float, bool]:
         """Read mass."""
-        return uniform(2.5, 2), True
+        return self._mass, True
+
+    def set_simulation_mass(self, mass: float) -> None:
+        """Set simulation mass."""
+        self._mass = mass

hardware-testing/hardware_testing/examples/test_report.py → hardware-testing/hardware_testing/examples/csv_report.py

@@ -10,15 +10,8 @@
 
 NUM_REPEATING_DATA = 30
 EXAMPLE_REPORT = CSVReport(
-    script_path=__file__,
+    test_name="example-test-report",
     sections=[
-        CSVSection(
-            title="TEST-INFO",
-            lines=[
-                CSVLine("software-version", [str]),
-                CSVLine("operator", [str]),
-            ],
-        ),
         CSVSection(
             title="PIPETTE-LEFT",
             lines=[

hardware-testing/hardware_testing/examples/pipette_sensors_ot3.py

@@ -0,0 +1,39 @@
+"""Pipette sensors OT3."""
+import argparse
+import asyncio
+from time import sleep
+
+from hardware_testing.opentrons_api import helpers_ot3
+from hardware_testing.opentrons_api.types import OT3Mount
+
+
+async def _main(is_simulating: bool) -> None:
+    api = await helpers_ot3.build_async_ot3_hardware_api(
+        is_simulating=is_simulating,
+        pipette_left="p1000_single_v3.3",
+        pipette_right="p1000_single_v3.3",
+    )
+    pip_mounts = [OT3Mount.from_mount(m) for m, p in api.hardware_pipettes.items() if p]
+    while True:
+        for mount in pip_mounts:
+            pascals = await helpers_ot3.get_pressure_ot3(api, mount)
+            pico_farads = await helpers_ot3.get_capacitance_ot3(api, mount)
+            celsius, humidity = await helpers_ot3.get_temperature_humidity_ot3(
+                api, mount
+            )
+            print(
+                f"-----\n"
+                f"{mount.name}:\n"
+                f"\tpascals={pascals}\n"
+                f"\tpico_farads={pico_farads}\n"
+                f"\tcelsius={celsius}\n"
+                f"\thumidity={humidity}"
+            )
+        sleep(0.2)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--simulate", action="store_true")
+    args = parser.parse_args()
+    asyncio.run(_main(args.simulate))