Skip to content

Commit

Permalink
Merge pull request #18 from mtiggelman/lockin
Browse files Browse the repository at this point in the history
Lockin
  • Loading branch information
mtiggelman authored Sep 23, 2019
2 parents 0ef95c4 + 0dd3d11 commit e26f303
Show file tree
Hide file tree
Showing 18 changed files with 7,344 additions and 942 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ target/
# IPython Notebook
.ipynb_checkpoints

# vscode
.idea
.vscode

# pyenv
.python-version

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ D5a = D5a_module(spi, module=2)
# Set the output of DAC 1 to the desired voltage
D5a.set_voltage(0, voltage=2.1)
```
More examples can be found as Jupyter notebooks in [examples](https://github.com/Rubenknex/SPI-rack/tree/master/examples) or at the [website](http://qtwork.tudelft.nl/~mtiggelman/software/examples.html).
More examples can be found as Jupyter notebooks in [examples](https://github.com/mtiggelman/SPI-rack/tree/master/examples) or at the [website](http://qtwork.tudelft.nl/~mtiggelman/software/examples.html).

## Installation
**Windows users:** before connecting the SPI-rack for the first time, install the drivers located
Expand All @@ -31,4 +31,4 @@ For a basic install use: `pip install spirack`. For more details see the website
A Qcodes wrapper for the instrument is available from https://github.com/QCoDeS/Qcodes

## License
See [License](https://github.com/Rubenknex/SPI-rack/blob/master/LICENSE).
See [License](https://github.com/mtiggelman/SPI-rack/blob/master/LICENSE).
Loading

0 comments on commit e26f303

Please sign in to comment.