Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(shared-data): Add backwards compatible pipettes to new pipette configurations #12514

Merged
merged 3 commits into from
Apr 24, 2023
Merged

feat(shared-data): Add backwards compatible pipettes to new pipette configurations #12514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95e9c1c
add backcompat name
Laura-Danielle Apr 18, 2023
2a1b0c0
clean up build script, add backcompat to pipette definition
Laura-Danielle Apr 18, 2023
07e5229
expose backcompat names in pipette obj
sfoster1 Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/src/opentrons/hardware_control/instruments/ot3/pipette.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ def as_dict(self) -> "Pipette.DictType":
"fw_update_required": self._fw_update_info.update_required,
"fw_current_version": self._fw_update_info.current_version,
"fw_next_version": self._fw_update_info.next_version,
"back_compat_names": self._config.pipette_backcompat_names,
}
)
return self._config_as_dict
Expand Down
1 change: 1 addition & 0 deletions api/src/opentrons/hardware_control/instruments/ot3/pipette_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ def get_attached_instrument(self, mount: OT3Mount) -> PipetteDict:
"default_aspirate_flow_rates",
"default_blow_out_flow_rates",
"default_dispense_flow_rates",
"back_compat_names",
]

instr_dict = instr.as_dict()
Expand Down
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p10/1_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
"shaftULperMM": 0.785,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p10/1_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
"shaftULperMM": 0.785,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p10/1_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
"shaftULperMM": 0.785,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p10/1_5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
"shaftULperMM": 0.785,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p10/1_6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
"shaftULperMM": 0.785,
"backCompatNames": []
}
1 change: 1 addition & 0 deletions shared-data/pipette/definitions/2/general/eight_channel/p1000/1_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"backCompatNames": [],
"channels": 8,
"shaftDiameter": 9.0,
"shaftULperMM": 63.617
Expand Down
1 change: 1 addition & 0 deletions shared-data/pipette/definitions/2/general/eight_channel/p1000/3_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"backCompatNames": [],
"channels": 8,
"shaftDiameter": 4.5,
"shaftULperMM": 15.904
Expand Down
1 change: 1 addition & 0 deletions shared-data/pipette/definitions/2/general/eight_channel/p1000/3_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"backCompatNames": [],
"channels": 8,
"shaftDiameter": 4.5,
"shaftULperMM": 15.904
Expand Down
1 change: 1 addition & 0 deletions shared-data/pipette/definitions/2/general/eight_channel/p1000/3_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"backCompatNames": [],
"channels": 8,
"shaftDiameter": 4.5,
"shaftULperMM": 15.904
Expand Down
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p20/2_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
"shaftULperMM": 0.785,
"backCompatNames": ["p10_multi"]
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p20/2_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
"shaftULperMM": 0.785,
"backCompatNames": ["p10_multi"]
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p300/1_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 5.0,
"shaftULperMM": 19.635
"shaftULperMM": 19.635,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p300/1_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 5.0,
"shaftULperMM": 19.635
"shaftULperMM": 19.635,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p300/1_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 5.0,
"shaftULperMM": 19.635
"shaftULperMM": 19.635,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p300/1_5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 5.0,
"shaftULperMM": 19.635
"shaftULperMM": 19.635,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p300/2_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 3.5,
"shaftULperMM": 9.621
"shaftULperMM": 9.621,
"backCompatNames": ["p300_multi"]
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p300/2_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 3.5,
"shaftULperMM": 9.621
"shaftULperMM": 9.621,
"backCompatNames": ["p300_multi"]
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p50/1_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 2.0,
"shaftULperMM": 3.142
"shaftULperMM": 3.142,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p50/1_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 2.0,
"shaftULperMM": 3.142
"shaftULperMM": 3.142,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p50/1_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 2.0,
"shaftULperMM": 3.142
"shaftULperMM": 3.142,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/eight_channel/p50/1_5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 8,
"shaftDiameter": 2.0,
"shaftULperMM": 3.142
"shaftULperMM": 3.142,
"backCompatNames": []
}
1 change: 1 addition & 0 deletions shared-data/pipette/definitions/2/general/eight_channel/p50/3_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"backCompatNames": [],
"channels": 8,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
Expand Down
1 change: 1 addition & 0 deletions shared-data/pipette/definitions/2/general/eight_channel/p50/3_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"backCompatNames": [],
"channels": 8,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
Expand Down
1 change: 1 addition & 0 deletions shared-data/pipette/definitions/2/general/eight_channel/p50/3_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"backCompatNames": [],
"channels": 8,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
Expand Down
1 change: 1 addition & 0 deletions shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/1_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"partialTipSupported": true,
"availableConfigurations": [1, 8, 12, 96]
},
"backCompatNames": [],
"channels": 96,
"shaftDiameter": 9.0,
"shaftULperMM": 63.617
Expand Down
1 change: 1 addition & 0 deletions shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"partialTipSupported": true,
"availableConfigurations": [1, 8, 12, 96]
},
"backCompatNames": [],
"channels": 96,
"shaftDiameter": 4.5,
"shaftULperMM": 15.904
Expand Down
1 change: 1 addition & 0 deletions shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"partialTipSupported": true,
"availableConfigurations": [1, 8, 12, 96]
},
"backCompatNames": [],
"channels": 96,
"shaftDiameter": 4.5,
"shaftULperMM": 15.904
Expand Down
1 change: 1 addition & 0 deletions shared-data/pipette/definitions/2/general/ninety_six_channel/p1000/3_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"partialTipSupported": true,
"availableConfigurations": [1, 8, 12, 96]
},
"backCompatNames": [],
"channels": 96,
"shaftDiameter": 4.5,
"shaftULperMM": 15.904
Expand Down
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p10/1_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
"shaftULperMM": 0.785,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p10/1_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
"shaftULperMM": 0.785,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p10/1_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
"shaftULperMM": 0.785,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p10/1_5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
"shaftULperMM": 0.785,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p1000/1_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 9.0,
"shaftULperMM": 63.617
"shaftULperMM": 63.617,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p1000/1_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 9.0,
"shaftULperMM": 63.617
"shaftULperMM": 63.617,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p1000/1_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 9.0,
"shaftULperMM": 63.617
"shaftULperMM": 63.617,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p1000/1_5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 9.0,
"shaftULperMM": 63.617
"shaftULperMM": 63.617,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p1000/2_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 6.0,
"shaftULperMM": 28.274
"shaftULperMM": 28.274,
"backCompatNames": ["p1000_single"]
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p1000/2_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 6.0,
"shaftULperMM": 28.274
"shaftULperMM": 28.274,
"backCompatNames": ["p1000_single"]
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p1000/2_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 6.0,
"shaftULperMM": 28.274
"shaftULperMM": 28.274,
"backCompatNames": ["p1000_single"]
}
1 change: 1 addition & 0 deletions shared-data/pipette/definitions/2/general/single_channel/p1000/3_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"environment": { "count": 1 }
},
"partialTipConfigurations": { "partialTipSupported": false },
"backCompatNames": [],
"channels": 1,
"shaftDiameter": 4.5,
"shaftULperMM": 15.904
Expand Down
1 change: 1 addition & 0 deletions shared-data/pipette/definitions/2/general/single_channel/p1000/3_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"environment": { "count": 1 }
},
"partialTipConfigurations": { "partialTipSupported": false },
"backCompatNames": [],
"channels": 1,
"shaftDiameter": 4.5,
"shaftULperMM": 15.904
Expand Down
1 change: 1 addition & 0 deletions shared-data/pipette/definitions/2/general/single_channel/p1000/3_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"environment": { "count": 1 }
},
"partialTipConfigurations": { "partialTipSupported": false },
"backCompatNames": [],
"channels": 1,
"shaftDiameter": 4.5,
"shaftULperMM": 15.904
Expand Down
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p20/2_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
"shaftULperMM": 0.785,
"backCompatNames": ["p10_single"]
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p20/2_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
"shaftULperMM": 0.785,
"backCompatNames": ["p10_single"]
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p20/2_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 1.0,
"shaftULperMM": 0.785
"shaftULperMM": 0.785,
"backCompatNames": ["p10_single"]
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p300/1_0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 5.0,
"shaftULperMM": 19.635
"shaftULperMM": 19.635,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p300/1_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 5.0,
"shaftULperMM": 19.635
"shaftULperMM": 19.635,
"backCompatNames": []
}
3 changes: 2 additions & 1 deletion shared-data/pipette/definitions/2/general/single_channel/p300/1_4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@
},
"channels": 1,
"shaftDiameter": 5.0,
"shaftULperMM": 19.635
"shaftULperMM": 19.635,
"backCompatNames": []
}
Loading