Skip to content

Commit

Permalink
trying to get generic tests to pass
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaron-kulkarni
aaron-kulkarni committed Jun 26, 2024
1 parent a11887f commit bbb820b
Show file tree
Hide file tree
Showing 47 changed files with 105 additions and 44 deletions.
2 changes: 1 addition & 1 deletion api/src/opentrons/hardware_control/dev_types.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class PipetteDict(InstrumentDict):
supported_tips: Dict[PipetteTipType, SupportedTipsDefinition]
pipette_bounding_box_offsets: PipetteBoundingBoxOffsetDefinition
current_nozzle_map: NozzleMap
lld_settings: Dict[str, Dict[str, float]]
lld_settings: Optional[Dict[str, Dict[str, float]]]


class PipetteStateDict(TypedDict):
Expand Down
2 changes: 2 additions & 0 deletions api/src/opentrons/hardware_control/instruments/ot2/pipette_handler.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ def get_attached_instrument(self, mount: MountType) -> PipetteDict:
"default_dispense_flow_rates",
"back_compat_names",
"supported_tips",
"lld_settings"
]

instr_dict = instr.as_dict()
Expand Down Expand Up @@ -258,6 +259,7 @@ def get_attached_instrument(self, mount: MountType) -> PipetteDict:
result[
"pipette_bounding_box_offsets"
] = instr.config.pipette_bounding_box_offsets
result["lld_settings"] = instr.config.lld_settings
return cast(PipetteDict, result)

@property
Expand Down
2 changes: 2 additions & 0 deletions api/src/opentrons/hardware_control/instruments/ot3/pipette_handler.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ def get_attached_instrument(self, mount: OT3Mount) -> PipetteDict:
"default_dispense_flow_rates",
"back_compat_names",
"supported_tips",
"lld_settings"
]

instr_dict = instr.as_dict()
Expand Down Expand Up @@ -279,6 +280,7 @@ def get_attached_instrument(self, mount: OT3Mount) -> PipetteDict:
result[
"pipette_bounding_box_offsets"
] = instr.config.pipette_bounding_box_offsets
result["lld_settings"] = instr.config.lld_settings
return cast(PipetteDict, result)

@property
Expand Down
14 changes: 14 additions & 0 deletions shared-data/js/__tests__/pipettes.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,20 @@ describe('pipette data accessors', () => {
backLeftCorner: [-8, -22, -259.15],
frontRightCorner: [-8, -22, -259.15],
},
lldSettings: {
t50: {
minHeight: 0.5,
minVolume: 0
},
t200: {
minHeight: 0.5,
minVolume: 0
},
t1000: {
minHeight: 0.5,
minVolume: 0
}
}
} as PipetteV2Specs
expect(getPipetteSpecsV2('p1000_single_flex')).toStrictEqual(
mockP1000Specs
Expand Down
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 0.8],
"G1": [0.0, -22.5, 0.8],
"H1": [0.0, -31.5, 0.8]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 0.8],
"G1": [0.0, -22.5, 0.8],
"H1": [0.0, -31.5, 0.8]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 0.8],
"G1": [0.0, -22.5, 0.8],
"H1": [0.0, -31.5, 0.8]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_5.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 0.8],
"G1": [0.0, -22.5, 0.8],
"H1": [0.0, -31.5, 0.8]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p10/1_6.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 0.8],
"G1": [0.0, -22.5, 0.8],
"H1": [0.0, -31.5, 0.8]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p1000/1_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [-8.0, -61.0, -259.15],
"G1": [-8.0, -70.0, -259.15],
"H1": [-8.0, -79.0, -259.15]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 19.4],
"G1": [0.0, -22.5, 19.4],
"H1": [0.0, -31.5, 19.4]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p20/2_1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 19.4],
"G1": [0.0, -22.5, 19.4],
"H1": [0.0, -31.5, 19.4]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 0.8],
"G1": [0.0, -22.5, 0.8],
"H1": [0.0, -31.5, 0.8]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 0.8],
"G1": [0.0, -22.5, 0.8],
"H1": [0.0, -31.5, 0.8]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 0.8],
"G1": [0.0, -22.5, 0.8],
"H1": [0.0, -31.5, 0.8]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p300/1_5.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 0.8],
"G1": [0.0, -22.5, 0.8],
"H1": [0.0, -31.5, 0.8]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 35.52],
"G1": [0.0, -22.5, 35.52],
"H1": [0.0, -31.5, 35.52]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p300/2_1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 35.52],
"G1": [0.0, -22.5, 35.52],
"H1": [0.0, -31.5, 35.52]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 0.8],
"G1": [0.0, -22.5, 0.8],
"H1": [0.0, -31.5, 0.8]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 0.8],
"G1": [0.0, -22.5, 0.8],
"H1": [0.0, -31.5, 0.8]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 0.8],
"G1": [0.0, -22.5, 0.8],
"H1": [0.0, -31.5, 0.8]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/eight_channel/p50/1_5.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"F1": [0.0, -13.5, 0.8],
"G1": [0.0, -22.5, 0.8],
"H1": [0.0, -31.5, 0.8]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/ninety_six_channel/p1000/1_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,5 +291,6 @@
"H10": [45.0, -88.5, -259.15],
"H11": [54.0, -88.5, -259.15],
"H12": [63.0, -88.5, -259.15]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p10/1_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 12.0]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p10/1_3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 12.0]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p10/1_4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 12.0]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p10/1_5.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 12.0]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 45.0]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 45.0]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 45.0]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p1000/1_5.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 45.0]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 50.14]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 50.14]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p1000/2_2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 50.14]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p20/2_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 10.45]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p20/2_1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 10.45]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p20/2_2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 10.45]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p300/1_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 25.0]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p300/1_3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 25.0]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p300/1_4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 25.0]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p300/1_5.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 25.0]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p300/2_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 29.45]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p300/2_1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 29.45]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p50/1_0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 25.0]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p50/1_3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 25.0]
}
},
"lldSettings": {}
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/geometry/single_channel/p50/1_4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
"orderedColumns": [{ "key": "1", "orderedNozzles": ["A1"] }],
"nozzleMap": {
"A1": [0.0, 0.0, 25.0]
}
},
"lldSettings": {}
}
Loading

0 comments on commit bbb820b

Please sign in to comment.