Skip to content

Commit

Permalink
fix fixtrue
Browse files Browse the repository at this point in the history
  • Loading branch information
wweiye committed Jun 14, 2024
1 parent cec2687 commit 54e4747
Showing 1 changed file with 17 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ class LabwareLocations:
# THRESHOLDS: air-pressure sensor
PRESSURE_ASPIRATE_VOL = {1: {50: 10.0, 1000: 20.0}, 8: {50: 10.0, 1000: 20.0}}
PRESSURE_THRESH_OPEN_AIR = {1: {50:[-25, 25],1000:[-25,25]}, 8: {50:[-25, 25],1000:[-25,25]}}
PRESSURE_THRESH_SEALED = {1: {50:[-100, 100],1000:[-100,100]}, 8: {50:[-120, 120],1000:[-120,120]}}
PRESSURE_THRESH_COMPRESS = {1: {50:[-3150, -1150],1000:[-1550,-450]}, 8: {50:[-4200, -2100],1000:[-1900,-500]}}
PRESSURE_THRESH_SEALED = {1: {50:[-100, 100],1000:[-100,100]}, 8: {50:[-100, 100],1000:[-100,100]}}
PRESSURE_THRESH_COMPRESS = {1: {50:[-3250, -1050],1000:[-1550,-450]}, 8: {50:[-4300, -2100],1000:[-1900,-500]}}
PRESSURE_THRESH_current = {1: {50:{1:0.2},1000:{1:0.2}}, 8: {50:{2:0.2,8:0.55},1000:{2:0.14,8:0.55}}}

_trash_loc_counter = 0
Expand Down Expand Up @@ -1185,23 +1185,25 @@ async def _read_pressure(_sensor_id: SensorId) -> float:

if "p50" in pipptype[OT3Mount.LEFT]['name']:
CHTYPE_PIPPETE = 50
if "single" in pipptype[OT3Mount.LEFT]['name']:
movez = -155.5
current_val = PRESSURE_THRESH_current[pip_channels][CHTYPE_PIPPETE][1]
elif "multi" in pipptype[OT3Mount.LEFT]['name']:
# if "single" in pipptype[OT3Mount.LEFT]['name']:
# movez = -155.5
# current_val = PRESSURE_THRESH_current[pip_channels][CHTYPE_PIPPETE][1]
if "multi" in pipptype[OT3Mount.LEFT]['name']:
movez = -154.8
current_val = PRESSURE_THRESH_current[pip_channels][CHTYPE_PIPPETE][2]
print("current_val",current_val)
await helpers_ot3.update_pick_up_current(api,mount,current_val)

elif "p1000" in pipptype[OT3Mount.LEFT]['name']:
CHTYPE_PIPPETE = 1000
movez = -117.86

if "single" in pipptype[OT3Mount.LEFT]['name']:
current_val = PRESSURE_THRESH_current[pip_channels][CHTYPE_PIPPETE][1]
elif "multi" in pipptype[OT3Mount.LEFT]['name']:
# if "single" in pipptype[OT3Mount.LEFT]['name']:
# current_val = PRESSURE_THRESH_current[pip_channels][CHTYPE_PIPPETE][1]
if "multi" in pipptype[OT3Mount.LEFT]['name']:
current_val = PRESSURE_THRESH_current[pip_channels][CHTYPE_PIPPETE][2]
print("current_val",current_val)
await helpers_ot3.update_pick_up_current(api,mount,current_val)
print("current_val",current_val)
await helpers_ot3.update_pick_up_current(api,mount,current_val)


for sensor_id in sensor_ids:
Expand Down Expand Up @@ -2030,10 +2032,10 @@ async def _main(test_config: TestConfig) -> None: # noqa: C901
current_val = PRESSURE_THRESH_current[PIP_CHANNELS_CURRENT][PIP_VOL_CURRENT][2]
LOG_GING.info(f"current_val:{current_val}")
await helpers_ot3.update_pick_up_current(api,mount,current_val)
elif PIP_CHANNELS_CURRENT == 1:
current_val = PRESSURE_THRESH_current[PIP_CHANNELS_CURRENT][PIP_VOL_CURRENT][1]
LOG_GING.info(f"current_val:{current_val}")
await helpers_ot3.update_pick_up_current(api,mount,current_val)
# elif PIP_CHANNELS_CURRENT == 1:
# current_val = PRESSURE_THRESH_current[PIP_CHANNELS_CURRENT][PIP_VOL_CURRENT][1]
# LOG_GING.info(f"current_val:{current_val}")
# await helpers_ot3.update_pick_up_current(api,mount,current_val)

await _pick_up_tip_for_tip_volume(api, mount, tip_vol)
for probe in probes:
Expand Down

0 comments on commit 54e4747

Please sign in to comment.