M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/m-labs/artiq

This commit is contained in:
Sebastien Bourdeauducq 2015-06-27 21:15:24 +02:00
parent a7bbcdc1ad 07ceed9512
commit 7d3acf4d10
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/frontend/artiq_flash.sh
View File

@ -3,7 +3,7 @@
# exit on error # exit on error
set -e set -e
# print commands # print commands
set -v #set -x
ARTIQ_PREFIX=$(python3 -c "import artiq; print(artiq.__path__[0])") ARTIQ_PREFIX=$(python3 -c "import artiq; print(artiq.__path__[0])")

7
doc/manual/faq.rst
View File

@ -75,10 +75,11 @@ scheduler API to achieve the same (``scheduler.yield(duration=0)``)
or wrap your own generators/coroutines/tasks in regular functions that or wrap your own generators/coroutines/tasks in regular functions that
you then expose as part of the API. you then expose as part of the API.
list the serial devices attached to my Linux/Windows system? determine the pyserial URL to attach to a device by its serial number?
------------------------------------------------------------ ----------------------------------------------------------------------
You can do it by running:: You can list your system's serial devices and print their vendor/product
id and serial number by running::
$ python3 -m serial.tools.list_ports -v $ python3 -m serial.tools.list_ports -v