Skip to content

Commit 1e53913

Browse files
CamDavidsonPilonCamDavidsonPilon
committed
contrib changes from the dosing automation field changes
1 parent 0ca64d1 commit 1e53913

File tree

11 files changed

+120
-118
lines changed

11 files changed

+120
-118
lines changed

‎asset-manifest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"files": {
33
"main.css": "/static/css/main.dbb6a692.css",
4-
"main.js": "/static/js/main.31979bee.js",
4+
"main.js": "/static/js/main.fef2da12.js",
55
"static/media/roboto-all-500-normal.woff": "/static/media/roboto-all-500-normal.0ab669b7a0d19b178f57.woff",
66
"static/media/roboto-all-700-normal.woff": "/static/media/roboto-all-700-normal.a457fde362a540fcadff.woff",
77
"static/media/roboto-all-400-normal.woff": "/static/media/roboto-all-400-normal.c5d001fa922fa66a147f.woff",
@@ -28,10 +28,10 @@
2828
"static/media/roboto-greek-ext-700-normal.woff2": "/static/media/roboto-greek-ext-700-normal.bd9854c751441ccc1a70.woff2",
2929
"index.html": "/index.html",
3030
"main.dbb6a692.css.map": "/static/css/main.dbb6a692.css.map",
31-
"main.31979bee.js.map": "/static/js/main.31979bee.js.map"
31+
"main.fef2da12.js.map": "/static/js/main.fef2da12.js.map"
3232
},
3333
"entrypoints": [
3434
"static/css/main.dbb6a692.css",
35-
"static/js/main.31979bee.js"
35+
"static/js/main.fef2da12.js"
3636
]
3737
}

‎contrib/automations/dosing/chemostat.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ fields:
88
unit: min
99
label: Time between dosing
1010
type: numeric
11-
- key: volume
11+
- key: exchange_volume_ml
1212
default: 0.5
1313
unit: mL
14-
label: Volume per dose
14+
label: Exchange volume
1515
type: numeric

‎contrib/automations/dosing/fed_batch.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fields:
88
unit: min
99
label: Duration between additions
1010
type: numeric
11-
- key: volume
11+
- key: dosing_volume_ml
1212
default: 1.0
1313
unit: mL
1414
label: Volume per dose

‎contrib/automations/dosing/turbidostat.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ fields:
1818
unit: OD
1919
label: Target OD
2020
type: numeric
21-
- key: volume
21+
- key: exchange_volume_ml
2222
default: 1.0
2323
unit: mL
24-
label: Volume
24+
label: Exchange volume
2525
type: numeric
2626
- key: duration
2727
default: 0.25

‎contrib/jobs/04_dosing_automation.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ published_settings:
1212
type: numeric
1313
display: true
1414
description: Change how long to wait between dilutions. Typically between 0.5 and 60 minutes. Changing may immediately trigger a dosing event.
15-
- key: volume
15+
- key: exchange_volume_ml
1616
unit: mL
17-
label: Volume / dosing
17+
label: Exchange volume
1818
type: numeric
1919
display: true
2020
description: Change the volume per dilution. Typical values are between 0.0mL and 2.0mL.
@@ -33,9 +33,9 @@ published_settings:
3333
- key: automation_name
3434
type: string
3535
display: false
36-
- key: max_volume
36+
- key: max_working_volume_ml
3737
type: string
3838
display: false
39-
- key: liquid_volume
39+
- key: current_volume_ml
4040
type: string
4141
display: false

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioreactor"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><script defer="defer" src="/static/js/main.31979bee.js"></script><link href="/static/css/main.dbb6a692.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioreactor"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><script defer="defer" src="/static/js/main.fef2da12.js"></script><link href="/static/css/main.dbb6a692.css" rel="stylesheet"></head><body><div id="root"></div></body></html>

‎pioreactorui/__init__.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ def create_app():
7979
# we currently only need to communicate with MQTT for the leader.
8080
# don't even connect if a worker - if the leader is down, this will crash and restart the server over and over.
8181
client.connect(
82-
host=pioreactor_config.get("mqtt", "broker_address", fallback="localhost"),
82+
host=pioreactor_config.get("mqtt", "broker_address", fallback="localhost").split(";")[
83+
0
84+
],
8385
port=pioreactor_config.getint("mqtt", "broker_port", fallback=1883),
8486
)
8587
logger.debug("Starting MQTT client")

‎static/js/main.31979bee.js‎

Lines changed: 0 additions & 103 deletions
This file was deleted.

‎static/js/main.fef2da12.js‎

Lines changed: 103 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

static/js/main.31979bee.js.LICENSE.txt renamed to static/js/main.fef2da12.js.LICENSE.txt

File renamed without changes.

0 commit comments

Comments
 (0)