M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity
3,133 Commits 13 Branches 35 Tags 25 MiB
Commit Graph

3133 Commits

Author SHA1 Message Date
Robert Jördens f2ec8692c0 nist_clock: disable spi1/2 2016-03-01 01:52:46 +01:00
Robert Jördens 7d7a710a56 runtime/rt2wb: use input/output terminology and add (async) input 2016-03-01 00:35:56 +01:00
Robert Jördens 764795a8fe examples: update device_db for nist_clock spi 2016-02-29 22:32:53 +01:00
Robert Jördens da22ec73df gateware.spi: rework wb bus sequence 2016-02-29 22:22:08 +01:00
Robert Jördens 12252abc8f nist_clock: rename spi*.ce to spi*.cs_n 2016-02-29 22:21:18 +01:00
Robert Jördens 7ef21f03b9 nist_clock: add SPIMasters to spi buses 2016-02-29 22:19:39 +01:00
Robert Jördens 8fa98f6486 doc: use term 'gateware' 
FPGA newcomers are not used to the term 'bitstream'. To insist that this file
is the result of the gateware compilation and thus the binary FPGA format,
add the term 'gateware' as a prefix.
 2016-02-29 20:50:45 +01:00
Robert Jördens 7ab7f7d75d Merge branch 'master' into spimaster 
* master:
  artiq_flash: use term 'gateware'
  targets/kc705-nist_clock: add clock generator on LA32 for testing purposes
  doc: insist that output() must be called on TTLInOut. Closes #297
  doc: update install instructions
  coredevice: do not give up on UTF-8 errors in log. Closes #300
  use m-labs setup for defaults
  fix indentation
 2016-02-29 20:47:52 +01:00
Robert Jördens 6dd1eb2e92 artiq_flash: use term 'gateware' 2016-02-29 20:45:41 +01:00
Robert Jördens 6c899e6ba6 runtime/rtio: fix rtio_input_wait(), add RTIOTimeout 2016-02-29 19:49:15 +01:00
Robert Jördens 16537d347e coredevice.spi: cleanup 2016-02-29 19:48:26 +01:00
Robert Jördens ecedbbef4c runtime/ttl: use rtio_output and rtio_input_wait 2016-02-29 19:20:07 +01:00
Robert Jördens 5dae9f8aa8 runtime: refactor rt2wb/dds 2016-02-29 19:16:29 +01:00
Robert Jördens d3c94827eb runtime/ttl: simplify ttl_get() a bit 2016-02-29 17:58:54 +01:00
Robert Jördens e11366869d coredevice/spi: clean up api 2016-02-29 17:54:42 +01:00
Sebastien Bourdeauducq 5fad570f5e targets/kc705-nist_clock: add clock generator on LA32 for testing purposes 2016-03-01 00:35:26 +08:00
Robert Jördens dd570720ac gateware.spi: ack only in cycles 2016-02-29 17:29:37 +01:00
Sebastien Bourdeauducq a1e1f2b387 doc: insist that output() must be called on TTLInOut. Closes #297 2016-03-01 00:28:40 +08:00
Sebastien Bourdeauducq d0d56bd3fe doc: update install instructions 2016-03-01 00:19:55 +08:00
Robert Jördens a0083f4501 Revert "gateware/rt2wb: only input when active" 
This reverts commit 1b08e65fa1.
 2016-02-29 16:44:11 +01:00
Robert Jördens cb8815cc65 Revert "gateware/rt2wb: support combinatorial ack" 
This reverts commit f73228f248.
 2016-02-29 16:44:04 +01:00
Robert Jördens f73228f248 gateware/rt2wb: support combinatorial ack 2016-02-29 15:40:55 +01:00
Sebastien Bourdeauducq 4467f91cbf coredevice: do not give up on UTF-8 errors in log. Closes #300 2016-02-29 22:21:10 +08:00
Robert Jördens 1b08e65fa1 gateware/rt2wb: only input when active 2016-02-29 14:56:29 +01:00
Robert Jördens 6903a1d88a runtime/rt2wb: accurate exception strings 2016-02-29 14:56:04 +01:00
Robert Jördens c226aeb0d4 coredevice/spi: read_sync read bit 2016-02-29 14:55:29 +01:00
Sebastien Bourdeauducq 572c49f475 use m-labs setup for defaults 2016-02-29 21:35:23 +08:00
Sebastien Bourdeauducq 785691ab98 fix indentation 2016-02-29 21:32:48 +08:00
Robert Jördens df7d15d1fe runtime: refactor spi into rt2wb 2016-02-29 13:54:36 +01:00
Robert Jördens eb01b0bfee gateware.spi: cleanup doc 2016-02-29 12:41:30 +01:00
Robert Jördens aeae565d35 runtime/spi: don't apply channel offset 2016-02-29 11:53:36 +01:00
Robert Jördens 948fefa69a gateware.spi: style 2016-02-29 11:48:29 +01:00
Robert Jördens ad34927b0a spi: RTIO_SPI_CHANNEL -> RTIO_FIRST_SPI_CHANNEL 2016-02-29 11:35:49 +01:00
Robert Jördens 5480099f1b gateware.spi: rewrite counter bias for timing 2016-02-29 02:28:19 +01:00
Robert Jördens 9a1d6a51a4 gateware.spi: shorten counters 2016-02-29 01:51:33 +01:00
Robert Jördens a4504905bd Merge remote-tracking branch 'm-labs/master' into spimaster 
* m-labs/master:
  Fix tests.
  types.TypePrinter: don't waste screen space on empty attribute lists.
  Revert wrong parts of 6bd16e44.
  examples/notebook: cleanup, and fix spelling
  test/LoopbackCount: request correct devices
 2016-02-29 00:49:13 +01:00
Robert Jördens 8b2b278457 spi: add coredevice support 2016-02-29 00:44:48 +01:00
Robert Jördens d63a63531a spi: add runtime support 2016-02-29 00:38:36 +01:00
Robert Jördens 8d7e92ebae pipistrello: set RTIO_SPI_CHANNEL 2016-02-29 00:37:00 +01:00
Robert Jördens 9a881aa430 gateware.spi: simpler clk bias 2016-02-29 00:36:18 +01:00
Robert Jördens d5893d15fb gateware.kc705: make xadc/ams an extension header 2016-02-28 22:41:17 +01:00
Robert Jördens 312e09150e kc705/clock: add spi bus for dac on ams101 2016-02-28 21:17:53 +01:00
Robert Jördens f8732acece rtio.spi: drop unused argument 2016-02-28 21:06:20 +01:00
Robert Jördens 3b6999ac06 gateware.spi: refactor, sim verified 2016-02-28 20:40:06 +01:00
Robert Jördens bd9ceb4e12 gateware.spi: add complete spi master logic 2016-02-27 22:47:16 +01:00
whitequark 8bbffab8c8 Fix tests. 2016-02-27 13:40:37 +00:00
whitequark e421b22953 types.TypePrinter: don't waste screen space on empty attribute lists. 2016-02-27 13:29:47 +00:00
whitequark 63e0c7c07c Revert wrong parts of 6bd16e44. 2016-02-27 13:15:49 +00:00
Robert Jördens ade3eda19a gateware.pipistrello: use pmod for spi 2016-02-27 11:29:40 +01:00
Robert Jördens e7146cc999 gateware.spi: design sketch 2016-02-26 17:03:08 +01:00