From 90b31db51410ac29854ae5c6c948b544ab24cc6b Mon Sep 17 00:00:00 2001 From: Ryan howard Date: Wed, 20 Nov 2024 09:58:18 -0500 Subject: [PATCH] consistant formating --- .../single_channel/p1000/default/3_5.json | 1 - .../single_channel/p1000/default/3_6.json | 1 - .../single_channel/p50/default/3_5.json | 130 +++++++++--------- .../single_channel/p50/default/3_6.json | 130 +++++++++--------- .../p50/lowVolumeDefault/3_5.json | 126 ++++++++--------- .../p50/lowVolumeDefault/3_6.json | 126 ++++++++--------- 6 files changed, 256 insertions(+), 258 deletions(-) diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_5.json index 6a94bc2fed6..03ae2fbb163 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_5.json @@ -1,7 +1,6 @@ { "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { - "t20": { "uiMaxFlowRate": 57, "defaultAspirateFlowRate": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_6.json b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_6.json index b906bd6002e..dd1d1b3dc9e 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_6.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p1000/default/3_6.json @@ -1,7 +1,6 @@ { "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { - "t20": { "uiMaxFlowRate": 57, "defaultAspirateFlowRate": { diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_5.json index 76be1c1ab1f..19bf90b6172 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_5.json @@ -1,6 +1,71 @@ { "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { + "t20": { + "uiMaxFlowRate": 57, + "defaultAspirateFlowRate": { + "default": 35, + "valuesByApiLevel": { "2.14": 35 } + }, + "defaultDispenseFlowRate": { + "default": 57, + "valuesByApiLevel": { "2.14": 57 } + }, + "defaultBlowOutFlowRate": { + "default": 57, + "valuesByApiLevel": { "2.14": 57 } + }, + "defaultFlowAcceleration": 1200.0, + "defaultTipLength": 57.9, + "defaultReturnTipHeight": 0.2, + "aspirate": { + "default": { + "1": [ + [0.462, 0.5646, 0.0415], + [0.648, 0.3716, 0.1307], + [1.032, 0.2742, 0.1938], + [1.37, 0.1499, 0.3221], + [2.014, 0.1044, 0.3845], + [2.772, 0.0432, 0.5076], + [3.05, -0.0809, 0.8517], + [3.4, 0.0256, 0.5268], + [3.962, 0.0612, 0.4057], + [4.438, 0.0572, 0.4217], + [5.164, 0.018, 0.5955], + [5.966, 0.0095, 0.6393], + [7.38, 0.0075, 0.6514], + [9.128, 0.0049, 0.6705], + [10.16, 0.0033, 0.6854], + [13.812, 0.0024, 0.6948], + [21, 0.0024, 0.6948] + ] + } + }, + "dispense": { + "default": { + "1": [ + [0.462, 0.5646, 0.0415], + [0.648, 0.3716, 0.1307], + [1.032, 0.2742, 0.1938], + [1.37, 0.1499, 0.3221], + [2.014, 0.1044, 0.3845], + [2.772, 0.0432, 0.5076], + [3.05, -0.0809, 0.8517], + [3.4, 0.0256, 0.5268], + [3.962, 0.0612, 0.4057], + [4.438, 0.0572, 0.4217], + [5.164, 0.018, 0.5955], + [5.966, 0.0095, 0.6393], + [7.38, 0.0075, 0.6514], + [9.128, 0.0049, 0.6705], + [10.16, 0.0033, 0.6854], + [13.812, 0.0024, 0.6948], + [21, 0.0024, 0.6948] + ] + } + }, + "defaultPushOutVolume": 2 + }, "t50": { "uiMaxFlowRate": 57, "defaultAspirateFlowRate": { @@ -69,71 +134,6 @@ } }, "defaultPushOutVolume": 2 - }, - "t20": { - "uiMaxFlowRate": 57, - "defaultAspirateFlowRate": { - "default": 35, - "valuesByApiLevel": { "2.14": 35 } - }, - "defaultDispenseFlowRate": { - "default": 57, - "valuesByApiLevel": { "2.14": 57 } - }, - "defaultBlowOutFlowRate": { - "default": 57, - "valuesByApiLevel": { "2.14": 57 } - }, - "defaultFlowAcceleration": 1200.0, - "defaultTipLength": 57.9, - "defaultReturnTipHeight": 0.2, - "aspirate": { - "default": { - "1": [ - [0.462, 0.5646, 0.0415], - [0.648, 0.3716, 0.1307], - [1.032, 0.2742, 0.1938], - [1.37, 0.1499, 0.3221], - [2.014, 0.1044, 0.3845], - [2.772, 0.0432, 0.5076], - [3.05, -0.0809, 0.8517], - [3.4, 0.0256, 0.5268], - [3.962, 0.0612, 0.4057], - [4.438, 0.0572, 0.4217], - [5.164, 0.018, 0.5955], - [5.966, 0.0095, 0.6393], - [7.38, 0.0075, 0.6514], - [9.128, 0.0049, 0.6705], - [10.16, 0.0033, 0.6854], - [13.812, 0.0024, 0.6948], - [21, 0.0024, 0.6948] - ] - } - }, - "dispense": { - "default": { - "1": [ - [0.462, 0.5646, 0.0415], - [0.648, 0.3716, 0.1307], - [1.032, 0.2742, 0.1938], - [1.37, 0.1499, 0.3221], - [2.014, 0.1044, 0.3845], - [2.772, 0.0432, 0.5076], - [3.05, -0.0809, 0.8517], - [3.4, 0.0256, 0.5268], - [3.962, 0.0612, 0.4057], - [4.438, 0.0572, 0.4217], - [5.164, 0.018, 0.5955], - [5.966, 0.0095, 0.6393], - [7.38, 0.0075, 0.6514], - [9.128, 0.0049, 0.6705], - [10.16, 0.0033, 0.6854], - [13.812, 0.0024, 0.6948], - [21, 0.0024, 0.6948] - ] - } - }, - "defaultPushOutVolume": 2 } }, "maxVolume": 50, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_6.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_6.json index a1361507c84..1514f24d191 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_6.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/default/3_6.json @@ -1,6 +1,71 @@ { "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { + "t20": { + "uiMaxFlowRate": 57, + "defaultAspirateFlowRate": { + "default": 35, + "valuesByApiLevel": { "2.14": 35 } + }, + "defaultDispenseFlowRate": { + "default": 57, + "valuesByApiLevel": { "2.14": 57 } + }, + "defaultBlowOutFlowRate": { + "default": 57, + "valuesByApiLevel": { "2.14": 57 } + }, + "defaultFlowAcceleration": 1200.0, + "defaultTipLength": 57.9, + "defaultReturnTipHeight": 0.71, + "aspirate": { + "default": { + "1": [ + [0.462, 0.5646, 0.0415], + [0.648, 0.3716, 0.1307], + [1.032, 0.2742, 0.1938], + [1.37, 0.1499, 0.3221], + [2.014, 0.1044, 0.3845], + [2.772, 0.0432, 0.5076], + [3.05, -0.0809, 0.8517], + [3.4, 0.0256, 0.5268], + [3.962, 0.0612, 0.4057], + [4.438, 0.0572, 0.4217], + [5.164, 0.018, 0.5955], + [5.966, 0.0095, 0.6393], + [7.38, 0.0075, 0.6514], + [9.128, 0.0049, 0.6705], + [10.16, 0.0033, 0.6854], + [13.812, 0.0024, 0.6948], + [21, 0.0024, 0.6948] + ] + } + }, + "dispense": { + "default": { + "1": [ + [0.462, 0.5646, 0.0415], + [0.648, 0.3716, 0.1307], + [1.032, 0.2742, 0.1938], + [1.37, 0.1499, 0.3221], + [2.014, 0.1044, 0.3845], + [2.772, 0.0432, 0.5076], + [3.05, -0.0809, 0.8517], + [3.4, 0.0256, 0.5268], + [3.962, 0.0612, 0.4057], + [4.438, 0.0572, 0.4217], + [5.164, 0.018, 0.5955], + [5.966, 0.0095, 0.6393], + [7.38, 0.0075, 0.6514], + [9.128, 0.0049, 0.6705], + [10.16, 0.0033, 0.6854], + [13.812, 0.0024, 0.6948], + [21, 0.0024, 0.6948] + ] + } + }, + "defaultPushOutVolume": 2 + }, "t50": { "uiMaxFlowRate": 57, "defaultAspirateFlowRate": { @@ -69,71 +134,6 @@ } }, "defaultPushOutVolume": 2 - }, - "t20": { - "uiMaxFlowRate": 57, - "defaultAspirateFlowRate": { - "default": 35, - "valuesByApiLevel": { "2.14": 35 } - }, - "defaultDispenseFlowRate": { - "default": 57, - "valuesByApiLevel": { "2.14": 57 } - }, - "defaultBlowOutFlowRate": { - "default": 57, - "valuesByApiLevel": { "2.14": 57 } - }, - "defaultFlowAcceleration": 1200.0, - "defaultTipLength": 57.9, - "defaultReturnTipHeight": 0.71, - "aspirate": { - "default": { - "1": [ - [0.462, 0.5646, 0.0415], - [0.648, 0.3716, 0.1307], - [1.032, 0.2742, 0.1938], - [1.37, 0.1499, 0.3221], - [2.014, 0.1044, 0.3845], - [2.772, 0.0432, 0.5076], - [3.05, -0.0809, 0.8517], - [3.4, 0.0256, 0.5268], - [3.962, 0.0612, 0.4057], - [4.438, 0.0572, 0.4217], - [5.164, 0.018, 0.5955], - [5.966, 0.0095, 0.6393], - [7.38, 0.0075, 0.6514], - [9.128, 0.0049, 0.6705], - [10.16, 0.0033, 0.6854], - [13.812, 0.0024, 0.6948], - [21, 0.0024, 0.6948] - ] - } - }, - "dispense": { - "default": { - "1": [ - [0.462, 0.5646, 0.0415], - [0.648, 0.3716, 0.1307], - [1.032, 0.2742, 0.1938], - [1.37, 0.1499, 0.3221], - [2.014, 0.1044, 0.3845], - [2.772, 0.0432, 0.5076], - [3.05, -0.0809, 0.8517], - [3.4, 0.0256, 0.5268], - [3.962, 0.0612, 0.4057], - [4.438, 0.0572, 0.4217], - [5.164, 0.018, 0.5955], - [5.966, 0.0095, 0.6393], - [7.38, 0.0075, 0.6514], - [9.128, 0.0049, 0.6705], - [10.16, 0.0033, 0.6854], - [13.812, 0.0024, 0.6948], - [21, 0.0024, 0.6948] - ] - } - }, - "defaultPushOutVolume": 2 } }, "maxVolume": 50, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_5.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_5.json index db0705b7bef..d541fd3aecf 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_5.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_5.json @@ -1,6 +1,69 @@ { "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { + "t20": { + "uiMaxFlowRate": 26.7, + "defaultAspirateFlowRate": { + "default": 26.7, + "valuesByApiLevel": { "2.14": 26.7 } + }, + "defaultDispenseFlowRate": { + "default": 26.7, + "valuesByApiLevel": { "2.14": 26.7 } + }, + "defaultBlowOutFlowRate": { + "default": 26.7, + "valuesByApiLevel": { "2.14": 26.7 } + }, + "defaultFlowAcceleration": 1200.0, + "defaultTipLength": 57.9, + "defaultReturnTipHeight": 0.71, + "aspirate": { + "default": { + "1": [ + [0.11, 0.207815, 0.040201], + [0.65, 0.43933, 0.014735], + [1.04, 0.256666, 0.133466], + [1.67, 0.147126, 0.247388], + [2.45, 0.078774, 0.361536], + [2.89, 0.042387, 0.450684], + [3.2, 0.014781, 0.530464], + [3.79, 0.071819, 0.347944], + [4.22, 0.051592, 0.424605], + [4.93, 0.021219, 0.552775], + [5.81, 0.023461, 0.541725], + [7.21, 0.008959, 0.625982], + [8.93, 0.005456, 0.651235], + [10.0, 0.007108, 0.636489], + [13.61, 0.002591, 0.681656], + [21.61, 0.002591, 0.681656] + ] + } + }, + "dispense": { + "default": { + "1": [ + [0.11, 0.207815, 0.040201], + [0.65, 0.43933, 0.014735], + [1.04, 0.256666, 0.133466], + [1.67, 0.147126, 0.247388], + [2.45, 0.078774, 0.361536], + [2.89, 0.042387, 0.450684], + [3.2, 0.014781, 0.530464], + [3.79, 0.071819, 0.347944], + [4.22, 0.051592, 0.424605], + [4.93, 0.021219, 0.552775], + [5.81, 0.023461, 0.541725], + [7.21, 0.008959, 0.625982], + [8.93, 0.005456, 0.651235], + [10.0, 0.007108, 0.636489], + [13.61, 0.002591, 0.681656], + [21.61, 0.002591, 0.681656] + ] + } + }, + "defaultPushOutVolume": 7 + }, "t50": { "uiMaxFlowRate": 26.7, "defaultAspirateFlowRate": { @@ -67,69 +130,6 @@ } }, "defaultPushOutVolume": 7 - }, - "t20": { - "uiMaxFlowRate": 26.7, - "defaultAspirateFlowRate": { - "default": 26.7, - "valuesByApiLevel": { "2.14": 26.7 } - }, - "defaultDispenseFlowRate": { - "default": 26.7, - "valuesByApiLevel": { "2.14": 26.7 } - }, - "defaultBlowOutFlowRate": { - "default": 26.7, - "valuesByApiLevel": { "2.14": 26.7 } - }, - "defaultFlowAcceleration": 1200.0, - "defaultTipLength": 57.9, - "defaultReturnTipHeight": 0.71, - "aspirate": { - "default": { - "1": [ - [0.11, 0.207815, 0.040201], - [0.65, 0.43933, 0.014735], - [1.04, 0.256666, 0.133466], - [1.67, 0.147126, 0.247388], - [2.45, 0.078774, 0.361536], - [2.89, 0.042387, 0.450684], - [3.2, 0.014781, 0.530464], - [3.79, 0.071819, 0.347944], - [4.22, 0.051592, 0.424605], - [4.93, 0.021219, 0.552775], - [5.81, 0.023461, 0.541725], - [7.21, 0.008959, 0.625982], - [8.93, 0.005456, 0.651235], - [10.0, 0.007108, 0.636489], - [13.61, 0.002591, 0.681656], - [21.61, 0.002591, 0.681656] - ] - } - }, - "dispense": { - "default": { - "1": [ - [0.11, 0.207815, 0.040201], - [0.65, 0.43933, 0.014735], - [1.04, 0.256666, 0.133466], - [1.67, 0.147126, 0.247388], - [2.45, 0.078774, 0.361536], - [2.89, 0.042387, 0.450684], - [3.2, 0.014781, 0.530464], - [3.79, 0.071819, 0.347944], - [4.22, 0.051592, 0.424605], - [4.93, 0.021219, 0.552775], - [5.81, 0.023461, 0.541725], - [7.21, 0.008959, 0.625982], - [8.93, 0.005456, 0.651235], - [10.0, 0.007108, 0.636489], - [13.61, 0.002591, 0.681656], - [21.61, 0.002591, 0.681656] - ] - } - }, - "defaultPushOutVolume": 7 } }, "maxVolume": 30, diff --git a/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_6.json b/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_6.json index a271a84dd7b..d508e1cce8d 100644 --- a/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_6.json +++ b/shared-data/pipette/definitions/2/liquid/single_channel/p50/lowVolumeDefault/3_6.json @@ -1,6 +1,69 @@ { "$otSharedSchema": "#/pipette/schemas/2/pipetteLiquidPropertiesSchema.json", "supportedTips": { + "t20": { + "uiMaxFlowRate": 26.7, + "defaultAspirateFlowRate": { + "default": 26.7, + "valuesByApiLevel": { "2.14": 26.7 } + }, + "defaultDispenseFlowRate": { + "default": 26.7, + "valuesByApiLevel": { "2.14": 26.7 } + }, + "defaultBlowOutFlowRate": { + "default": 26.7, + "valuesByApiLevel": { "2.14": 26.7 } + }, + "defaultFlowAcceleration": 1200.0, + "defaultTipLength": 57.9, + "defaultReturnTipHeight": 0.71, + "aspirate": { + "default": { + "1": [ + [0.11, 0.207815, 0.040201], + [0.65, 0.43933, 0.014735], + [1.04, 0.256666, 0.133466], + [1.67, 0.147126, 0.247388], + [2.45, 0.078774, 0.361536], + [2.89, 0.042387, 0.450684], + [3.2, 0.014781, 0.530464], + [3.79, 0.071819, 0.347944], + [4.22, 0.051592, 0.424605], + [4.93, 0.021219, 0.552775], + [5.81, 0.023461, 0.541725], + [7.21, 0.008959, 0.625982], + [8.93, 0.005456, 0.651235], + [10.0, 0.007108, 0.636489], + [13.61, 0.002591, 0.681656], + [21.61, 0.002591, 0.681656] + ] + } + }, + "dispense": { + "default": { + "1": [ + [0.11, 0.207815, 0.040201], + [0.65, 0.43933, 0.014735], + [1.04, 0.256666, 0.133466], + [1.67, 0.147126, 0.247388], + [2.45, 0.078774, 0.361536], + [2.89, 0.042387, 0.450684], + [3.2, 0.014781, 0.530464], + [3.79, 0.071819, 0.347944], + [4.22, 0.051592, 0.424605], + [4.93, 0.021219, 0.552775], + [5.81, 0.023461, 0.541725], + [7.21, 0.008959, 0.625982], + [8.93, 0.005456, 0.651235], + [10.0, 0.007108, 0.636489], + [13.61, 0.002591, 0.681656], + [21.61, 0.002591, 0.681656] + ] + } + }, + "defaultPushOutVolume": 7 + }, "t50": { "uiMaxFlowRate": 26.7, "defaultAspirateFlowRate": { @@ -67,69 +130,6 @@ } }, "defaultPushOutVolume": 7 - }, - "t20": { - "uiMaxFlowRate": 26.7, - "defaultAspirateFlowRate": { - "default": 26.7, - "valuesByApiLevel": { "2.14": 26.7 } - }, - "defaultDispenseFlowRate": { - "default": 26.7, - "valuesByApiLevel": { "2.14": 26.7 } - }, - "defaultBlowOutFlowRate": { - "default": 26.7, - "valuesByApiLevel": { "2.14": 26.7 } - }, - "defaultFlowAcceleration": 1200.0, - "defaultTipLength": 57.9, - "defaultReturnTipHeight": 0.71, - "aspirate": { - "default": { - "1": [ - [0.11, 0.207815, 0.040201], - [0.65, 0.43933, 0.014735], - [1.04, 0.256666, 0.133466], - [1.67, 0.147126, 0.247388], - [2.45, 0.078774, 0.361536], - [2.89, 0.042387, 0.450684], - [3.2, 0.014781, 0.530464], - [3.79, 0.071819, 0.347944], - [4.22, 0.051592, 0.424605], - [4.93, 0.021219, 0.552775], - [5.81, 0.023461, 0.541725], - [7.21, 0.008959, 0.625982], - [8.93, 0.005456, 0.651235], - [10.0, 0.007108, 0.636489], - [13.61, 0.002591, 0.681656], - [21.61, 0.002591, 0.681656] - ] - } - }, - "dispense": { - "default": { - "1": [ - [0.11, 0.207815, 0.040201], - [0.65, 0.43933, 0.014735], - [1.04, 0.256666, 0.133466], - [1.67, 0.147126, 0.247388], - [2.45, 0.078774, 0.361536], - [2.89, 0.042387, 0.450684], - [3.2, 0.014781, 0.530464], - [3.79, 0.071819, 0.347944], - [4.22, 0.051592, 0.424605], - [4.93, 0.021219, 0.552775], - [5.81, 0.023461, 0.541725], - [7.21, 0.008959, 0.625982], - [8.93, 0.005456, 0.651235], - [10.0, 0.007108, 0.636489], - [13.61, 0.002591, 0.681656], - [21.61, 0.002591, 0.681656] - ] - } - }, - "defaultPushOutVolume": 7 } }, "maxVolume": 30,