Skip to content
Snippets Groups Projects
Commit dc5742c3 authored by Christian Darsow Fromm's avatar Christian Darsow Fromm
Browse files

Merge branch 'develop' into 'master'

new version

See merge request las-nq/nqontrol!106
parents 0c41410a a5edaa2d
Branches
Tags
No related merge requests found
# ReadMe # ReadMe
![pipeline status](https://gitlab.aei.uni-hannover.de/las-nq/adwin-control/badges/master/pipeline.svg) ![pipeline status](https://git.physnet.uni-hamburg.de/las-nq/adwin-control/badges/master/pipeline.svg)
![coverage report](https://gitlab.aei.uni-hannover.de/las-nq/adwin-control/badges/master/coverage.svg) ![coverage report](https://git.physnet.uni-hamburg.de/las-nq/adwin-control/badges/master/coverage.svg)
`NQontrol` is a python project aiming the replacement of analog PID controllers in the lab. `NQontrol` is a python project aiming the replacement of analog PID controllers in the lab.
......
...@@ -34,7 +34,8 @@ More distribution methods will follow. ...@@ -34,7 +34,8 @@ More distribution methods will follow.
To install the dependencies on a Unix system, use: To install the dependencies on a Unix system, use:
```bash ```bash
make requirements make requirements # to install in a virtualenv
make requirements-user # to install on user level
``` ```
The general version for the only non-Unix system is: The general version for the only non-Unix system is:
```bash ```bash
...@@ -48,11 +49,6 @@ The pythonic installation to the users site packages is done with: ...@@ -48,11 +49,6 @@ The pythonic installation to the users site packages is done with:
python3 setup.py install --user python3 setup.py install --user
``` ```
### Windows
Install the `*.exe`. I don't know, what happens with the dependencies.
Maybe it needs little work to install them automatically.
## Install the ADwin Library ## Install the ADwin Library
### On Linux ### On Linux
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment