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: f7d83e9bdf03
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: dbbd11d7982a
Choose a head ref
  • 3 commits
  • 12 files changed
  • 1 contributor

Commits on Apr 29, 2016

  1. targets/kc705: fix default -H option

    @sbourdeauducq
    sbourdeauducq committed Apr 29, 2016
    Copy the full SHA
    9707981 View commit details

  2. update logo

    @sbourdeauducq
    sbourdeauducq committed Apr 29, 2016
    Copy the full SHA
    fc4effb View commit details

  3. lwip: set MTU to 9000 to support jumbo frames

    @sbourdeauducq
    sbourdeauducq committed Apr 29, 2016
    Copy the full SHA
    dbbd11d View commit details
2 changes: 1 addition & 1 deletion artiq/frontend/artiq_browser.py
View file
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ def restore_state(self, state):
class MdiArea(QtWidgets.QMdiArea):
def __init__(self):
QtWidgets.QMdiArea.__init__(self)
self.pixmap = QtGui.QPixmap(os.path.join(artiq_dir, "gui", "logo.svg"))
self.pixmap = QtGui.QPixmap(os.path.join(artiq_dir, "gui", "logo20.svg"))

def paintEvent(self, event):
QtWidgets.QMdiArea.paintEvent(self, event)
2 changes: 1 addition & 1 deletion artiq/frontend/artiq_dashboard.py
View file
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ def restore_state(self, state):
class MdiArea(QtWidgets.QMdiArea):
def __init__(self):
QtWidgets.QMdiArea.__init__(self)
self.pixmap = QtGui.QPixmap(os.path.join(artiq_dir, "gui", "logo.svg"))
self.pixmap = QtGui.QPixmap(os.path.join(artiq_dir, "gui", "logo20.svg"))

def paintEvent(self, event):
QtWidgets.QMdiArea.paintEvent(self, event)
2 changes: 1 addition & 1 deletion artiq/gateware/targets/kc705.py
View file
Original file line number Diff line number Diff line change
@@ -387,7 +387,7 @@ def main():
"+ NIST Ions QC1/CLOCK/QC2 hardware adapters")
builder_args(parser)
soc_kc705_args(parser)
parser.add_argument("-H", "--hw-adapter", default="clock",
parser.add_argument("-H", "--hw-adapter", default="nist_clock",
help="hardware adapter type: "
"nist_qc1/nist_clock/nist_qc2 "
"(default: %(default)s)")
Loading