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: 5b607de69c3e
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: c8fba45db554
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 19, 2015

  1. gui: more digits in DDS monitor

    @sbourdeauducq
    sbourdeauducq committed Jun 19, 2015
    Copy the full SHA
    827f99e View commit details

Commits on Jun 20, 2015

  1. Merge branch 'master' of https://github.com/m-labs/artiq

    @sbourdeauducq
    sbourdeauducq committed Jun 20, 2015
    Copy the full SHA
    c8fba45 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 artiq/gui/moninj.py
2 changes: 1 addition & 1 deletion artiq/gui/moninj.py
View file
Original file line number Diff line number Diff line change
@@ -138,7 +138,7 @@ def __init__(self, send_to_device, channel, sysclk, name):

def set_value(self, ftw):
frequency = ftw*self.sysclk/2**32
self._value.setText("<font size=\"9\">{:.3f} MHz</font>"
self._value.setText("<font size=\"6\">{:.7f} MHz</font>"
.format(float(frequency)/1e6))