9d6287a6a3
expose machine units to user
2015-07-01 22:22:53 +02:00
Yann Sionneau
d7ef885d9e
controllers: print+exit instead of raising exception for argparse error, better doc for --simulation
...
As long as you use --simulation, the driver will be in simulation mode.
Even if you specify a --device or --channels.
That can allow you to just switch to simulation mode by adding
--simulation in the device database without having to
remove the serial number or device path/name.
2015-07-01 11:54:28 +02:00
Yann Sionneau
652f3359a2
lda_controller: fix typo
2015-07-01 11:41:01 +02:00
Yann Sionneau
ffe1355b1a
lda_controller: improve help message for --device argument
2015-06-29 19:24:55 +02:00
Yann Sionneau
a73776bd72
controllers: enforce the usage of either --simulation or --device
2015-06-29 19:21:32 +02:00
Yann Sionneau
515aa96819
controllers: use --simulation for simulation
2015-06-29 13:04:01 +02:00
23eee94458
pipistrello: add notes to nist_qc1 about dds_clock
...
* remove xtrig from the target as it is not usually connected (used for
dds_clock) and ignore PMT2/BTN2 as C:15 is used for dds_clock.
* this also aligns the ttl channel numbers with kc705/nist_qc1 (two pmt
inputs followed by 16 ttl outputs followed by leds)
2015-06-28 20:56:12 -06:00
f7427dda39
test: make benchmarks unittest
2015-06-28 20:56:12 -06:00
593dafc118
test: hardware testbench
2015-06-28 20:55:59 -06:00
39e9e73ff3
language: allow experiments to import from artiq.language
...
this way the import stanza shows what is imported: just experiment language
related components
keep the imports also at top level until experiments have transitioned
the top level __init__.py should build and expose the entire namespace of artiq
related things, like hdf5 analysis tools, frontend components (like experiment
running api), deployment tools etc.
2015-06-28 20:52:41 -06:00
944bfafefa
soc: support QC2 and AD9914 (untested)
2015-06-28 21:37:27 +02:00
85c5b157a0
test/full_stack: tolerate FP rounding errors
2015-06-27 23:52:20 +02:00
7d3acf4d10
Merge branch 'master' of https://github.com/m-labs/artiq
2015-06-27 21:15:24 +02:00
07ceed9512
artiq_flash.sh: back down on verbosity
2015-06-26 11:09:26 -06:00
c71fe29792
simplify unit system and use floats by default
2015-06-26 16:34:37 +02:00
e6a4c2fb36
dds: make it easier to specify phase
2015-06-26 12:05:11 +02:00
48e0a2ad37
artiq_flash: echo commands for a bit more verbosity
2015-06-25 13:28:05 -06:00
Yann Sionneau
9c96ebf7d4
nist_qc2: add fmc adapter io file
2015-06-25 03:06:15 +02:00
4ba8951ae1
rpc: fix indentation of class docstring
2015-06-23 19:31:52 +00:00
Yann Sionneau
71721a152e
artiq_rpctool: list-methods also prints class docstring
2015-06-23 18:35:32 +02:00
8082bf14c1
Merge branch 'master' of https://github.com/m-labs/artiq
2015-06-21 07:27:47 -06:00
ef96de7d26
Merge branch 'shrink-dds-wb'
...
* shrink-dds-wb:
ad9858: make wb data 8 bit wide
2015-06-21 00:10:44 -06:00
45ec5dbe84
ad9858: make wb data 8 bit wide
...
matches actual dds bus data width and saves bram
2015-06-20 23:53:01 -06:00
07a58dc0da
wavesynth: cleanup, refactor
2015-06-20 23:29:26 -06:00
87ea1433d3
dds: all working
2015-06-20 18:42:39 -06:00
827f99e7d3
gui: more digits in DDS monitor
2015-06-19 17:55:01 -06:00
f47c2e54e1
DDS monitor fixes
2015-06-19 17:36:46 -06:00
Joe Britton
83fd5fdf16
novatech409b: add unit test
2015-06-19 15:59:23 -06:00
Joe Britton
f850336537
novatech409b: cleanup
2015-06-19 15:58:25 -06:00
5a9bdb2e33
DDS monitoring
2015-06-19 15:30:17 -06:00
Yann Sionneau
b8bb3d8ca7
manual: explain how to select TCube device from serial number
2015-06-19 17:06:50 +02:00
Yann Sionneau
4cdf1c4b81
manual: serial number explanations + udev rule for LDA
2015-06-19 16:41:44 +02:00
Yann Sionneau
988ec5c7e2
tdc/tpz driver: fix missing close method in simulated device
2015-06-19 10:40:49 +02:00
Yann Sionneau
645c65014d
gui: forgot to rename one data to backing_store
2015-06-19 01:07:37 +02:00
Yann Sionneau
4d077f50c6
thorlabs tdc driver: all moves are now blocking and wait for move to end or be stopped
2015-06-19 01:02:12 +02:00
Yann Sionneau
b05972059e
artiq_gui: check due date upon date selection
2015-06-18 20:44:42 +02:00
Yann Sionneau
1ad5165cc7
artiq_gui: add a search box in parameters dock
2015-06-18 20:43:53 +02:00
Yann Sionneau
77ca8bbf0f
artiq_coreconfig: better arg parsing
2015-06-18 17:07:20 +02:00
Florent Kermarrec
d25a07f668
Merge branch 'master' of https://github.com/m-labs/artiq
2015-06-18 12:54:33 +02:00
Florent Kermarrec
38a0f63bd2
gateware/soc: use Minicon SDRAM controller and 128KB shared L2 cache
2015-06-18 12:18:03 +02:00
Yann Sionneau
afc70926d7
artiq_coreconfig: use subparsers for arg parsing
2015-06-17 16:40:27 +02:00
Yann Sionneau
95ff21d829
gui: add ARTIQ icon
2015-06-16 17:01:53 +02:00
Yann Sionneau
4c8917afbd
artiq_flash: use BIT files instead of BIN files
2015-06-16 01:39:41 +02:00
76e034c913
protocols: add fire-and-forget RPC
2015-06-14 22:03:34 -06:00
86fbe38371
gui: DDS monitor/injection (WIP)
2015-06-12 17:41:04 +08:00
f84c51fed5
gui: do not use broken pyqtgraph addLabel method
2015-06-11 15:15:13 +08:00
Yann Sionneau
92999d0cc0
sync_struct: test append, insert, delitem and pop actions
2015-06-10 00:52:46 +02:00
276a1784ef
gui: add TTL override label
2015-06-09 20:05:39 +08:00
b2af0f6cc3
soc,runtime: support TTL override
2015-06-09 19:51:02 +08:00
Yann Sionneau
6c094b500d
pxi6733: fix type issue
2015-06-08 17:56:44 +02:00
Yann Sionneau
d66117ed99
pxi6733: cleanup
2015-06-08 11:54:39 +02:00
Yann Sionneau
c251601204
pxi6733: refactor, allow multiple channels in one task, cancel any previous task
2015-06-05 20:12:46 +02:00
26e737f61f
style
2015-06-06 00:55:36 +08:00
37c7ea31c3
gui: TTL override support
2015-06-06 00:03:30 +08:00
14cf244c0a
gui: display status of TTL channels
2015-06-05 19:11:41 +08:00
9f9079589e
gui: send monitor requests to core device
2015-06-05 14:52:41 +08:00
a6a476593e
worker: wait for process termination
...
This prevents stray SIGCHLDs from crashing the program e.g. if the asyncio event loop is closed before the process actually terminates.
2015-06-05 00:37:26 +08:00
c843c353d7
worker: remove useless process wait
2015-06-05 00:05:38 +08:00
Yann Sionneau
50a6da994e
worker test: do not close the event loop twice
2015-06-04 13:44:07 +02:00
Yann Sionneau
60bdf74137
tests: use try/finally to close event loop + wait for process to die after killing it
2015-06-04 13:40:13 +02:00
78f9268277
worker: add note about correct use of close()
2015-06-04 11:30:34 +08:00
d73006652b
test/worker: always close even if prepare() raises
2015-06-04 11:22:03 +08:00
82a2beaa32
style fixes
2015-06-04 10:42:37 +08:00
448ba042b5
Merge branch 'master' of github.com:m-labs/artiq
2015-06-04 10:35:52 +08:00
Yann Sionneau
b27254ba80
sync_struct test: test more cases, pep8 fix, remove print
2015-06-03 15:54:50 +02:00
Yann Sionneau
b8bdce5bd1
sync_struct test: don't poll, use Event instead
2015-06-03 15:40:58 +02:00
Yann Sionneau
21d88d8345
tests: use a different event loop for each test
2015-06-03 15:23:34 +02:00
a2ae5e4706
runtime: report TTL status over UDP
2015-06-03 18:26:19 +08:00
Yann Sionneau
e5f16b29fd
sync_struct: fix test case name
2015-06-03 10:46:09 +02:00
Yann Sionneau
c7953da7e1
test: add unittest for sync_struct
2015-06-03 10:43:01 +02:00
Yann Sionneau
140239fee4
pxi6733: allow to set the sampling frequency
2015-06-03 00:34:11 +02:00
59b339462c
Merge branch 'master' of github.com:m-labs/artiq
2015-06-02 17:45:16 +08:00
b81151eb42
soc: rtio monitor
2015-06-02 17:41:40 +08:00
048782e26c
test/scheduler: test flush
2015-05-29 20:16:47 +08:00
6ff2e1a083
test/scheduler: verify that a high priority timed experiment in the future is not run
2015-05-29 19:43:39 +08:00
Yann Sionneau
575dfade38
flash_storage comm: use OK/ERROR replies instead of specific FLASH_WRITE_REPLY
2015-05-29 11:10:40 +02:00
aa242f7c66
scheduler: simplify priority policy
...
Remove overdueness. User must submit calibration experiments with higher priority values for them to take precedence.
2015-05-28 18:24:45 +08:00
b0f8141018
scheduler: cancel flush when run is cancelled
2015-05-28 17:48:33 +08:00
e752e57fa5
scheduler: do not duplicate 'run terminated' information
2015-05-28 17:37:08 +08:00
4a7c6954c3
artiq_run: implement mockups of new scheduler API
2015-05-28 17:24:47 +08:00
737f6d4485
scheduler: support pipeline flush
2015-05-28 17:20:58 +08:00
0b05b54a87
test: add scheduler unittest
2015-05-27 19:25:50 +08:00
Yann Sionneau
4bf7875b87
flash_storage: refactor + unit tests + artiq_coreconfig.py CLI + doc
2015-05-27 18:06:12 +08:00
Yann Sionneau
36cda96df0
pxi6733: add ping method to the driver
2015-05-25 22:16:31 +02:00
f30d671359
test/worker: adapt to priority API
2015-05-24 23:38:05 +08:00
5fb86af3a4
gui: support experiment cancellation
2015-05-24 23:20:52 +08:00
ae4615281f
pyon/store_file: replace previous file atomically
2015-05-24 21:26:15 +08:00
fc449509b8
scheduler: pass priority to experiments
2015-05-24 20:37:47 +08:00
e611e17eeb
gui: experiment submission
2015-05-24 20:24:07 +08:00
a21373841c
scheduler: catch worker exceptions in prepare and analyze stages
2015-05-24 20:23:49 +08:00
d6ced1c780
scheduler: support priorities
2015-05-24 01:09:22 +08:00
2f910921f5
gui: console -> log
2015-05-24 00:38:30 +08:00
d9c25130e3
gui: add explorer widgets
2015-05-23 01:25:33 +08:00
2570444941
gui: add empty explorer and console docks
2015-05-22 23:30:46 +08:00
Yann Sionneau
d78a275655
pxi6733: use a method as DoneEvent callback
2015-05-22 16:08:07 +02:00
ea53ed1af7
gui: switch to Qt
2015-05-22 17:06:31 +08:00
Yann Sionneau
c91cd0ab38
pxi6733: use a writeable and c_contiguous numpy ndarray
2015-05-21 18:05:32 +02:00
785623be26
test/worker: adapt to new scheduler API
2015-05-21 16:41:45 +08:00
a670b9f660
tools/asyncio_wait_or_cancel: wait for cancellation
2015-05-21 16:41:27 +08:00
d8917fd94f
Merge branch 'master' of github.com:m-labs/artiq
2015-05-17 16:11:16 +08:00
b74b8d5826
Scheduling TNG
2015-05-17 16:11:00 +08:00
Yann Sionneau
e9b166b199
artiq_flash.sh: some cleanup
2015-05-14 11:12:03 +02:00
e557d7e2df
Merge branch 'master' of github.com:m-labs/artiq
2015-05-14 00:16:27 +08:00
cbb5027343
gateware/ad9858: use WaitTimer from Migen
2015-05-14 00:16:15 +08:00
a62ae1d8d7
test/transforms: adapt to 'now' save on core device
2015-05-12 23:06:33 +08:00
ce4b5739ed
runtime: reset all DDSes upon startup
2015-05-09 17:12:38 +08:00
1ceb06fb16
dds: use context manager for batches
2015-05-09 14:47:40 +08:00
fdc406f062
transforms/inline: support user-defined context managers
2015-05-09 14:47:08 +08:00
5c08423b29
dds: support batches in driver
2015-05-08 22:17:06 +08:00
55f2fef576
runtime: support DDS batches
2015-05-08 16:51:54 +08:00
53c6339307
runtime: break ttl-specific functions from rtio
2015-05-08 16:20:12 +08:00
a36c51eb83
DDS over RTIO (batch mode not supported yet)
2015-05-08 14:44:39 +08:00
a91bb48ced
gateware: adapt to misoc changes
2015-05-06 18:02:15 +08:00
9072647bdc
ad9858: make read timing configurable, increase read delays
2015-05-05 19:33:34 +08:00
2adf9d91df
recover_underflow -> break_realtime
2015-05-03 20:45:28 +08:00
4048568d8e
support kernel handover with coherent time
2015-05-02 23:41:49 +08:00
cb65b1e322
rtio/phy/ttl_simple: reset sensitivity with RTIO logic
2015-05-02 16:17:31 +08:00
a61d701d47
rtio: decouple PHY reset from logic reset
2015-05-02 11:47:11 +08:00
65b4b7bb12
coredevice: rename rtio to ttl, integrated in+out driver, loopback on the same pin in tests
2015-05-02 10:35:21 +08:00
62669f9ff2
soc: factor timer, kernel CPU and mailbox
2015-05-01 18:51:24 +08:00
1684586ae8
test: add unittest for core device watchdog
2015-05-01 14:02:31 +08:00
109dfab76c
frontend: add artiq_mkfs
2015-04-30 20:03:11 +08:00
8a796a6818
artiq_run/ELFRunner: create a core device object (necessary for runtime exception processing)
2015-04-30 10:16:24 +08:00
Zach Smith
5df446ec4b
artiq_flash.sh: fix Pipistrello flash proxy filename
2015-04-30 09:24:13 +08:00
967145f2dc
watchdog support on core device (broken by bug similar to issue #19 )
2015-04-29 12:58:37 +08:00
9ecbb4c88d
gateware/amp/mailbox: simplify
2015-04-29 12:56:21 +08:00
e5f7fcc339
coredevice/comm_tcp: raise exception on connection closed
2015-04-29 11:18:51 +08:00
283695e8aa
language/core: integrate watchdogs
2015-04-28 23:23:59 +08:00
9b62e7e77b
runtime,coredevice: support session reset for serial
2015-04-28 02:11:58 +08:00
27d94a22de
rtio: expose full_ts_width instead of counter_width parameter
2015-04-28 01:38:11 +08:00
dc14728264
test/full_stack: use Ethernet
2015-04-28 01:33:37 +08:00
8a19766278
runtime,comm_generic: improve and fix list encoding
2015-04-28 01:31:55 +08:00
86c012924e
targets: rename AMP->Top, merge peripherals
2015-04-28 00:18:54 +08:00
938e1c2842
Remove UP support.
...
The only advantage of UP is to support the Papilio Pro, but that port is also very limited in other ways and the Pipistrello provides a more reasonable platform that also supports AMP.
On the other hand, RPCs on UP are difficult to implement with the session.c protocol system (without an operating system or coroutines), along with many other minor difficulties and maintainance issues. Planned features such as watchdogs in the core device are also difficult on UP.
2015-04-27 20:43:45 +08:00
934a6b0495
runtime,coredevice: Ethernet support (buggy)
2015-04-23 23:22:40 +08:00
e4251c7f41
runtime: get lwip to run
2015-04-22 15:01:32 +08:00
18106cc014
comm: refactor to support lwip event model
2015-04-22 01:31:31 +08:00
9f52277245
coredevice/core: set default for ref_period
2015-04-22 01:12:01 +08:00
17f61b8e29
pxi6733: minor fixes
2015-04-21 16:23:09 +08:00
e27844e0f7
test/pxi6733: remove useless checks
2015-04-21 16:10:46 +08:00
Yann Sionneau
69388ccc1a
pxi6733: add driver and controller
2015-04-21 16:09:55 +08:00
Yann Sionneau
e19f8896f0
artiq_rpctool: document numpy availability in RPC call cmd line arguments
2015-04-21 15:57:29 +08:00
301a0e6447
rpctool: import numpy
2015-04-21 15:57:25 +08:00
0c1d256fef
comm_dummy: remove unneeded import
2015-04-19 11:41:20 +08:00
c98e08fe36
fix transforms unittest
2015-04-19 11:40:49 +08:00
0b8d496b62
coefficients: cleanup and refactor some code into CoefficientSource
2015-04-18 21:21:23 -06:00
60baed68b4
wavesynth: get coefficients.py into useable state
...
SplineSource() supports spline interpolating multi-channel tabular data,
cropping it and generating wavesynth compatible segment data from it.
ComposingSplineSource() needs some verification still.
2015-04-18 01:23:15 -06:00
Yann Sionneau
52fe66ee4d
artiq_flash.sh: improve detection of flash proxy location
...
Flash proxy is now searched in ~/.migen /usr/local/share/migen
/usr/share/migen and in the directory specified by "-d" argument
or in artiq/binaries/<board_name>/ if "-d" is not specified.
2015-04-17 00:57:16 +08:00
546996f896
coredevice,runtime: put ref_period into the ddb
2015-04-16 15:15:38 +08:00
71167b8adf
rtio: do not attempt latency compensation in gateware
2015-04-16 13:09:29 +08:00
