Commit 40ff5452 authored by Holger Brand's avatar Holger Brand
Browse files

myDAQ works on UHVPXI003, too.

parent 3773b67a
Subproject commit 1ec5ff69a47488abc42087075291742bf5ab9064
Subproject commit 4509e74c70afd038346cd26f8c56061b51269246
......@@ -39,7 +39,7 @@ LVClassPath="CSPP_SVMonitor.lvlib:CSPP_SVMonitor.lvclass"
LVClassPath="CSPP_DSCMonitor.lvlib:CSPP_DSCMonitor.lvclass"
[UHVHCRT]
UHVHC_Main="UHVHC-dveert04"
UHVHC_Main="UHVHC-uhvpxi003"
[UHVHC]
LVClassPath="UHVHC_Main.lvlib:UHVHC_Main.lvclass"
......@@ -109,10 +109,43 @@ Polling_Interval_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-PollingInterva
Polling_Iterations_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-PollingIterations?.1"
Polling_Start_Stop_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-PollingStartStop?-1"
[UHVHC-uhvpxi003]
LVClassPath="UHVHC_Main.lvlib:UHVHC_Main.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_GUIActor.lvlib:CSPP_GUIActor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="UHVHCProxy-uhvpxi003"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
UHVHC_Main:UHVHC_Main.DAQActor="myDAQ"
[UHVHC-uhvpxi003.URLs]
PollingCounter="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_PollingCounter?.1"
PollingDeltaT="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_PollingDeltaT?.1"
PollingInterval="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_PollingInterval?.1"
PollingIterations="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_PollingIterations?.1"
PollingMode="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_PollingMode?.1"
PollingTime="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_PollingTime?.1"
[UHVHCProxy-uhvpxi003]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_GUIActor.lvlib:CSPP_GUIActor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=-1
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="UHVHC-uhvpxi003"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
[UHVHCProxy-uhvpxi003.URLs]
Activate="ni.var.psp://localhost/UHVHC-RTSV/UHVHCProxy_Activate"
WorkerActor="ni.var.psp://localhost/UHVHC-RTSV/UHVHCProxy_WorkerActor"
Polling_Interval_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-PollingInterval?-1"
Polling_Iterations_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-PollingIterations?.1"
Polling_Start_Stop_Msg="ni.var.psp://localhost/UHVHC-RTSV/UHVHC_Set-PollingStartStop?-1"
[myDAQ]
LVClassPath="BNT_DAQmx.lvlib:BNT_DAQmx-MCSV.lvclass"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="/Dev1"
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="/PXI1Slot2"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=True
CSPP_DeviceActors:CSPP_DeviceActor.OptionString=""
......@@ -129,7 +162,6 @@ BNT_DAQmx:BNT_DAQmx-MCSV.AI-Range_Min=-10
BNT_DAQmx:BNT_DAQmx-MCSV.AI-TerminalConfiguration=-1
# Default=-1; RSE=10083; NRSE=10078; Differential=10106;Pseudodifferential=12529
BNT_DAQmx:BNT_DAQmx-MCSV.DI-Lines="port1/line0:7"
BNT_DAQmx:BNT_DAQmx-MCSV.DO-Lines="port0/line0:7"
......@@ -192,48 +224,3 @@ Reset_Device_Msg="ni.var.psp://localhost/myDAQ/myDAQ_Reset"
Selftest_Device_Msg="ni.var.psp://localhost/myDAQ/myDAQ_SelfTest"
Set_Output_Line_Msg="ni.var.psp://localhost/myDAQ/myDAQ_Set-DO_0,ni.var.psp://localhost/myDAQ/myDAQ_Set-DO_1,ni.var.psp://localhost/myDAQ/myDAQ_Set-DO_2,ni.var.psp://localhost/myDAQ/myDAQ_Set-DO_3,ni.var.psp://localhost/myDAQ/myDAQ_Set-DO_4,ni.var.psp://localhost/myDAQ/myDAQ_Set-DO_5,ni.var.psp://localhost/myDAQ/myDAQ_Set-DO_6,ni.var.psp://localhost/myDAQ/myDAQ_Set-DO_7"
Set_Output_Lines_Msg="ni.var.psp://localhost/myDAQ/myDAQ_Set-DO"
[myDeviceActor]
LVClassPath="CSPP_DeviceActor.lvlib:CSPP_DeviceActor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=False
CSPP_BaseActor:CSPP_BaseActor.PollingInterval_s=1.
CSPP_BaseActor:CSPP_BaseActor.PVProxy="myDeviceProxy"
CSPP_BaseActor:CSPP_BaseActor.LaunchPVProxy=True
CSPP_DeviceActors:CSPP_DeviceActor.ResourceName="COM1"
CSPP_DeviceActors:CSPP_DeviceActor.Reset=False
CSPP_DeviceActors:CSPP_DeviceActor.Selftest=False
CSPP_DeviceActors:CSPP_DeviceActor.OptionString="Simulate=0,RangeCheck=1,QueryInstrStatus=0,Cache=1"
CSPP_DeviceActors:CSPP_DeviceActor.ResetWithDefaults=False
[myDeviceActor.URLs]
PollingCounter="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_PollingCounter?.1"
PollingInterval="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_PollingInterval?.1"
PollingIterations="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_PollingIterations?.1"
PollingMode="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_PollingMode?.1"
PollingTime="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_PollingTime?.1"
ResourceName="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_ResourceName"
DriverRevision="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_DriverRevision"
FirmwareRevision="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_FirmwareRevision"
SelftestResultCode="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_SelftestResultCode"
SelftestResultMessage="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_SelftestResultMessage"
ErrorCode="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_ErrorCode"
ErrorMessage="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_ErrorMessage"
[myDeviceProxy]
LVClassPath="CSPP_PVProxy.lvlib:CSPP_PVProxy.lvclass"
CSPP_BaseActor:CSPP_BaseActor.DefaultGUI="CSPP_DeviceGUIActor.lvlib:CSPP_DeviceGUIActor.lvclass"
CSPP_BaseActor:CSPP_BaseActor.LaunchDefaultGUI=False
CSPP_BaseActor:CSPP_BaseActor.ErrorDialog=True
CSPP_PVProxy:CSPP_PVProxy.WorkerActor="myDeviceActor"
CSPP_PVProxy:CSPP_PVProxy.DelayedActivation=True
[myDeviceProxy.URLs]
Activate="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceProxy_Activate"
WorkerActor="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceProxy_WorkerActor"
Polling_Interval_Msg="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_Set-PollingInterval?.1"
Polling_Iterations_Msg="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_Set-PollingIterations?.1"
Polling_Start_Stop_Msg="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_Set-PollingStartStop?.1"
Reset_Device_Msg="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_Reset"
Selftest_Device_Msg="ni.var.psp://localhost/CSPP-Core-SV-RT/myDeviceActor_SelfTest"
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment