Merge remote-tracking branch 'origin/MainDev' into LV2015

a4d59853 · Dennis Neidherr · 6be60a93 · b44b4749 · a4d59853 · a4d59853
Commit a4d59853 authored Mar 03, 2016 by Dennis Neidherr 😲
--- a/CS++DMM/After Launch Init Core.vi
+++ b/CS++DMM/After Launch Init Core.vi
--- a/CS++DMM/CS++DMM.lvclass
+++ b/CS++DMM/CS++DMM.lvclass
--- a/CS++DMM/Initialize Attributes.vi
+++ b/CS++DMM/Initialize Attributes.vi
--- a/CS++DMM/Polling Core.vi
+++ b/CS++DMM/Polling Core.vi
--- a/CS++DMM/Stop Core.vi
+++ b/CS++DMM/Stop Core.vi
--- a/CS++DeviceBase.ini
+++ b/CS++DeviceBase.ini
@@ -9,9 +9,13 @@ CS++DeviceActors:CS++DeviceActor.Reset=False
 CS++DeviceActors:CS++DeviceActor.Selftest=False
 CS++DeviceActors:CS++DeviceActor.OptionString="Simulate=0,RangeCheck=1,QueryInstrStatus=0,Cache=1"
 CS++DeviceActors:CS++DeviceActor.ResetWithDefaults=False
+CS++DMM:CS++DMM.NofPointsToPoll=1

 PV-URL are defined in a separate section, so it can be used by other objects, too, e.g. the corresponding GUI.
 [myDMM.URLs]
+PollingMode="ni.var.psp://localhost/myProcess/myDMM_PollingMode?.1"
+PollingTime="ni.var.psp://localhost/myProcess/myDMM_PollingTime?.1"
+PollingInterval="ni.var.psp://localhos/myProcess/myDMM_PollingInterval?.1"
 ResourceName="ni.var.psp://localhost/myProcess/myDMM_ResourceName"
 DriverRevision="ni.var.psp://localhost/myProcess/myDMM_DriverRevision"
 FirmwareRevision="ni.var.psp://localhost/myProcess/myDMM_FirmwareRevision"