Skip to content

Commit

Permalink
Merge pull request #5056 from Opentrons/develop
Browse files Browse the repository at this point in the history
chore(Release): 2024-03-07
  • Loading branch information
ramifarawi authored Jul 2, 2024
2 parents e4c9254 + 25b350f commit 18e4652
Show file tree
Hide file tree
Showing 38 changed files with 643 additions and 10,681 deletions.
22 changes: 12 additions & 10 deletions data/data/fields.csv
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ empty_vial_well,3
end_col,1
end_column,1
end_repair,1
engage_height,19
engage_height,20
engage_offset,4
engage_time,17
enz_asp_rate,1
Expand Down Expand Up @@ -575,7 +575,7 @@ init_vol,3
init_vol_50,1
init_vol_bca,1
init_vol_bsa,1
init_vol_buff,2
init_vol_buff,1
init_vol_buff1,1
init_vol_buff2,1
init_vol_buff3,1
Expand All @@ -586,7 +586,7 @@ init_vol_standard,1
init_vols_csv,1
initial_denaturation_cycles,1
initial_vol,1
input_csv,23
input_csv,22
input_file,10
input_file2,6
input_labware,1
Expand Down Expand Up @@ -643,7 +643,6 @@ labware_collect_plate,1
labware_cultureplate,1
labware_deep_well,1
labware_dest,2
labware_dna_plate,1
labware_dna_sample_plate,1
labware_elisa_plate,3
labware_firstrna,1
Expand All @@ -655,7 +654,7 @@ labware_p300_tips,1
labware_parent,2
labware_patient_samples,1
labware_pcr,1
labware_pcr_plate,11
labware_pcr_plate,10
labware_plate,1
labware_plates,9
labware_pool,1
Expand Down Expand Up @@ -891,6 +890,7 @@ num_col,10
num_cols,3
num_columns,1
num_curves,1
num_cycles,1
num_daughter_plates,1
num_drug_plates,1
num_extracts,1
Expand Down Expand Up @@ -991,7 +991,7 @@ p1kmnt,1
p1n,1
p1num,1
p20_blowout_height,1
p20_mount,137
p20_mount,136
p20_multi_mount,3
p20_rate,2
p20_reservoir_height,1
Expand All @@ -1008,7 +1008,7 @@ p2num,1
p300_gen,1
p300_mixing_height,1
p300_mnt,3
p300_mount,160
p300_mount,159
p300_mount_1,1
p300_multi_mount,7
p300_rate,1
Expand Down Expand Up @@ -1450,7 +1450,7 @@ te_well,2
temp,2
temp_gen,1
temp_lysate,1
temp_mod,3
temp_mod,2
temp_mod_lname,2
temp_mod_on,2
temp_mod_s1_lname,1
Expand All @@ -1471,7 +1471,7 @@ tempblock,1
tempdeck_gen,1
tempdeck_name,1
tempdeck_slot,1
temperature,13
temperature,12
temperature1,1
temperature2,1
tempgen,1
Expand Down Expand Up @@ -1554,7 +1554,7 @@ transfer2,1
transfer_csv,21
transfer_scheme,2
transfer_to_storage,1
transfer_vol,10
transfer_vol,9
transfer_volume,3
transfercsv,2
transfervol,1
Expand Down Expand Up @@ -1614,6 +1614,8 @@ use_filter_tips_left,2
use_filter_tips_right,2
use_middle_2,2
use_nacl,1
use_p20,1
use_p300,1
use_single_source,1
use_temp,1
use_tuberack_a,1
Expand Down
8 changes: 7 additions & 1 deletion protoBuilds/0451f3/miniprep.ot2.apiv2.py.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion protoBuilds/04711e/04711e.ot2.apiv2.py.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"content": "# flake8: noqa\n\nimport math\n\nmetadata = {\n 'protocolName': 'PCR Prep',\n 'author': 'Rami Farawi <[email protected]>',\n 'source': 'Custom Protocol Request',\n 'apiLevel': '2.13'\n}\n\n\ndef run(ctx):\n\n [num_samp,\n p300_mount, m20_mount] = get_values( # noqa: F821\n \"num_samp\", \"p300_mount\", \"m20_mount\")\n\n # num_samp = 16\n # p300_mount = 'left'\n # m20_mount = 'right'\n\n # labware\n tuberack = ctx.load_labware('opentrons_24_tuberack_2000ul', 4)\n\n source_plate = ctx.load_labware('pcrplate_96_wellplate_200ul', 1)\n middle_plate = ctx.load_labware('pcrplate_96_wellplate_200ul', 2)\n final_plate = ctx.load_labware('pcrplate_96_wellplate_200ul', 3)\n\n tip300 = [ctx.load_labware('opentrons_96_tiprack_300ul', slot)\n for slot in [6]]\n tip20 = [ctx.load_labware('opentrons_96_filtertiprack_20ul', slot)\n for slot in [10, 11]]\n\n # pipettes\n p300 = ctx.load_instrument('p300_single_gen2', p300_mount,\n tip_racks=tip300)\n m20 = ctx.load_instrument('p20_multi_gen2', m20_mount,\n tip_racks=tip20)\n\n # mapping\n mmx = tuberack['A1']\n primer = tuberack['A2']\n final_mmx = tuberack['A3']\n num_col = math.ceil(num_samp/8)\n\n # protocol\n ctx.comment('\\n---------------MAKING MASTERMIX----------------\\n\\n')\n mmx_vol = 9.1\n primer_vol = 5.57\n\n p300.pick_up_tip()\n p300.transfer(mmx_vol*num_samp*1.15, mmx, final_mmx, new_tip='never')\n p300.drop_tip()\n\n total_vol = num_samp*(primer_vol+mmx_vol)\n p300.pick_up_tip()\n p300.transfer(primer_vol*num_samp*1.15, primer, final_mmx, new_tip='never')\n p300.mix(20, total_vol if total_vol < 300 else 300, final_mmx)\n p300.drop_tip()\n\n vol_per_col_well = (mmx_vol+primer_vol)*12*1.1\n p300.pick_up_tip()\n for well in middle_plate.columns()[0]:\n p300.aspirate(vol_per_col_well, final_mmx)\n p300.dispense(vol_per_col_well, well)\n p300.drop_tip()\n\n ctx.comment('\\n---------------DISTRIBUTING MASTERMIX----------------\\n\\n')\n m20.pick_up_tip()\n for col in final_plate.rows()[0][:num_col]:\n m20.aspirate(14.7, middle_plate.rows()[0][0])\n m20.dispense(14.7, col)\n m20.drop_tip()\n\n ctx.comment('\\n---------------DISTRIBUTING SAMPLE----------------\\n\\n')\n for s, d in zip(source_plate.rows()[0][:num_col], final_plate.rows()[0]):\n m20.pick_up_tip()\n m20.aspirate(4, s)\n m20.dispense(4, d)\n m20.mix(5, 15, d)\n m20.drop_tip()\n",
"content": "# flake8: noqa\n\nimport math\n\nmetadata = {\n 'protocolName': 'PCR Prep',\n 'author': 'Rami Farawi <[email protected]>',\n 'source': 'Custom Protocol Request',\n 'apiLevel': '2.13'\n}\n\n\ndef run(ctx):\n\n [num_samp,\n p300_mount, m20_mount] = get_values( # noqa: F821\n \"num_samp\", \"p300_mount\", \"m20_mount\")\n\n # num_samp = 16\n # p300_mount = 'left'\n # m20_mount = 'right'\n\n # labware\n tuberack = ctx.load_labware('opentrons_24_tuberack_2000ul', 4)\n\n source_plate = ctx.load_labware('pcrplate_96_wellplate_200ul', 1)\n middle_plate = ctx.load_labware('pcrplate_96_wellplate_200ul', 2)\n final_plate = ctx.load_labware('pcrplate_96_wellplate_200ul', 3)\n\n tip300 = [ctx.load_labware('opentrons_96_tiprack_300ul', slot)\n for slot in [6]]\n tip20 = [ctx.load_labware('opentrons_96_filtertiprack_20ul', slot)\n for slot in [10, 11]]\n\n # pipettes\n p300 = ctx.load_instrument('p300_single_gen2', p300_mount,\n tip_racks=tip300)\n m20 = ctx.load_instrument('p20_multi_gen2', m20_mount,\n tip_racks=tip20)\n\n # mapping\n mmx = tuberack['A1']\n primer = tuberack['A2']\n final_mmx = tuberack['A3']\n num_col = math.ceil(num_samp/8)\n\n # protocol\n ctx.comment('\\n---------------MAKING MASTERMIX----------------\\n\\n')\n mmx_vol = 9.1\n primer_vol = 5.57\n\n p300.pick_up_tip()\n p300.transfer(mmx_vol*num_samp*1.15, mmx, final_mmx, new_tip='never')\n p300.drop_tip()\n\n total_vol = num_samp*(primer_vol+mmx_vol)\n p300.pick_up_tip()\n p300.transfer(primer_vol*num_samp*1.15, primer, final_mmx, new_tip='never')\n for _ in range(20):\n p300.aspirate(total_vol if total_vol < 300 else 300, final_mmx)\n p300.dispense(total_vol if total_vol < 300 else 300, final_mmx.top(z=-3))\n p300.mix(20, total_vol if total_vol < 300 else 300, final_mmx)\n p300.drop_tip()\n\n vol_per_col_well = (mmx_vol+primer_vol)*12*1.1\n p300.pick_up_tip()\n for well in middle_plate.columns()[0]:\n p300.aspirate(vol_per_col_well, final_mmx)\n p300.dispense(vol_per_col_well, well)\n p300.drop_tip()\n\n ctx.comment('\\n---------------DISTRIBUTING MASTERMIX----------------\\n\\n')\n m20.pick_up_tip()\n for col in final_plate.rows()[0][:num_col]:\n m20.aspirate(14.7, middle_plate.rows()[0][0])\n m20.dispense(14.7, col)\n m20.drop_tip()\n\n ctx.comment('\\n---------------DISTRIBUTING SAMPLE----------------\\n\\n')\n for s, d in zip(source_plate.rows()[0][:num_col], final_plate.rows()[0]):\n m20.pick_up_tip()\n m20.aspirate(4, s)\n m20.dispense(4, d)\n m20.mix(5, 15, d)\n m20.drop_tip()\n",
"custom_labware_defs": [
{
"brand": {
Expand Down
Loading

0 comments on commit 18e4652

Please sign in to comment.