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: dd349b0701cc
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: 71921de5bde6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 3, 2016

  1. browser: stub copy repo rev

    @jordens
    jordens committed Jul 3, 2016
    Copy the full SHA
    4a6c270 View commit details

Commits on Jul 4, 2016

  1. spi: do not shift when starting a xfer, closes #495

    @jordens
    jordens committed Jul 4, 2016
    Copy the full SHA
    71921de View commit details
Showing with 12 additions and 1 deletion.
  1. +11 −0 artiq/browser/files.py
  2. +1 −1 artiq/gateware/spi.py
11 changes: 11 additions & 0 deletions artiq/browser/files.py
View file
Original file line number Diff line number Diff line change
@@ -160,6 +160,14 @@ def __init__(self, datasets, browse_root="", select=None):
self.rl.activated.connect(self.list_activated)
self.splitter.addWidget(self.rl)

self.rl.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
rev_copy = QtWidgets.QAction("Copy repo_rev (SHIFT-CTRL-C)",
self.rl)
rev_copy.triggered.connect(self._copy_repo_rev)
rev_copy.setShortcut("SHIFT-CTRL-C")
rev_copy.setShortcutContext(QtCore.Qt.WidgetShortcut)
self.rl.addAction(rev_copy)

self.restore_selected = select is None
if select is not None:
f = os.path.abspath(select)
@@ -168,6 +176,9 @@ def __init__(self, datasets, browse_root="", select=None):
else:
self.select_file(f)

def _copy_repo_rev(self):
pass

def tree_current_changed(self, current, previous):
idx = self.rt.model().mapToSource(current)
self.rl.setRootIndex(idx)
2 changes: 1 addition & 1 deletion artiq/gateware/spi.py
View file
Original file line number Diff line number Diff line change
@@ -125,7 +125,7 @@ def __init__(self, data_width, clock_width, bits_width):
NextState("WAIT"),
)
).Else(
self.reg.shift.eq(1),
self.reg.shift.eq(~self.start),
NextState("SETUP"),
)
)