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
6215d63491
rtio: do not create spurious CSRs when data_width/address_width is 0
2015-04-16 13:04:19 +08:00
26003781b4
rtio/rtlink: add 'like' methods to clone interfaces
2015-04-16 13:02:39 +08:00
30dffb6644
rtio/phy: add wishbone adapter
2015-04-15 20:39:40 +08:00
ecf6b29279
coredevice/rtio: minor docstring cleanup
2015-04-15 13:53:00 +08:00
c0213c9f69
artiq_flash.sh: add pipistrello
2015-04-14 22:37:08 -06:00
9795e83bfc
pdq2: continue work on coefficients
2015-04-14 18:18:49 -06:00
6a0e97f161
pdq2: refactor program_frame(), cleanup test, stall correctly
...
Once the Sequencer ack's a line, the Parser starts preparing the
next one. This includes jumping through the frame table if necessary.
To stall the Parser while the Sequencer executes the last line of a
frame and to ensure that the frame select lines can be set up and their
sampling is synchronized to a trigger, we add a triggered stall line
at the end of the frame.
When that line is triggered the Parser jumps through the table and starts
parsing the first line of the next frame. We let the duration of this
last stall line be 10 cycles (200ns@50MHz) to be able to distinguish this
sampling of the frame select lines from the triggering of the first line
in the next frame.
frame f
parser n f 0
stb __---________---___
trigger ___----_______----_
ack ____-__________-___
sequencer n-1 n 0
2015-04-14 18:18:16 -06:00
bc1acef355
test/pdq2: don't write vcd
2015-04-14 18:18:16 -06:00
4c10182c9f
rtio: refactor, use rtlink
2015-04-14 19:44:45 +08:00
ff9a7727d2
rtio: add rtlink definition (currently unused)
2015-04-13 22:19:18 +08:00
07b8e1292f
artiq_flash: fix stderr redirections
2015-04-11 23:43:33 +08:00
8a2b8fc634
artiq_flash: do not always assume permission problems
2015-04-11 22:54:17 +08:00
Yann Sionneau
8a3be4eca0
artiq_flash: add support for kc705
2015-04-11 22:38:11 +08:00
88e0aae16d
coredevice: add comm_tcp
2015-04-10 01:22:03 +08:00
f427041ae9
coredevice/comm_serial: minor cleanup
2015-04-10 01:21:47 +08:00
cb2596bd81
coredevice/comm: split protocol to allow reuse for Ethernet
2015-04-10 00:59:35 +08:00
efd1c24ed7
frontend: add artiq_compile tool to build default experiment
2015-04-07 15:41:32 +08:00
ca89b6d0ed
worker_db: support read-only mode
2015-04-07 15:40:57 +08:00
fda4ee1a83
coredevice: add compile method
2015-04-07 15:40:25 +08:00
5e046dc5ce
artiq_run: move parse_arguments and get_experiment to tools
2015-04-07 13:04:47 +08:00
7e591bb1c7
targets: use _Peripherals/UP/AMP class names, share QC1 IO defs
2015-04-07 00:07:53 +08:00
1ed60e0829
gateware/amp: use new ModuleTransformer API
2015-04-06 23:54:53 +08:00
72f9f7ed79
runtime: implement mailbox, use it for kernel startup, exceptions and termination
2015-04-05 22:07:34 +08:00
7ea9250b31
wavesynth: interpolate->coefficients
2015-04-05 04:43:27 -06:00
0bab73eece
wavesynth/compute_samples: fix list mutation bug
2015-04-05 18:41:06 +08:00
9fd4594c53
interpolate: refactor discrete_compensate
2015-04-05 04:32:23 -06:00
75dfa95b4d
wavesynth: move test code to unittests, fix mutability style
2015-04-05 04:24:44 -06:00
3257275782
worker_db: get_logger -> getLogger
2015-04-05 18:02:07 +08:00
1d5f467da7
pdq2: implement changes in trigger/jump semantics, add unittest
...
The unittests now runs the compute_samples.Synthesizer against the actual
gateware and verifies similarity (up to integer rounding errors).
2015-04-05 03:55:54 -06:00
e870b27830
wavesynth: new semantics, fix compensation
...
* "trigger" now means that the corresponding line will only start
once the trigger line is high.
* "jump" is implicit as the last line in a frame must jump back.
* spline coefficients are now compensated for finite time step size
2015-04-05 03:55:54 -06:00
1f545346e3
wavesynth: implement silence, add defaults, fix bias
2015-04-05 03:55:54 -06:00
051b01f58e
wavesynth: refactor testing code
2015-04-05 03:55:54 -06:00
71b7fe38bc
worker_impl: add missing import
2015-04-05 17:50:48 +08:00
9b46bc623a
dbhub: do not use as context manager, turn close exceptions into warnings, do not close devices early in worker
2015-04-05 17:49:41 +08:00
0ec7e9a98c
artiq_run: fix get_argparser()
2015-04-04 21:17:24 -06:00
1a1afd5410
artiq_run: refactor, support use from within experiments
...
You can always (under posix) use #!/usr/bin/env artiq_run as
shebang for experiments and make them executable.
Now, you can also do this (portable):
if __name__ == "__main__":
from artiq.frontend.artiq_run import run
run()
to make an experiment executable. The CLI options are all inherited.
Also:
* removed --elf: can be inferred from filename
* did some refactoring and cleanup
* use logging for all messages, except the result printing (use -v to get
parameter changes and dummy scheduler actions)
2015-04-04 20:51:48 -06:00
43893c6c1d
worker_impl: use DBHub as context manager
2015-04-04 20:51:48 -06:00
7b86138fd2
DBHub: make it a context manager
2015-04-04 20:51:48 -06:00
d1653589f9
pdq2: spelling fix
2015-04-04 14:26:32 -06:00
16ff190731
pdq2: cleanup unittest
2015-04-04 14:26:32 -06:00
833178462d
remove gpio driver
2015-04-04 22:06:54 +08:00
c6d3750076
runtime,amp: set kernel memory start to SDRAM+128K, use custom linker file to split memory
2015-04-03 16:03:38 +08:00
fb91955260
tests: make hardware-in-the loop flags positive logic
...
Explicitly having to disable unittests that require hardware
(ARTIQ_NO_HARDWARE) is cumbersome.
There is not even a sensible default for the
device or serial number of the devices requiring additional
variables (ARTIQ_LDA_DEVICE etc).
This patch reverts the logic by skipping unittests that
can not automatically determine whether the required hardware
is present and where it is.
2015-04-03 11:51:03 +08:00
Florent Kermarrec
2995f0a705
remove use of _r prefix on CSRs
2015-04-02 18:30:44 +08:00
5bd8d414cf
gateware/amp: add kernel CPU and mailbox modules
2015-04-02 16:49:36 +08:00
Yann Sionneau
e7be00baa8
Add support for automatic build and upload of dev conda artiq packages to binstar by travis-ci
...
- SoC+BIOS are also built and integrated in the conda package
- artiq_flash.sh script is embedded to allow flashing ppro board
2015-03-30 19:51:52 +08:00
3108ffeef6
coredevice/comm_serial: use lazy formatting in logging
2015-03-27 18:54:19 +01:00
f4cb97b709
comm_serial: fix baud rate change logging
2015-03-25 17:57:53 -06:00
bd2f6ea9f9
thorlabs_tcube_controller: use simple_network_args
2015-03-25 16:20:08 +01:00
Yann Sionneau
5ca5a3602e
novatech409b: cleanup
2015-03-25 16:11:11 +01:00
03139808bd
[WIP] wavesynth/interpolate: wavesynth programming tools
...
* interpolate(t, v) will generate the channel data subset of a wavesynth
program
* still broken
2015-03-23 20:38:33 -06:00
