Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config_template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ devices:
nplc: 1 # nplc of all DC measurements, reduce this for higher sampling rates!
lsync: True # line sync for all channels
ocom: True # offset compensation for all channels
azer: False # automatic zeroing for all channels
azer: False # automatic zeroing for all channels (True: ON, False: OFF, Once: ONCE)
adel: True # automatic delay for all channels
internal-cold-junction: False # if False: use 0.0°C
channels:
Expand Down
23 changes: 19 additions & 4 deletions multilog/devices/daq6510.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ def __init__(self, config, name="Daq6510"):
ocom = "OFF"
if config["settings"]["azer"]:
azer = "ON"
elif config["settings"]["azer"]=="Once":
azer = "ONCE"
else:
azer = "OFF"
if config["settings"]["adel"]:
Expand Down Expand Up @@ -151,7 +153,10 @@ def __init__(self, config, name="Daq6510"):
cmds.append(f"TEMP:AVER OFF, {self.ch_str_tc}\n")
cmds.append(f"TEMP:LINE:SYNC {lsync}, {self.ch_str_tc}\n")
cmds.append(f"TEMP:OCOM {ocom}, {self.ch_str_tc}\n")
cmds.append(f"TEMP:AZER {azer}, {self.ch_str_tc}\n")
if azer=="ONCE":
cmds.append(f"AZER:ONCE\n")
else:
cmds.append(f"TEMP:AZER {azer}, {self.ch_str_tc}\n")
cmds.append(f"TEMP:DEL:AUTO {adel}, {self.ch_str_tc}\n")
for channel in self.ch_list_tc:
cmds.append(f'TEMP:NPLC {config["settings"]["nplc"]}, (@{channel})\n')
Expand All @@ -161,7 +166,10 @@ def __init__(self, config, name="Daq6510"):
cmds.append(f"TEMP:RTD:FOUR PT100, {self.ch_str_pt_100}\n")
cmds.append(f"TEMP:LINE:SYNC {lsync}, {self.ch_str_pt_100}\n")
cmds.append(f"TEMP:OCOM {ocom}, {self.ch_str_pt_100}\n")
cmds.append(f"TEMP:AZER {azer}, {self.ch_str_pt_100}\n")
if azer=="ONCE":
cmds.append(f"AZER:ONCE\n")
else:
cmds.append(f"TEMP:AZER {azer}, {self.ch_str_pt_100}\n")
cmds.append(f"TEMP:DEL:AUTO {adel}, {self.ch_str_pt_100}\n")
cmds.append(f"TEMP:AVER OFF, {self.ch_str_pt_100}\n")
for channel in self.ch_list_pt100:
Expand All @@ -176,15 +184,22 @@ def __init__(self, config, name="Daq6510"):
cmds.append(f"TEMP:RTD:ZERO 1000, {self.ch_str_pt_1000}\n")
cmds.append(f"TEMP:LINE:SYNC {lsync}, {self.ch_str_pt_1000}\n")
cmds.append(f"TEMP:OCOM {ocom}, {self.ch_str_pt_1000}\n")
cmds.append(f"TEMP:AZER {azer}, {self.ch_str_pt_1000}\n")
if azer=="ONCE":
cmds.append(f"AZER:ONCE\n")
else:
cmds.append(f"TEMP:AZER {azer}, {self.ch_str_pt_1000}\n")
cmds.append(f"TEMP:DEL:AUTO {adel}, {self.ch_str_pt_1000}\n")
cmds.append(f"TEMP:AVER OFF, {self.ch_str_pt_1000}\n")
for channel in self.ch_list_pt1000:
cmds.append(f'TEMP:NPLC {config["settings"]["nplc"]}, (@{channel})\n')
if self.nb_dcv > 0:
cmds.append(f'FUNC "VOLT:DC", {self.ch_str_dcv}\n')
cmds.append(f"VOLT:LINE:SYNC {lsync}, {self.ch_str_dcv}\n")
cmds.append(f"VOLT:AZER {azer}, {self.ch_str_dcv}\n")
# cmds.append(f"VOLT:AZER OFF, {self.ch_str_dcv}\n")
if azer=="ONCE":
cmds.append(f"AZER:ONCE\n")
else:
cmds.append(f"VOLT:AZER {azer}, {self.ch_str_dcv}\n")
cmds.append(f"VOLT:DEL:AUTO {adel}, {self.ch_str_dcv}\n")
cmds.append(f"VOLT:AVER OFF, {self.ch_str_dcv}\n")
for channel in self.ch_list_dcv:
Expand Down