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: 05317a925947
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: d2d43b53e155
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 31, 2016

  1. test/PulseRateDDS: run more iterations

    @sbourdeauducq
    sbourdeauducq committed Mar 31, 2016
    Copy the full SHA
    0173031 View commit details

  2. RELEASE_NOTES: 1.0rc2

    @sbourdeauducq
    sbourdeauducq committed Mar 31, 2016
    Copy the full SHA
    d2d43b5 View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 RELEASE_NOTES.rst
  2. +1 −1 artiq/test/coredevice/test_rtio.py
4 changes: 2 additions & 2 deletions RELEASE_NOTES.rst
View file
Original file line number Diff line number Diff line change
@@ -17,8 +17,8 @@ unreleased [2.x]
print(p)


unreleased
----------
1.0rc2
------

* The CPU speed in the pipistrello gateware has been reduced from 83 1/3 MHz to
75 MHz. This will reduce the achievable sustained pulse rate and latency
2 changes: 1 addition & 1 deletion artiq/test/coredevice/test_rtio.py
View file
Original file line number Diff line number Diff line change
@@ -116,7 +116,7 @@ def run(self):
dt = seconds_to_mu(150*us)
while True:
delay(10*ms)
for i in range(100):
for i in range(1250):
try:
with self.core_dds.batch:
self.dds0.set(100*MHz)