Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
vegano1 committed Apr 26, 2024
1 parent 9bf3c79 commit 8cfaf67
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
10 changes: 5 additions & 5 deletions app/src/organisms/DropTipWizard/getAddressableAreaFromConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ export function getAddressableAreaFromConfig(
addressableAreaFromConfig = addressableArea
} else if (
// if no, check if provides a movable trash or module fixture
providedAddressableAreas.some(aa =>
MOVABLE_TRASH_ADDRESSABLE_AREAS.includes(aa)
|| FLEX_MODULE_ADDRESSABLE_AREAS.includes(aa)
providedAddressableAreas.some(
aa =>
MOVABLE_TRASH_ADDRESSABLE_AREAS.includes(aa) ||
FLEX_MODULE_ADDRESSABLE_AREAS.includes(aa)
)
) {
addressableAreaFromConfig = providedAddressableAreas[0]
Expand All @@ -59,8 +60,7 @@ export function getAddressableAreaFromConfig(
providedAddressableAreas.some(aa =>
WASTE_CHUTE_ADDRESSABLE_AREAS.includes(aa)
)
)
{
) {
// match number of channels to provided waste chute addressable area
if (
pipetteChannels === 1 &&
Expand Down
11 changes: 5 additions & 6 deletions components/src/hardware-sim/BaseDeck/BaseDeck.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,9 @@ export function BaseDeck(props: BaseDeckProps): JSX.Element {
)
const stagingAreaFixtures = deckConfig.filter(
fixture =>
(
fixture.cutoutFixtureId === STAGING_AREA_RIGHT_SLOT_FIXTURE ||
fixture.cutoutFixtureId === STAGING_AREA_SLOT_WITH_MAGNETIC_BLOCK_V1_FIXTURE
) &&
(fixture.cutoutFixtureId === STAGING_AREA_RIGHT_SLOT_FIXTURE ||
fixture.cutoutFixtureId ===
STAGING_AREA_SLOT_WITH_MAGNETIC_BLOCK_V1_FIXTURE) &&
STAGING_AREA_CUTOUTS.includes(fixture.cutoutId)
)
const trashBinFixtures = deckConfig.filter(
Expand Down Expand Up @@ -264,7 +263,7 @@ export function BaseDeck(props: BaseDeckProps): JSX.Element {
wellFill={nestedLabwareWellFill}
shouldRotateAdapterOrientation={
inferModuleOrientationFromXCoordinate(slotPosition[0]) ===
'left' && moduleModel === HEATERSHAKER_MODULE_V1
'left' && moduleModel === HEATERSHAKER_MODULE_V1
}
/>
) : null}
Expand All @@ -286,7 +285,7 @@ export function BaseDeck(props: BaseDeckProps): JSX.Element {
!('slotName' in labwareLocation) ||
// for legacy protocols that list fixed trash as a labware, do not render
definition.parameters.loadName ===
'opentrons_1_trash_3200ml_fixed'
'opentrons_1_trash_3200ml_fixed'
) {
return null
}
Expand Down

0 comments on commit 8cfaf67

Please sign in to comment.