mirror of
https://github.com/m-labs/artiq.git
synced 2024-12-22 09:54:00 +08:00
devices/novatech409b: remove unwanted calls to set_simultaneous_update
This commit is contained in:
parent
b5cc680fdb
commit
36c3f022aa
@ -143,14 +143,11 @@ class Novatech409B:
|
|||||||
|
|
||||||
def set_freq(self, ch_no, freq):
|
def set_freq(self, ch_no, freq):
|
||||||
"""Set frequency of one channel."""
|
"""Set frequency of one channel."""
|
||||||
self.set_simultaneous_update(False)
|
|
||||||
# Novatech expects MHz
|
# Novatech expects MHz
|
||||||
self._ser_send("F{:d} {:f}".format(ch_no, freq/1e6))
|
self._ser_send("F{:d} {:f}".format(ch_no, freq/1e6))
|
||||||
|
|
||||||
def set_phase(self, ch_no, phase):
|
def set_phase(self, ch_no, phase):
|
||||||
"""Set phase of one channel."""
|
"""Set phase of one channel."""
|
||||||
# do this immediately, disable SimultaneousUpdate mode
|
|
||||||
self.set_simultaneous_update(False)
|
|
||||||
# phase word is required by device
|
# phase word is required by device
|
||||||
# N is an integer from 0 to 16383. Phase is set to
|
# N is an integer from 0 to 16383. Phase is set to
|
||||||
# N*360/16384 deg; in ARTIQ represent phase in cycles [0, 1]
|
# N*360/16384 deg; in ARTIQ represent phase in cycles [0, 1]
|
||||||
@ -168,7 +165,6 @@ class Novatech409B:
|
|||||||
s = "Amplitude out of range {v}".format(v=volts)
|
s = "Amplitude out of range {v}".format(v=volts)
|
||||||
raise ValueError(s)
|
raise ValueError(s)
|
||||||
|
|
||||||
self.set_simultaneous_update(False)
|
|
||||||
s = "V{:d} {:d}".format(ch_no, dac_value)
|
s = "V{:d} {:d}".format(ch_no, dac_value)
|
||||||
self._ser_send(s)
|
self._ser_send(s)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user