Skip to content

Commit d630795

Browse files
committed
Added multiclamp 700a variations to examples rigs
1 parent 23a87b1 commit d630795

File tree

8 files changed

+196
-16
lines changed

8 files changed

+196
-16
lines changed
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
classdef HekaDaqWithMultiClamp700A < symphonyui.core.descriptions.RigDescription
2+
3+
methods
4+
5+
function obj = HekaDaqWithMultiClamp700A()
6+
import symphonyui.builtin.daqs.*;
7+
import symphonyui.builtin.devices.*;
8+
import symphonyui.core.*;
9+
10+
daq = HekaDaqController();
11+
obj.daqController = daq;
12+
13+
amp1 = MultiClampDevice('Amp1', 1, [], []).bindStream(daq.getStream('ANALOG_OUT.0')).bindStream(daq.getStream('ANALOG_IN.0'));
14+
obj.addDevice(amp1);
15+
16+
amp2 = MultiClampDevice('Amp2', 2, [], []).bindStream(daq.getStream('ANALOG_OUT.1')).bindStream(daq.getStream('ANALOG_IN.1'));
17+
obj.addDevice(amp2);
18+
19+
green = UnitConvertingDevice('Green LED', 'V').bindStream(daq.getStream('ANALOG_OUT.2'));
20+
green.addConfigurationSetting('ndfs', {}, ...
21+
'type', PropertyType('cellstr', 'row', {'0.3', '0.6', '1.2', '3.0', '4.0'}));
22+
green.addConfigurationSetting('gain', '', ...
23+
'type', PropertyType('char', 'row', {'', 'low', 'medium', 'high'}));
24+
obj.addDevice(green);
25+
26+
blue = UnitConvertingDevice('Blue LED', 'V').bindStream(daq.getStream('ANALOG_OUT.3'));
27+
blue.addConfigurationSetting('ndfs', {}, ...
28+
'type', PropertyType('cellstr', 'row', {'0.3', '0.6', '1.2', '3.0', '4.0'}));
29+
blue.addConfigurationSetting('gain', '', ...
30+
'type', PropertyType('char', 'row', {'', 'low', 'medium', 'high'}));
31+
obj.addDevice(blue);
32+
33+
trigger1 = UnitConvertingDevice('Trigger1', symphonyui.core.Measurement.UNITLESS).bindStream(daq.getStream('DIGITAL_OUT.1'));
34+
daq.getStream('DIGITAL_OUT.1').setBitPosition(trigger1, 0);
35+
obj.addDevice(trigger1);
36+
37+
trigger2 = UnitConvertingDevice('Trigger2', symphonyui.core.Measurement.UNITLESS).bindStream(daq.getStream('DIGITAL_OUT.1'));
38+
daq.getStream('DIGITAL_OUT.1').setBitPosition(trigger2, 2);
39+
obj.addDevice(trigger2);
40+
end
41+
42+
end
43+
44+
end
45+

src/main/resources/examples/+io/+github/+symphony_das/+rigs/HekaDaqWithMultiClamp.m renamed to src/main/resources/examples/+io/+github/+symphony_das/+rigs/HekaDaqWithMultiClamp700B.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
classdef HekaDaqWithMultiClamp < symphonyui.core.descriptions.RigDescription
1+
classdef HekaDaqWithMultiClamp700B < symphonyui.core.descriptions.RigDescription
22

33
methods
44

5-
function obj = HekaDaqWithMultiClamp()
5+
function obj = HekaDaqWithMultiClamp700B()
66
import symphonyui.builtin.daqs.*;
77
import symphonyui.builtin.devices.*;
88
import symphonyui.core.*;
99

1010
daq = HekaDaqController();
1111
obj.daqController = daq;
1212

13-
amp1 = MultiClampDevice('Amp1', 1).bindStream(daq.getStream('ANALOG_OUT.0')).bindStream(daq.getStream('ANALOG_IN.0'));
13+
amp1 = MultiClampDevice('Amp1', 1, []).bindStream(daq.getStream('ANALOG_OUT.0')).bindStream(daq.getStream('ANALOG_IN.0'));
1414
obj.addDevice(amp1);
1515

16-
amp2 = MultiClampDevice('Amp2', 2).bindStream(daq.getStream('ANALOG_OUT.1')).bindStream(daq.getStream('ANALOG_IN.1'));
16+
amp2 = MultiClampDevice('Amp2', 2, []).bindStream(daq.getStream('ANALOG_OUT.1')).bindStream(daq.getStream('ANALOG_IN.1'));
1717
obj.addDevice(amp2);
1818

1919
green = UnitConvertingDevice('Green LED', 'V').bindStream(daq.getStream('ANALOG_OUT.2'));
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
classdef NiDaqWithMultiClamp700A < symphonyui.core.descriptions.RigDescription
2+
3+
methods
4+
5+
function obj = NiDaqWithMultiClamp700A()
6+
import symphonyui.builtin.daqs.*;
7+
import symphonyui.builtin.devices.*;
8+
import symphonyui.core.*;
9+
10+
daq = NiDaqController();
11+
obj.daqController = daq;
12+
13+
amp1 = MultiClampDevice('Amp1', 1, [], []).bindStream(daq.getStream('ao0')).bindStream(daq.getStream('ai0'));
14+
obj.addDevice(amp1);
15+
16+
amp2 = MultiClampDevice('Amp2', 2, [], []).bindStream(daq.getStream('ao1')).bindStream(daq.getStream('ai1'));
17+
obj.addDevice(amp2);
18+
19+
green = UnitConvertingDevice('Green LED', 'V').bindStream(daq.getStream('ao2'));
20+
green.addConfigurationSetting('ndfs', {}, ...
21+
'type', PropertyType('cellstr', 'row', {'0.3', '0.6', '1.2', '3.0', '4.0'}));
22+
green.addConfigurationSetting('gain', '', ...
23+
'type', PropertyType('char', 'row', {'', 'low', 'medium', 'high'}));
24+
obj.addDevice(green);
25+
26+
blue = UnitConvertingDevice('Blue LED', 'V').bindStream(daq.getStream('ao3'));
27+
blue.addConfigurationSetting('ndfs', {}, ...
28+
'type', PropertyType('cellstr', 'row', {'0.3', '0.6', '1.2', '3.0', '4.0'}));
29+
blue.addConfigurationSetting('gain', '', ...
30+
'type', PropertyType('char', 'row', {'', 'low', 'medium', 'high'}));
31+
obj.addDevice(blue);
32+
33+
trigger1 = UnitConvertingDevice('Trigger1', symphonyui.core.Measurement.UNITLESS).bindStream(daq.getStream('doport0'));
34+
daq.getStream('doport0').setBitPosition(trigger1, 0);
35+
obj.addDevice(trigger1);
36+
37+
trigger2 = UnitConvertingDevice('Trigger2', symphonyui.core.Measurement.UNITLESS).bindStream(daq.getStream('doport0'));
38+
daq.getStream('doport0').setBitPosition(trigger2, 2);
39+
obj.addDevice(trigger2);
40+
end
41+
42+
end
43+
44+
end
45+

src/main/resources/examples/+io/+github/+symphony_das/+rigs/NiDaqWithMultiClamp.m renamed to src/main/resources/examples/+io/+github/+symphony_das/+rigs/NiDaqWithMultiClamp700B.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
classdef NiDaqWithMultiClamp < symphonyui.core.descriptions.RigDescription
1+
classdef NiDaqWithMultiClamp700B < symphonyui.core.descriptions.RigDescription
22

33
methods
44

5-
function obj = NiDaqWithMultiClamp()
5+
function obj = NiDaqWithMultiClamp700B()
66
import symphonyui.builtin.daqs.*;
77
import symphonyui.builtin.devices.*;
88
import symphonyui.core.*;
99

1010
daq = NiDaqController();
1111
obj.daqController = daq;
1212

13-
amp1 = MultiClampDevice('Amp1', 1).bindStream(daq.getStream('ao0')).bindStream(daq.getStream('ai0'));
13+
amp1 = MultiClampDevice('Amp1', 1, []).bindStream(daq.getStream('ao0')).bindStream(daq.getStream('ai0'));
1414
obj.addDevice(amp1);
1515

16-
amp2 = MultiClampDevice('Amp2', 2).bindStream(daq.getStream('ao1')).bindStream(daq.getStream('ai1'));
16+
amp2 = MultiClampDevice('Amp2', 2, []).bindStream(daq.getStream('ao1')).bindStream(daq.getStream('ai1'));
1717
obj.addDevice(amp2);
1818

1919
green = UnitConvertingDevice('Green LED', 'V').bindStream(daq.getStream('ao2'));
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
classdef SimulatedHekaDaqWithMultiClamp700A < symphonyui.core.descriptions.RigDescription
2+
3+
methods
4+
5+
function obj = SimulatedHekaDaqWithMultiClamp700A()
6+
import symphonyui.builtin.daqs.*;
7+
import symphonyui.builtin.devices.*;
8+
import symphonyui.core.*;
9+
10+
daq = HekaSimulationDaqController();
11+
obj.daqController = daq;
12+
13+
amp1 = MultiClampDevice('Amp1', 1, [], []).bindStream(daq.getStream('ANALOG_OUT.0')).bindStream(daq.getStream('ANALOG_IN.0'));
14+
obj.addDevice(amp1);
15+
16+
amp2 = MultiClampDevice('Amp2', 2, [], []).bindStream(daq.getStream('ANALOG_OUT.1')).bindStream(daq.getStream('ANALOG_IN.1'));
17+
obj.addDevice(amp2);
18+
19+
green = UnitConvertingDevice('Green LED', 'V').bindStream(daq.getStream('ANALOG_OUT.2'));
20+
green.addConfigurationSetting('ndfs', {}, ...
21+
'type', PropertyType('cellstr', 'row', {'0.3', '0.6', '1.2', '3.0', '4.0'}));
22+
green.addConfigurationSetting('gain', '', ...
23+
'type', PropertyType('char', 'row', {'', 'low', 'medium', 'high'}));
24+
obj.addDevice(green);
25+
26+
blue = UnitConvertingDevice('Blue LED', 'V').bindStream(daq.getStream('ANALOG_OUT.3'));
27+
blue.addConfigurationSetting('ndfs', {}, ...
28+
'type', PropertyType('cellstr', 'row', {'0.3', '0.6', '1.2', '3.0', '4.0'}));
29+
blue.addConfigurationSetting('gain', '', ...
30+
'type', PropertyType('char', 'row', {'', 'low', 'medium', 'high'}));
31+
obj.addDevice(blue);
32+
33+
trigger1 = UnitConvertingDevice('Trigger1', symphonyui.core.Measurement.UNITLESS).bindStream(daq.getStream('DIGITAL_OUT.1'));
34+
daq.getStream('DIGITAL_OUT.1').setBitPosition(trigger1, 0);
35+
obj.addDevice(trigger1);
36+
37+
trigger2 = UnitConvertingDevice('Trigger2', symphonyui.core.Measurement.UNITLESS).bindStream(daq.getStream('DIGITAL_OUT.1'));
38+
daq.getStream('DIGITAL_OUT.1').setBitPosition(trigger2, 2);
39+
obj.addDevice(trigger2);
40+
end
41+
42+
end
43+
44+
end
45+
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
classdef SimulatedHekaDaqWithMultiClamp < symphonyui.core.descriptions.RigDescription
1+
classdef SimulatedHekaDaqWithMultiClamp700B < symphonyui.core.descriptions.RigDescription
22

33
methods
44

5-
function obj = SimulatedHekaDaqWithMultiClamp()
5+
function obj = SimulatedHekaDaqWithMultiClamp700B()
66
import symphonyui.builtin.daqs.*;
77
import symphonyui.builtin.devices.*;
88
import symphonyui.core.*;
99

1010
daq = HekaSimulationDaqController();
1111
obj.daqController = daq;
1212

13-
amp1 = MultiClampDevice('Amp1', 1).bindStream(daq.getStream('ANALOG_OUT.0')).bindStream(daq.getStream('ANALOG_IN.0'));
13+
amp1 = MultiClampDevice('Amp1', 1, []).bindStream(daq.getStream('ANALOG_OUT.0')).bindStream(daq.getStream('ANALOG_IN.0'));
1414
obj.addDevice(amp1);
1515

16-
amp2 = MultiClampDevice('Amp2', 2).bindStream(daq.getStream('ANALOG_OUT.1')).bindStream(daq.getStream('ANALOG_IN.1'));
16+
amp2 = MultiClampDevice('Amp2', 2, []).bindStream(daq.getStream('ANALOG_OUT.1')).bindStream(daq.getStream('ANALOG_IN.1'));
1717
obj.addDevice(amp2);
1818

1919
green = UnitConvertingDevice('Green LED', 'V').bindStream(daq.getStream('ANALOG_OUT.2'));
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
classdef SimulatedNiDaqWithMultiClamp700A < symphonyui.core.descriptions.RigDescription
2+
3+
methods
4+
5+
function obj = SimulatedNiDaqWithMultiClamp700A()
6+
import symphonyui.builtin.daqs.*;
7+
import symphonyui.builtin.devices.*;
8+
import symphonyui.core.*;
9+
10+
daq = NiSimulationDaqController();
11+
obj.daqController = daq;
12+
13+
amp1 = MultiClampDevice('Amp1', 1, [], []).bindStream(daq.getStream('ao0')).bindStream(daq.getStream('ai0'));
14+
obj.addDevice(amp1);
15+
16+
amp2 = MultiClampDevice('Amp2', 2, [], []).bindStream(daq.getStream('ao1')).bindStream(daq.getStream('ai1'));
17+
obj.addDevice(amp2);
18+
19+
green = UnitConvertingDevice('Green LED', 'V').bindStream(daq.getStream('ao2'));
20+
green.addConfigurationSetting('ndfs', {}, ...
21+
'type', PropertyType('cellstr', 'row', {'0.3', '0.6', '1.2', '3.0', '4.0'}));
22+
green.addConfigurationSetting('gain', '', ...
23+
'type', PropertyType('char', 'row', {'', 'low', 'medium', 'high'}));
24+
obj.addDevice(green);
25+
26+
blue = UnitConvertingDevice('Blue LED', 'V').bindStream(daq.getStream('ao3'));
27+
blue.addConfigurationSetting('ndfs', {}, ...
28+
'type', PropertyType('cellstr', 'row', {'0.3', '0.6', '1.2', '3.0', '4.0'}));
29+
blue.addConfigurationSetting('gain', '', ...
30+
'type', PropertyType('char', 'row', {'', 'low', 'medium', 'high'}));
31+
obj.addDevice(blue);
32+
33+
trigger1 = UnitConvertingDevice('Trigger1', symphonyui.core.Measurement.UNITLESS).bindStream(daq.getStream('doport0'));
34+
daq.getStream('doport0').setBitPosition(trigger1, 0);
35+
obj.addDevice(trigger1);
36+
37+
trigger2 = UnitConvertingDevice('Trigger2', symphonyui.core.Measurement.UNITLESS).bindStream(daq.getStream('doport0'));
38+
daq.getStream('doport0').setBitPosition(trigger2, 2);
39+
obj.addDevice(trigger2);
40+
end
41+
42+
end
43+
44+
end
45+

src/main/resources/examples/+io/+github/+symphony_das/+rigs/SimulatedNiDaqWithMultiClamp.m renamed to src/main/resources/examples/+io/+github/+symphony_das/+rigs/SimulatedNiDaqWithMultiClamp700B.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
classdef SimulatedNiDaqWithMultiClamp < symphonyui.core.descriptions.RigDescription
1+
classdef SimulatedNiDaqWithMultiClamp700B < symphonyui.core.descriptions.RigDescription
22

33
methods
44

5-
function obj = SimulatedNiDaqWithMultiClamp()
5+
function obj = SimulatedNiDaqWithMultiClamp700B()
66
import symphonyui.builtin.daqs.*;
77
import symphonyui.builtin.devices.*;
88
import symphonyui.core.*;
99

1010
daq = NiSimulationDaqController();
1111
obj.daqController = daq;
1212

13-
amp1 = MultiClampDevice('Amp1', 1).bindStream(daq.getStream('ao0')).bindStream(daq.getStream('ai0'));
13+
amp1 = MultiClampDevice('Amp1', 1, []).bindStream(daq.getStream('ao0')).bindStream(daq.getStream('ai0'));
1414
obj.addDevice(amp1);
1515

16-
amp2 = MultiClampDevice('Amp2', 2).bindStream(daq.getStream('ao1')).bindStream(daq.getStream('ai1'));
16+
amp2 = MultiClampDevice('Amp2', 2, []).bindStream(daq.getStream('ao1')).bindStream(daq.getStream('ai1'));
1717
obj.addDevice(amp2);
1818

1919
green = UnitConvertingDevice('Green LED', 'V').bindStream(daq.getStream('ao2'));

0 commit comments

Comments
 (0)