Skip to content

Commit af879bf

Browse files
Merge pull request #35 from navinsubramani/Instrument_IO
Handled the corner case where ',' used with in the string constant an…
2 parents ab32cc7 + 4af9d67 commit af879bf

File tree

10 files changed

+74
-31
lines changed

10 files changed

+74
-31
lines changed

LV scripting language.lvproj

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,26 @@
1010
<Property Name="server.vi.callsEnabled" Type="Bool">true</Property>
1111
<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
1212
<Property Name="specify.custom.address" Type="Bool">false</Property>
13-
<Item Name="documentations" Type="Folder" URL="../documentations">
14-
<Property Name="NI.DISK" Type="Bool">true</Property>
13+
<Item Name="documentations" Type="Folder">
14+
<Item Name="chm" Type="Folder">
15+
<Item Name="Addition.html" Type="Document" URL="../documentations/chm/Addition.html"/>
16+
<Item Name="Arithmetic Functions.html" Type="Document" URL="../documentations/chm/Arithmetic Functions.html"/>
17+
<Item Name="Assignment Statement.html" Type="Document" URL="../documentations/chm/Assignment Statement.html"/>
18+
<Item Name="Framework documentation.chm" Type="Document" URL="../documentations/chm/Framework documentation.chm"/>
19+
<Item Name="Framework documentation.hhc" Type="Document" URL="../documentations/chm/Framework documentation.hhc"/>
20+
<Item Name="Framework documentation.hhk" Type="Document" URL="../documentations/chm/Framework documentation.hhk"/>
21+
<Item Name="Framework documentation.log.txt" Type="Document" URL="../documentations/chm/Framework documentation.log.txt"/>
22+
<Item Name="LSL documentation.hhp" Type="Document" URL="../documentations/chm/LSL documentation.hhp"/>
23+
<Item Name="Statements.html" Type="Document" URL="../documentations/chm/Statements.html"/>
24+
<Item Name="Subtract.html" Type="Document" URL="../documentations/chm/Subtract.html"/>
25+
</Item>
26+
<Item Name="logo" Type="Folder">
27+
<Item Name="logo creator.pptx" Type="Document" URL="../documentations/logo/logo creator.pptx"/>
28+
<Item Name="Logo.png" Type="Document" URL="../documentations/logo/Logo.png"/>
29+
<Item Name="lsl icon.ico" Type="Document" URL="../documentations/logo/lsl icon.ico"/>
30+
</Item>
31+
<Item Name="Scenerios and Known Issues.docx" Type="Document" URL="../documentations/Scenerios and Known Issues.docx"/>
32+
<Item Name="Scripting Language Design Doc.docx" Type="Document" URL="../documentations/Scripting Language Design Doc.docx"/>
1533
</Item>
1634
<Item Name="example" Type="Folder" URL="../example">
1735
<Property Name="NI.DISK" Type="Bool">true</Property>
@@ -20,6 +38,23 @@
2038
<Property Name="NI.DISK" Type="Bool">true</Property>
2139
</Item>
2240
<Item Name="Dependencies" Type="Dependencies">
41+
<Item Name="instr.lib" Type="Folder">
42+
<Item Name="niDCPower Close.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Close.vi"/>
43+
<Item Name="niDCPower Configure Current Level.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Configure Current Level.vi"/>
44+
<Item Name="niDCPower Configure Current Limit.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Configure Current Limit.vi"/>
45+
<Item Name="niDCPower Configure Output Enabled.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Configure Output Enabled.vi"/>
46+
<Item Name="niDCPower Configure Voltage Level.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Configure Voltage Level.vi"/>
47+
<Item Name="niDCPower Configure Voltage Limit.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Configure Voltage Limit.vi"/>
48+
<Item Name="niDCPower Current Limit Behavior.ctl" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Current Limit Behavior.ctl"/>
49+
<Item Name="niDCPower Initialize With Channels.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Initialize With Channels.vi"/>
50+
<Item Name="niDCPower IVI Error Converter.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower IVI Error Converter.vi"/>
51+
<Item Name="niDCPower Measure.vi" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Measure.vi"/>
52+
<Item Name="niDCPower Measurement Type.ctl" Type="VI" URL="/&lt;instrlib&gt;/niDCPower/nidcpower.llb/niDCPower Measurement Type.ctl"/>
53+
<Item Name="niDMM Close.vi" Type="VI" URL="/&lt;instrlib&gt;/niDMM/nidmm.llb/niDMM Close.vi"/>
54+
<Item Name="niDMM Initialize.vi" Type="VI" URL="/&lt;instrlib&gt;/niDMM/nidmm.llb/niDMM Initialize.vi"/>
55+
<Item Name="niDMM IVI Error Converter.vi" Type="VI" URL="/&lt;instrlib&gt;/niDMM/nidmm.llb/niDMM IVI Error Converter.vi"/>
56+
<Item Name="niDMM Read.vi" Type="VI" URL="/&lt;instrlib&gt;/niDMM/nidmm.llb/niDMM Read.vi"/>
57+
</Item>
2358
<Item Name="user.lib" Type="Folder">
2459
<Item Name="Array of VData to VCluster__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Array of VData to VCluster__ogtk.vi"/>
2560
<Item Name="Build Error Cluster__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/error/error.llb/Build Error Cluster__ogtk.vi"/>
@@ -65,6 +100,12 @@
65100
<Item Name="Unset Busy.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Unset Busy.vi"/>
66101
<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
67102
</Item>
103+
<Item Name="nidcpower_32.dll" Type="Document" URL="nidcpower_32.dll">
104+
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
105+
</Item>
106+
<Item Name="nidmm_32.dll" Type="Document" URL="nidmm_32.dll">
107+
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
108+
</Item>
68109
</Item>
69110
<Item Name="Build Specifications" Type="Build">
70111
<Item Name="LSL Script Editor" Type="EXE">

example/Basic Interface.vi

12 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

source code/LSL components/functions/functionsbase/functionbase.lvclass

Lines changed: 29 additions & 27 deletions
Large diffs are not rendered by default.

source code/LSL components/scripts/scripts manager/scripts manager.lvclass

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)