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: 641831e0e108
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: 4d22db1affdc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 19, 2016

  1. test/coredevice/cache: fix exception import

    @sbourdeauducq
    sbourdeauducq committed Mar 19, 2016
    Copy the full SHA
    ff697a4 View commit details

  2. coredevice/exceptions/ClockFailure: improve description

    @sbourdeauducq
    sbourdeauducq committed Mar 19, 2016
    Copy the full SHA
    4d22db1 View commit details
Showing with 2 additions and 1 deletion.
  1. +1 −1 artiq/coredevice/exceptions.py
  2. +1 −0 artiq/test/coredevice/test_cache.py
2 changes: 1 addition & 1 deletion artiq/coredevice/exceptions.py
View file
Original file line number Diff line number Diff line change
@@ -135,4 +135,4 @@ class WatchdogExpired(Exception):
"""Raised when a watchdog expires."""

class ClockFailure(Exception):
"""Raised when RTIO PLL is unable to lock."""
"""Raised when RTIO PLL has lost lock."""
1 change: 1 addition & 0 deletions artiq/test/coredevice/test_cache.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from artiq.experiment import *
from artiq.coredevice.exceptions import CacheError
from artiq.test.hardware_testbench import ExperimentCase