Skip to content

Commit

Permalink
formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
amit lissack committed May 27, 2021
1 parent f996b76 commit 5113fd5
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 26 deletions.
18 changes: 18 additions & 0 deletions .opentrons_config/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"labware_database_file": "/config/opentrons.db",
"labware_calibration_offsets_dir_v2": "/config/labware/v2/offsets",
"labware_user_definitions_dir_v2": "/config/labware/v2/custom_definitions",
"feature_flags_file": "/config/feature_flags.json",
"robot_settings_file": "/config/robot_settings.json",
"deck_calibration_file": "/config/deck_calibration.json",
"log_dir": "/config/logs",
"api_log_file": "/config/logs/api.log",
"serial_log_file": "/config/logs/serial.log",
"wifi_keys_dir": "/config/user_storage/opentrons_data/network_keys",
"hardware_controller_lockfile": "/config/hardware.lock",
"pipette_config_overrides_dir": "/config/pipettes",
"tip_length_calibration_dir": "/config/tip_lengths",
"robot_calibration_dir": "/config/robot",
"pipette_calibration_dir": "/config/robot/pipettes",
"custom_tiprack_dir": "/config/tip_lengths/custom_tiprack_definitions"
}
17 changes: 17 additions & 0 deletions .opentrons_config/feature_flags.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"shortFixedTrash": null,
"calibrateToBottom": null,
"deckCalibrationDots": null,
"useProtocolApi2": null,
"disableHomeOnBoot": null,
"useOldAspirationFunctions": null,
"enableDoorSafetySwitch": null,
"enableTipLengthCalibration": null,
"enableHttpProtocolSessions": null,
"enableFastProtocolUpload": null,
"enableProtocolEngine": null,
"disableLogAggregation": null,
"enableApi1BackCompat": null,
"useV1HttpApi": null,
"_version": 9
}
1 change: 1 addition & 0 deletions .opentrons_config/pipettes/P20SV202020070101.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ "model": "p20_single_v2.0" }
1 change: 1 addition & 0 deletions .opentrons_config/pipettes/P3HMV202020041605.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ "model": "p20_multi_v2.0" }
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

# Contributing Guide

Thanks for your interest in contributing to the Opentrons platform! This Contributing Guide is intended to ensure best practices for both internal Opentrons contributors as well as any external contributors. We want to make sure you’re set up to contribute effectively, no matter if you’re helping us out with bug reports, code, documentation, feature suggestions, or anything else. This guide covers:
Expand Down Expand Up @@ -150,6 +149,7 @@ Your computer will need the following tools installed to be able to develop with
```

**MacOS Big Sur Note:** due to this [known issue](https://github.com/pyenv/pyenv/issues/1737) we recommend using:

```shell
pyenv install 3.7.10
```
Expand Down
24 changes: 12 additions & 12 deletions DOCKER.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ Included in this repo are the tools to run a containerized Opentrons robot stack

This includes the `robot-server` connected to the hardware emulation application. The emulation application includes the Smoothie and magnetic, temperature, and thermocycler modules.

Requirements
------------------
## Requirements

- A clone of this repo.
- An installation [docker](https://docs.docker.com/get-docker/)
- An installation of [docker-compose](https://docs.docker.com/compose/install/)

How to use
--------------
## How to use

Start a terminal and change directory to the root of this repo.

1) Build
Enter ```docker-compose build --force-rm``` at the terminal.
1. Build
Enter `docker-compose build --force-rm` at the terminal.

2. Run
Enter `docker-compose up` at the terminal. _The build and run stages can be combined `docker-compose up --build`._

2) Run
Enter ```docker-compose up``` at the terminal. *The build and run stages can be combined ```docker-compose up --build```.*
3. Start the Opentrons application. The docker container will appear as `dev`. Connect and run just as you would on a robot.

3) Start the Opentrons application. The docker container will appear as `dev`. Connect and run just as you would on a robot.
## Known Issues

Known Issues
---
- Pipettes cannot be changed at run time.
- Pipettes are fixed as `p20_multi_v2.0` on the left mount and `p20_single_v2.0` on the right.
- Pipettes are fixed as `p20_multi_v2.0` on the left mount and `p20_single_v2.0` on the right.
26 changes: 13 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
version: "3"
version: '3'
services:
emulator:
build: .
command: python3 -m opentrons.hardware_control.emulation.app
ports:
- "9996:9996"
- "9997:9997"
- "9998:9998"
- "9999:9999"
- '9996:9996'
- '9997:9997'
- '9998:9998'
- '9999:9999'
robot-server:
build: .
command: uvicorn "robot_server:app" --host 0.0.0.0 --port 31950 --ws wsproto --reload
ports:
- "31950:31950"
- '31950:31950'
environment:
- OT_API_CONFIG_DIR=/config
- OT_SMOOTHIE_EMULATOR_URI=socket://emulator:9996
- OT_THERMOCYCLER_EMULATOR_URI=socket://emulator:9997
- OT_TEMPERATURE_EMULATOR_URI=socket://emulator:9998
- OT_MAGNETIC_EMULATOR_URI=socket://emulator:9999
- OT_API_CONFIG_DIR=/config
- OT_SMOOTHIE_EMULATOR_URI=socket://emulator:9996
- OT_THERMOCYCLER_EMULATOR_URI=socket://emulator:9997
- OT_TEMPERATURE_EMULATOR_URI=socket://emulator:9998
- OT_MAGNETIC_EMULATOR_URI=socket://emulator:9999
links:
- "emulator"
- 'emulator'
depends_on:
- "emulator"
- 'emulator'
volumes:
- .opentrons_config:/config:rw

0 comments on commit 5113fd5

Please sign in to comment.