34
34
# PROBE_PF_MAX = 6.0
35
35
# DECK_PF_MIN = 9.0
36
36
# DECK_PF_MAX = 15.0
37
- PROBE_DIFF_MAX = 9.5
38
- PROBE_DIFF_MIN = 7.5
37
+ # PROBE_DIFF_MAX = 9.5
38
+ PROBE_DIFF_MIN = 7
39
39
40
40
41
41
def _get_test_tag (probe : GripperProbe ) -> str :
@@ -48,10 +48,10 @@ def build_csv_lines() -> List[Union[CSVLine, CSVLineRepeating]]:
48
48
for p in GripperProbe :
49
49
tag = _get_test_tag (p )
50
50
lines .append (CSVLine (f"{ tag } -open-air-pf" , [float ]))
51
- lines .append (CSVLine (f"{ tag } -probe-pf" , [float ]))
52
- lines .append (CSVLine (f"{ tag } -probe-pf-difference-min" , [float ]))
53
51
lines .append (CSVLine (f"{ tag } -deck-pf" , [float ]))
54
- lines .append (CSVLine (f"{ tag } -probe-pf-difference-max" , [float ]))
52
+ lines .append (CSVLine (f"{ tag } -probe-difference" , [float ]))
53
+ lines .append (CSVLine (f"{ tag } -probe-pf-difference-min" , [float ]))
54
+ lines .append (CSVLine (f"{ tag } -probe-pf-difference-max" , [str ]))
55
55
lines .append (CSVLine (f"{ tag } -result" , [CSVResult ]))
56
56
for p in GripperProbe :
57
57
lines .append (CSVLine (f"jaw-probe-{ p .name .lower ()} -xyz" , [float , float , float ]))
@@ -163,14 +163,14 @@ async def run(api: OT3API, report: CSVReport, section: str) -> None:
163
163
print (f"Reading on deck: { deck_pf } " )
164
164
165
165
result = (
166
- PROBE_DIFF_MIN < (deck_pf - open_air_pf ) < PROBE_DIFF_MAX
166
+ PROBE_DIFF_MIN < (deck_pf - open_air_pf )
167
167
)
168
168
_tag = _get_test_tag (probe )
169
169
report (section , f"{ _tag } -open-air-pf" , [open_air_pf ])
170
- report (section , f"{ _tag } -probe-pf" , [probe_pf ])
171
- report (section , f"{ _tag } -probe-pf-difference-min" , [PROBE_DIFF_MIN ])
172
170
report (section , f"{ _tag } -deck-pf" , [deck_pf ])
173
- report (section , f"{ _tag } -probe-pf-difference-max" , [PROBE_DIFF_MAX ])
171
+ report (section , f"{ _tag } -probe-difference" , [(deck_pf - open_air_pf )])
172
+ report (section , f"{ _tag } -probe-pf-difference-min" , [PROBE_DIFF_MIN ])
173
+ report (section , f"{ _tag } -probe-pf-difference-max" , ["None" ])
174
174
report (section , f"{ _tag } -result" , [CSVResult .from_bool (result )])
175
175
await api .home_z ()
176
176
await api .ungrip ()
0 commit comments