Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into muu, rerun tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ddcc4
ddcc4 committed Jan 23, 2025
2 parents d25f7c0 + b5a81e3 commit b9a0767
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 131 deletions.
109 changes: 0 additions & 109 deletions app/src/organisms/TerseOffsetTable/TerseOffsetTable.stories.tsx
View file

This file was deleted.

22 changes: 11 additions & 11 deletions shared-data/liquid-class/definitions/1/ethanol_80.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"pipetteModel": "flex_1channel_50",
"byTipType": [
{
"tiprack": "opentrons_flex_96_tiprack_50ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_50ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -243,7 +243,7 @@
"pipetteModel": "flex_8channel_50",
"byTipType": [
{
"tiprack": "opentrons_flex_96_tiprack_50ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_50ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -478,7 +478,7 @@
"pipetteModel": "flex_1channel_1000",
"byTipType": [
{
"tiprack": "opentrons_flex_96_tiprack_50ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_50ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -713,7 +713,7 @@
}
},
{
"tiprack": "opentrons_flex_96_tiprack_200ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_200ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -947,7 +947,7 @@
}
},
{
"tiprack": "opentrons_flex_96_tiprack_1000ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_1000ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -1186,7 +1186,7 @@
"pipetteModel": "flex_8channel_1000",
"byTipType": [
{
"tiprack": "opentrons_flex_96_tiprack_50ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_50ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -1421,7 +1421,7 @@
}
},
{
"tiprack": "opentrons_flex_96_tiprack_200ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_200ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -1655,7 +1655,7 @@
}
},
{
"tiprack": "opentrons_flex_96_tiprack_1000ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_1000ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -1894,7 +1894,7 @@
"pipetteModel": "flex_96channel_1000",
"byTipType": [
{
"tiprack": "opentrons_flex_96_tiprack_50ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_50ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -2129,7 +2129,7 @@
}
},
{
"tiprack": "opentrons_flex_96_tiprack_200ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_200ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -2363,7 +2363,7 @@
}
},
{
"tiprack": "opentrons_flex_96_tiprack_1000ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_1000ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down
22 changes: 11 additions & 11 deletions shared-data/liquid-class/definitions/1/glycerol_50.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"pipetteModel": "flex_1channel_50",
"byTipType": [
{
"tiprack": "opentrons_flex_96_tiprack_50ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_50ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -236,7 +236,7 @@
"pipetteModel": "flex_8channel_50",
"byTipType": [
{
"tiprack": "opentrons_flex_96_tiprack_50ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_50ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -464,7 +464,7 @@
"pipetteModel": "flex_1channel_1000",
"byTipType": [
{
"tiprack": "opentrons_flex_96_tiprack_50ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_50ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -686,7 +686,7 @@
}
},
{
"tiprack": "opentrons_flex_96_tiprack_200ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_200ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -904,7 +904,7 @@
}
},
{
"tiprack": "opentrons_flex_96_tiprack_1000ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_1000ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -1127,7 +1127,7 @@
"pipetteModel": "flex_8channel_1000",
"byTipType": [
{
"tiprack": "opentrons_flex_96_tiprack_50ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_50ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -1349,7 +1349,7 @@
}
},
{
"tiprack": "opentrons_flex_96_tiprack_200ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_200ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -1567,7 +1567,7 @@
}
},
{
"tiprack": "opentrons_flex_96_tiprack_1000ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_1000ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -1790,7 +1790,7 @@
"pipetteModel": "flex_96channel_1000",
"byTipType": [
{
"tiprack": "opentrons_flex_96_tiprack_50ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_50ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -2020,7 +2020,7 @@
}
},
{
"tiprack": "opentrons_flex_96_tiprack_200ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_200ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down Expand Up @@ -2238,7 +2238,7 @@
}
},
{
"tiprack": "opentrons_flex_96_tiprack_1000ul",
"tiprack": "opentrons/opentrons_flex_96_tiprack_1000ul/1",
"aspirate": {
"submerge": {
"positionReference": "well-top",
Expand Down

0 comments on commit b9a0767

Please sign in to comment.