Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7e9978089153
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 59ac56704891
Choose a head ref
  • 13 commits
  • 5 files changed
  • 1 contributor

Commits on Mar 8, 2016

  1. pipistrello: adhere to pmod interface type 2 layout

    @jordens
    jordens committed Mar 8, 2016
    Copy the full SHA
    e809e89 View commit details

  2. pipistrello: make pmod[4:8] available as ttls

    @jordens
    jordens committed Mar 8, 2016
    Copy the full SHA
    2180c5a View commit details

  3. doc: add pipistrello pmod ttl channels

    @jordens
    jordens committed Mar 8, 2016
    Copy the full SHA
    e23e91f View commit details

  4. doc: add pipistrello spi bus

    @jordens
    jordens committed Mar 8, 2016
    Copy the full SHA
    9898cb1 View commit details

  5. doc: kc705.clock: add spi bus mappings (closes #321)

    @jordens
    jordens committed Mar 8, 2016
    Copy the full SHA
    40c1cde View commit details

  6. pipistrello: move the spi channel like kc705

    @jordens
    jordens committed Mar 8, 2016
    Copy the full SHA
    104d641 View commit details

  7. pipistrello: use ttl_simple for pmod[4:8]

    @jordens
    jordens committed Mar 8, 2016
    Copy the full SHA
    9c11cda View commit details

  8. pipistrello: shrink fifos a bit (may make ise happier)

    @jordens
    jordens committed Mar 8, 2016
    Copy the full SHA
    00d4775 View commit details

  9. gui: ignore only unmodified wheelevents

    @jordens
    jordens committed Mar 8, 2016
    Copy the full SHA
    41ca223 View commit details

  10. gui: don't scroll experiment editor on modified wheel (closes #303) 

    If you try to target e.g. spinbox with a ctrl- or shift-wheel to change the value
and you don't aim well, the tree widget will scroll. We already have tree
scroll on unmodified wheel. Let's have the modified wheel events exclusively
target the smaller widgets.
    @jordens
    jordens committed Mar 8, 2016
    Copy the full SHA
    c08881d View commit details

  11. pipistrello: grow fifos a bit (may make ise happier)

    @jordens
    jordens committed Mar 8, 2016
    Copy the full SHA
    a8fe3f5 View commit details

  12. Merge branch 'master' into scanwidget 

    * master:
  pipistrello: grow fifos a bit (may make ise happier)
  gui: don't scroll experiment editor on modified wheel (closes #303)
  gui: ignore only unmodified wheelevents
  pipistrello: shrink fifos a bit (may make ise happier)
  pipistrello: use ttl_simple for pmod[4:8]
  pipistrello: move the spi channel like kc705
  doc: kc705.clock: add spi bus mappings (closes #321)
  doc: add pipistrello spi bus
  doc: add pipistrello pmod ttl channels
  pipistrello: make pmod[4:8] available as ttls
  pipistrello: adhere to pmod interface type 2 layout
    @jordens
    jordens committed Mar 8, 2016
    Copy the full SHA
    285979c View commit details

  13. scanwidget: disable unmodified wheel on axis and slider

    @jordens
    jordens committed Mar 8, 2016
    Copy the full SHA
    59ac567 View commit details
Loading