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: 18eddd00e148
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: ea13d00087c6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 1, 2016

  1. fix indentation

    @sbourdeauducq
    sbourdeauducq committed Jul 1, 2016
    Copy the full SHA
    2d1a47c View commit details

  2. dashboard: preserve argeditor state across argument recomputations. C… 

    …loses #486
    @sbourdeauducq
    sbourdeauducq committed Jul 1, 2016
    Copy the full SHA
    ea13d00 View commit details
Showing with 4 additions and 1 deletion.
  1. +3 −0 artiq/dashboard/experiments.py
  2. +1 −1 artiq/examples/master/repository/coredevice_examples/simple/blink_forever.py
3 changes: 3 additions & 0 deletions artiq/dashboard/experiments.py
View file
Original file line number Diff line number Diff line change
@@ -376,8 +376,11 @@ async def _recompute_arguments_task(self, overrides=dict()):
arginfo[k][0]["default"] = v
self.manager.initialize_submission_arguments(self.expurl, arginfo)

argeditor_state = self.argeditor.save_state()
self.argeditor.deleteLater()

self.argeditor = _ArgumentEditor(self.manager, self, self.expurl)
self.argeditor.restore_state(argeditor_state)
self.layout.addWidget(self.argeditor, 0, 0, 1, 5)

def _load_hdf5_clicked(self):
2 changes: 1 addition & 1 deletion artiq/examples/master/repository/coredevice_examples/simple/blink_forever.py
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ def build(self):

@kernel
def run(self):
self.core.reset()
self.core.reset()
while True:
self.led.pulse(100*ms)
delay(100*ms)