Skip to content

Commit e9a5904

Browse files
committed
populates deck slots dict and passes to resources
1 parent a37478d commit e9a5904

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

src/opentrons_resources.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ def __init__(self):
2727

2828
self.logger = None
2929

30-
def initialize(self, logger):
30+
def initialize(self, node_name: str, deck_slots: Dict[str, Any], pipette_slots: Dict[str, Any], logger):
31+
self.node_name = node_name
32+
self.deck_slots = deck_slots
33+
self.pipette_slots = pipette_slots
3134
self.logger = logger
3235

3336

@@ -155,8 +158,8 @@ def load_labware(self, command, ot_log):
155158
self.logger.log(f"SLOT NAME, {slot_name}")
156159
self.logger.log(f"DECK SLOTS, {self.deck_slots}")
157160
if slot_name in self.deck_slots:
158-
self.logger.log(f"FOUND SLOT RESOURCE, {slot_resource}")
159161
slot_resource = self.deck_slots[slot_name]
162+
self.logger.log(f"FOUND SLOT RESOURCE, {slot_resource}")
160163
try:
161164
# #check if slot already has labware (child)
162165
# # query for existing labware in slot

src/ot2_rest_node.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ def startup_handler(self) -> None:
5959
)
6060

6161
# Create 12 deck slots (1-11 standard, 12 is trash)
62+
#TODO: populate deck slots dict in [str, any] format to match resources deck slots object
63+
deck_slot_map = {}
6264
for i in range(1, 13):
6365
slot_name = f"ot2_{self.node_info.node_name}_deck_slot_{i}"
6466
template_name = "ot2_trash_slot" if i == 12 else "ot2_deck_slot"
@@ -68,6 +70,7 @@ def startup_handler(self) -> None:
6870
resource_name=slot_name,
6971
add_to_database=True,
7072
)
73+
deck_slot_map[str(i)] = slot
7174

7275
try:
7376
self.resource_client.set_child(self.deck, str(i), slot)
@@ -97,6 +100,9 @@ def startup_handler(self) -> None:
97100
self.run_id = None
98101
self.startup_has_run = True
99102
self.resources.initialize(
103+
node_name=self.node_info.node_name,
104+
deck_slots=deck_slot_map,
105+
pipette_slots=self.pipette_slots,
100106
logger=self.logger,
101107
)
102108
self.logger.info("OT2 node initialized!")

0 commit comments

Comments
 (0)