Skip to content

Commit f69844c

Browse files
Merge branch 'develop' into pr/920
2 parents c7a3780 + 235263e commit f69844c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1565
-1543
lines changed

README.md

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ navigate
1111
[![Tests](https://github.com/TheDeanLab/navigate/actions/workflows/push_checks.yaml/badge.svg)](https://github.com/TheDeanLab/navigate/actions/workflows/push_checks.yaml)
1212
[![codecov](https://codecov.io/gh/TheDeanLab/navigate/branch/develop/graph/badge.svg?token=270RFSZGG5)](https://codecov.io/gh/TheDeanLab/navigate)
1313

14-
Navigate is an open source Python package for control of light-sheet microscopes. It allows for easily reconfigurable hardware setups and automated acquisition rotuines.
14+
**navigate** is an open source Python package for control of light-sheet microscopes.
15+
It allows for easily reconfigurable hardware setups and automated acquisition rotuines.
1516

1617
### Quick install
1718

@@ -31,23 +32,27 @@ Please refer to and contribute to the documentation, which can be found on GitHu
3132

3233
### Command Line Arguments
3334

34-
* optional arguments:
35-
* -h, --help show this help message and exit
36-
37-
* Input Arguments:
38-
* -sh, --synthetic_hardware
39-
* --config_file CONFIG_FILE
40-
* --experiment_file EXPERIMENT_FILE
41-
* --etl_const_file ETL_CONST_FILE
42-
* --rest_api_file REST_API_FILE
43-
* --logging_config LOGGING_CONFIG
44-
45-
### Authors
46-
* Kevin Dean
47-
* Zach Marin
48-
* Xiaoding 'Annie' Wang
49-
* Dax Collison
50-
* Sampath Rapuri
51-
* Samir Mamtani
52-
* Renil Gupta
53-
* Andrew Jamieson
35+
Below are the optional arguments that can be passed to the navigate software:
36+
37+
- `-h, --help`
38+
Provides information on the optional arguments that can be passed to **navigate**.
39+
- `-sh, --synthetic_hardware`
40+
Open the software without any hardware attached for testing
41+
and setting up a new system.
42+
- `-c, --configurator`
43+
Open the **navigate** configuration wizard, which provides a
44+
graphical interface for setting up the hardware configuration.
45+
- `-d`
46+
Enables the debugging menu in the software.
47+
- `--config-file`
48+
Pass a non-default `configuration.yaml` file to **navigate**.
49+
- `--experiment_file`
50+
Pass a non-default `experiment.yaml` file to **navigate**.
51+
- `--gui-config-file`
52+
Pass a non-default `gui_config.yaml` file to **navigate**.
53+
- `--waveform-constants-file`
54+
Pass a non-default waveform constants file to **navigate**.
55+
- `--rest_api_file`
56+
Pass a non-default REST API file to **navigate**.
57+
- `--logging_config`
58+
Pass a non-default logging configuration file to **navigate**.

docs/source/user_guide/hardware/configurations/configuration_mesospimbt.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# Only one microscope can be active in the GUI at a time, but all microscopes will be accessible
21
microscopes:
32
BTMesoSPIM:
43
daq:
@@ -45,7 +44,7 @@ microscopes:
4544
filter_wheel:
4645
hardware:
4746
type: ASI #SyntheticFilterWheel #SutterFilterWheel
48-
wheel_number: 1
47+
wheel_number: 0
4948
port: COM8
5049
baudrate: 115200
5150
filter_wheel_delay: .030 # in seconds

0 commit comments

Comments
 (0)