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): Convert GEN1/GEN2 pipettes to the new shared-data schema #12148

Merged
merged 13 commits into from
Feb 14, 2023
Merged

feat(shared-data): Convert GEN1/GEN2 pipettes to the new shared-data schema #12148

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
db7b5a4
Add script to automatically migrate pipettes
Laura-Danielle Feb 10, 2023
0aa8bc7
modify the version of the ot3 models
Laura-Danielle Feb 13, 2023
7baac0c
add gen1 and gen2 schemas
Laura-Danielle Feb 13, 2023
9ee548a
Add script and make definition modifications for older pipette configs
Laura-Danielle Feb 14, 2023
6140245
add scripts subdirectory, modify build script
Laura-Danielle Feb 14, 2023
114790f
sanitize path for gltf models
Laura-Danielle Feb 14, 2023
5774fdb
make gltf files binary
Laura-Danielle Feb 14, 2023
2694616
Add schema relative paths
Laura-Danielle Feb 14, 2023
dac54a7
was using the wrong relative path...
Laura-Danielle Feb 14, 2023
cc6471d
update test to check all schemas
Laura-Danielle Feb 14, 2023
584fea7
Add a default value for aspirate and dispense functions
Laura-Danielle Feb 14, 2023
df47c61
fix up tests to use correct pipette version
Laura-Danielle Feb 14, 2023
2f01879
js formatting
Laura-Danielle Feb 14, 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
32 changes: 32 additions & 0 deletions 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
@@ -0,0 +1,32 @@
{
"displayName": "P10 8-Channel GEN1",
"model": "p10",
"displayCategory": "GEN1",
"pickUpTipConfigurations": {
"current": 0.4,
"speed": 30.0,
"presses": 3,
"increment": 1.0,
"distance": 10.0
},
"dropTipConfigurations": {
"current": 0.5,
"speed": 5.0,
"presses": 0,
"increment": 0.0,
"distance": 0.0
},
"plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 },
"plungerPositionsConfigurations": {
"top": 19.5,
"bottom": 2.0,
"blowout": -1.0,
"drop": -4.0
},
"availableSensors": { "sensors": [] },
"partialTipConfigurations": {
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"channels": 8
}
32 changes: 32 additions & 0 deletions 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
@@ -0,0 +1,32 @@
{
"displayName": "P10 8-Channel GEN1",
"model": "p10",
"displayCategory": "GEN1",
"pickUpTipConfigurations": {
"current": 0.4,
"speed": 30.0,
"presses": 3,
"increment": 1.0,
"distance": 10.0
},
"dropTipConfigurations": {
"current": 0.5,
"speed": 5.0,
"presses": 0,
"increment": 0.0,
"distance": 0.0
},
"plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 },
"plungerPositionsConfigurations": {
"top": 19.5,
"bottom": 0.5,
"blowout": -2.5,
"drop": -5.5
},
"availableSensors": { "sensors": [] },
"partialTipConfigurations": {
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"channels": 8
}
32 changes: 32 additions & 0 deletions 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
@@ -0,0 +1,32 @@
{
"displayName": "P10 8-Channel GEN1",
"model": "p10",
"displayCategory": "GEN1",
"pickUpTipConfigurations": {
"current": 0.4,
"speed": 30.0,
"presses": 3,
"increment": 1.0,
"distance": 10.0
},
"dropTipConfigurations": {
"current": 0.5,
"speed": 5.0,
"presses": 0,
"increment": 0.0,
"distance": 0.0
},
"plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 },
"plungerPositionsConfigurations": {
"top": 19.5,
"bottom": 2.0,
"blowout": -1.0,
"drop": -4.5
},
"availableSensors": { "sensors": [] },
"partialTipConfigurations": {
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"channels": 8
}
32 changes: 32 additions & 0 deletions 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
@@ -0,0 +1,32 @@
{
"displayName": "P10 8-Channel GEN1",
"model": "p10",
"displayCategory": "GEN1",
"pickUpTipConfigurations": {
"current": 0.55,
"speed": 30.0,
"presses": 3,
"increment": 3.0,
"distance": 10.0
},
"dropTipConfigurations": {
"current": 0.5,
"speed": 5.0,
"presses": 0,
"increment": 0.0,
"distance": 0.0
},
"plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 },
"plungerPositionsConfigurations": {
"top": 19.5,
"bottom": 2.0,
"blowout": -1.0,
"drop": -4.5
},
"availableSensors": { "sensors": [] },
"partialTipConfigurations": {
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"channels": 8
}
32 changes: 32 additions & 0 deletions 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
@@ -0,0 +1,32 @@
{
"displayName": "P10 8-Channel GEN1",
"model": "p10",
"displayCategory": "GEN1",
"pickUpTipConfigurations": {
"current": 0.55,
"speed": 30.0,
"presses": 3,
"increment": 3.0,
"distance": 10.0
},
"dropTipConfigurations": {
"current": 0.5,
"speed": 5.0,
"presses": 0,
"increment": 0.0,
"distance": 0.0
},
"plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 },
"plungerPositionsConfigurations": {
"top": 19.5,
"bottom": 2.0,
"blowout": -1.0,
"drop": -4.5
},
"availableSensors": { "sensors": [] },
"partialTipConfigurations": {
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"channels": 8
}
0 ...ns/2/general/eight_channel/p1000/1_0.json → ...ns/2/general/eight_channel/p1000/3_3.json
View file
Open in desktop
File renamed without changes.
32 changes: 32 additions & 0 deletions 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
@@ -0,0 +1,32 @@
{
"displayName": "P20 8-Channel GEN2",
"model": "p20",
"displayCategory": "GEN2",
"pickUpTipConfigurations": {
"current": 0.6,
"speed": 10.0,
"presses": 1,
"increment": 0.0,
"distance": 11.0
},
"dropTipConfigurations": {
"current": 1.25,
"speed": 15.0,
"presses": 0,
"increment": 0.0,
"distance": 0.0
},
"plungerMotorConfigurations": { "idle": 0.3, "run": 1.0 },
"plungerPositionsConfigurations": {
"top": 19.5,
"bottom": -8.5,
"blowout": -13.0,
"drop": -31.6
},
"availableSensors": { "sensors": [] },
"partialTipConfigurations": {
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"channels": 8
}
32 changes: 32 additions & 0 deletions 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
@@ -0,0 +1,32 @@
{
"displayName": "P20 8-Channel GEN2",
"model": "p20",
"displayCategory": "GEN2",
"pickUpTipConfigurations": {
"current": 0.6,
"speed": 10.0,
"presses": 1,
"increment": 0.0,
"distance": 11.0
},
"dropTipConfigurations": {
"current": 1.25,
"speed": 15.0,
"presses": 0,
"increment": 0.0,
"distance": 0.0
},
"plungerMotorConfigurations": { "idle": 0.3, "run": 1.0 },
"plungerPositionsConfigurations": {
"top": 19.5,
"bottom": -8.5,
"blowout": -13.0,
"drop": -31.6
},
"availableSensors": { "sensors": [] },
"partialTipConfigurations": {
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"channels": 8
}
32 changes: 32 additions & 0 deletions 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
@@ -0,0 +1,32 @@
{
"displayName": "P300 8-Channel GEN1",
"model": "p300",
"displayCategory": "GEN1",
"pickUpTipConfigurations": {
"current": 0.6,
"speed": 30.0,
"presses": 3,
"increment": 1.0,
"distance": 10.0
},
"dropTipConfigurations": {
"current": 0.5,
"speed": 5.0,
"presses": 0,
"increment": 0.0,
"distance": 0.0
},
"plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 },
"plungerPositionsConfigurations": {
"top": 19.5,
"bottom": 3.5,
"blowout": 3.0,
"drop": -2.0
},
"availableSensors": { "sensors": [] },
"partialTipConfigurations": {
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"channels": 8
}
32 changes: 32 additions & 0 deletions 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
@@ -0,0 +1,32 @@
{
"displayName": "P300 8-Channel GEN1",
"model": "p300",
"displayCategory": "GEN1",
"pickUpTipConfigurations": {
"current": 0.6,
"speed": 30.0,
"presses": 3,
"increment": 1.0,
"distance": 10.0
},
"dropTipConfigurations": {
"current": 0.5,
"speed": 5.0,
"presses": 0,
"increment": 0.0,
"distance": 0.0
},
"plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 },
"plungerPositionsConfigurations": {
"top": 19.5,
"bottom": 3.5,
"blowout": 1.5,
"drop": -3.5
},
"availableSensors": { "sensors": [] },
"partialTipConfigurations": {
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"channels": 8
}
32 changes: 32 additions & 0 deletions 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
@@ -0,0 +1,32 @@
{
"displayName": "P300 8-Channel GEN1",
"model": "p300",
"displayCategory": "GEN1",
"pickUpTipConfigurations": {
"current": 0.6,
"speed": 30.0,
"presses": 3,
"increment": 1.0,
"distance": 10.0
},
"dropTipConfigurations": {
"current": 0.5,
"speed": 5.0,
"presses": 0,
"increment": 0.0,
"distance": 0.0
},
"plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 },
"plungerPositionsConfigurations": {
"top": 19.5,
"bottom": 3.5,
"blowout": 1.5,
"drop": -3.5
},
"availableSensors": { "sensors": [] },
"partialTipConfigurations": {
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"channels": 8
}
32 changes: 32 additions & 0 deletions 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
@@ -0,0 +1,32 @@
{
"displayName": "P300 8-Channel GEN1",
"model": "p300",
"displayCategory": "GEN1",
"pickUpTipConfigurations": {
"current": 0.9,
"speed": 30.0,
"presses": 3,
"increment": 3.0,
"distance": 10.0
},
"dropTipConfigurations": {
"current": 0.5,
"speed": 5.0,
"presses": 0,
"increment": 0.0,
"distance": 0.0
},
"plungerMotorConfigurations": { "idle": 0.5, "run": 0.5 },
"plungerPositionsConfigurations": {
"top": 19.5,
"bottom": 3.5,
"blowout": 1.5,
"drop": -3.5
},
"availableSensors": { "sensors": [] },
"partialTipConfigurations": {
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"channels": 8
}
32 changes: 32 additions & 0 deletions 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
@@ -0,0 +1,32 @@
{
"displayName": "P300 8-Channel GEN2",
"model": "p300",
"displayCategory": "GEN2",
"pickUpTipConfigurations": {
"current": 0.8,
"speed": 10.0,
"presses": 1,
"increment": 0.0,
"distance": 11.0
},
"dropTipConfigurations": {
"current": 1.25,
"speed": 7.5,
"presses": 0,
"increment": 0.0,
"distance": 0.0
},
"plungerMotorConfigurations": { "idle": 0.3, "run": 1.0 },
"plungerPositionsConfigurations": {
"top": 19.5,
"bottom": -14.5,
"blowout": -19.0,
"drop": -33.4
},
"availableSensors": { "sensors": [] },
"partialTipConfigurations": {
"partialTipSupported": true,
"availableConfigurations": [1, 2, 3, 4, 5, 6, 7, 8]
},
"channels": 8
}
Loading