netlinx-workspace 1.1.0 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/doc/NetLinx.html +1 -1
- data/doc/NetLinx/Compile.html +1 -1
- data/doc/NetLinx/Compile/Extension.html +1 -1
- data/doc/NetLinx/Compile/Extension/APW.html +1 -1
- data/doc/NetLinx/Project.html +1 -1
- data/doc/NetLinx/Rake.html +1 -1
- data/doc/NetLinx/Rake/Workspace.html +1 -1
- data/doc/NetLinx/Rake/Workspace/CreateWorkspaceConfig.html +1 -1
- data/doc/NetLinx/Rake/Workspace/GenerateAPW.html +1 -1
- data/doc/NetLinx/System.html +27 -25
- data/doc/NetLinx/SystemFile.html +1 -1
- data/doc/NetLinx/Workspace.html +29 -21
- data/doc/NetLinx/Workspace/YAML.html +1 -1
- data/doc/_index.html +1 -1
- data/doc/file.README.html +1 -1
- data/doc/file.license.html +1 -1
- data/doc/index.html +1 -1
- data/doc/top-level-namespace.html +1 -1
- data/lib/netlinx/workspace.rb +6 -2
- data/lib/netlinx/workspace/system.rb +6 -5
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 181223a9139cb46fe1f539be6df2f8c6cf1af1e6
|
|
4
|
+
data.tar.gz: 55ca6a831a8255a47f36dcaf6120558e4681a538
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2c218349ccbca0b3a51450ddb0279eefd84db058817a41b877fa245d3971b5aeaacdd8f657511baa3de2ba93ffa99d172be8373de2fcb1ac6d22d6014c907f68
|
|
7
|
+
data.tar.gz: b6ef23ae6e6fad3d8f3b58f24a3aef2d744fb7678a3be8a1d35ee655837081bd592e4c444ec1822929dcf586ce6906d8233a3f5b0081d650fc6a0d15e2d2d46c
|
data/doc/NetLinx.html
CHANGED
|
@@ -121,7 +121,7 @@
|
|
|
121
121
|
</div>
|
|
122
122
|
|
|
123
123
|
<div id="footer">
|
|
124
|
-
Generated on
|
|
124
|
+
Generated on Tue Mar 31 15:22:00 2015 by
|
|
125
125
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
126
126
|
0.8.7.6 (ruby-2.1.3).
|
|
127
127
|
</div>
|
data/doc/NetLinx/Compile.html
CHANGED
|
@@ -117,7 +117,7 @@
|
|
|
117
117
|
</div>
|
|
118
118
|
|
|
119
119
|
<div id="footer">
|
|
120
|
-
Generated on
|
|
120
|
+
Generated on Tue Mar 31 15:22:00 2015 by
|
|
121
121
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
122
122
|
0.8.7.6 (ruby-2.1.3).
|
|
123
123
|
</div>
|
|
@@ -117,7 +117,7 @@
|
|
|
117
117
|
</div>
|
|
118
118
|
|
|
119
119
|
<div id="footer">
|
|
120
|
-
Generated on
|
|
120
|
+
Generated on Tue Mar 31 15:22:00 2015 by
|
|
121
121
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
122
122
|
0.8.7.6 (ruby-2.1.3).
|
|
123
123
|
</div>
|
|
@@ -210,7 +210,7 @@
|
|
|
210
210
|
</div>
|
|
211
211
|
|
|
212
212
|
<div id="footer">
|
|
213
|
-
Generated on
|
|
213
|
+
Generated on Tue Mar 31 15:22:01 2015 by
|
|
214
214
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
215
215
|
0.8.7.6 (ruby-2.1.3).
|
|
216
216
|
</div>
|
data/doc/NetLinx/Project.html
CHANGED
|
@@ -1339,7 +1339,7 @@
|
|
|
1339
1339
|
</div>
|
|
1340
1340
|
|
|
1341
1341
|
<div id="footer">
|
|
1342
|
-
Generated on
|
|
1342
|
+
Generated on Tue Mar 31 15:22:01 2015 by
|
|
1343
1343
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
1344
1344
|
0.8.7.6 (ruby-2.1.3).
|
|
1345
1345
|
</div>
|
data/doc/NetLinx/Rake.html
CHANGED
|
@@ -119,7 +119,7 @@
|
|
|
119
119
|
</div>
|
|
120
120
|
|
|
121
121
|
<div id="footer">
|
|
122
|
-
Generated on
|
|
122
|
+
Generated on Tue Mar 31 15:22:00 2015 by
|
|
123
123
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
124
124
|
0.8.7.6 (ruby-2.1.3).
|
|
125
125
|
</div>
|
|
@@ -119,7 +119,7 @@
|
|
|
119
119
|
</div>
|
|
120
120
|
|
|
121
121
|
<div id="footer">
|
|
122
|
-
Generated on
|
|
122
|
+
Generated on Tue Mar 31 15:22:00 2015 by
|
|
123
123
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
124
124
|
0.8.7.6 (ruby-2.1.3).
|
|
125
125
|
</div>
|
|
@@ -378,7 +378,7 @@ dps: 5001:1:0
|
|
|
378
378
|
</div>
|
|
379
379
|
|
|
380
380
|
<div id="footer">
|
|
381
|
-
Generated on
|
|
381
|
+
Generated on Tue Mar 31 15:22:01 2015 by
|
|
382
382
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
383
383
|
0.8.7.6 (ruby-2.1.3).
|
|
384
384
|
</div>
|
|
@@ -362,7 +362,7 @@
|
|
|
362
362
|
</div>
|
|
363
363
|
|
|
364
364
|
<div id="footer">
|
|
365
|
-
Generated on
|
|
365
|
+
Generated on Tue Mar 31 15:22:01 2015 by
|
|
366
366
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
367
367
|
0.8.7.6 (ruby-2.1.3).
|
|
368
368
|
</div>
|
data/doc/NetLinx/System.html
CHANGED
|
@@ -1815,16 +1815,16 @@ master with a different ID.</p>
|
|
|
1815
1815
|
<pre class="lines">
|
|
1816
1816
|
|
|
1817
1817
|
|
|
1818
|
-
179
|
|
1819
1818
|
180
|
|
1820
1819
|
181
|
|
1821
1820
|
182
|
|
1822
1821
|
183
|
|
1823
1822
|
184
|
|
1824
|
-
185
|
|
1823
|
+
185
|
|
1824
|
+
186</pre>
|
|
1825
1825
|
</td>
|
|
1826
1826
|
<td>
|
|
1827
|
-
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace/system.rb', line
|
|
1827
|
+
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace/system.rb', line 180</span>
|
|
1828
1828
|
|
|
1829
1829
|
<span class='kw'>def</span> <span class='id identifier rubyid_compile'>compile</span>
|
|
1830
1830
|
<span class='comment'># The compiler dependency is only needed if this method is called.
|
|
@@ -1869,17 +1869,17 @@ master with a different ID.</p>
|
|
|
1869
1869
|
<pre class="lines">
|
|
1870
1870
|
|
|
1871
1871
|
|
|
1872
|
-
136
|
|
1873
1872
|
137
|
|
1874
1873
|
138
|
|
1875
1874
|
139
|
|
1876
1875
|
140
|
|
1877
1876
|
141
|
|
1878
1877
|
142
|
|
1879
|
-
143
|
|
1878
|
+
143
|
|
1879
|
+
144</pre>
|
|
1880
1880
|
</td>
|
|
1881
1881
|
<td>
|
|
1882
|
-
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace/system.rb', line
|
|
1882
|
+
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace/system.rb', line 137</span>
|
|
1883
1883
|
|
|
1884
1884
|
<span class='kw'>def</span> <span class='id identifier rubyid_compiler_include_paths'>compiler_include_paths</span>
|
|
1885
1885
|
<span class='ivar'>@files</span><span class='period'>
|
|
@@ -1925,12 +1925,12 @@ master with a different ID.</p>
|
|
|
1925
1925
|
<pre class="lines">
|
|
1926
1926
|
|
|
1927
1927
|
|
|
1928
|
-
156
|
|
1929
1928
|
157
|
|
1930
|
-
158
|
|
1929
|
+
158
|
|
1930
|
+
159</pre>
|
|
1931
1931
|
</td>
|
|
1932
1932
|
<td>
|
|
1933
|
-
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace/system.rb', line
|
|
1933
|
+
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace/system.rb', line 157</span>
|
|
1934
1934
|
|
|
1935
1935
|
<span class='kw'>def</span> <span class='id identifier rubyid_compiler_library_paths'>compiler_library_paths</span>
|
|
1936
1936
|
<span class='lbracket'>[</span><span class='rbracket'>]</span>
|
|
@@ -1971,17 +1971,17 @@ master with a different ID.</p>
|
|
|
1971
1971
|
<pre class="lines">
|
|
1972
1972
|
|
|
1973
1973
|
|
|
1974
|
-
146
|
|
1975
1974
|
147
|
|
1976
1975
|
148
|
|
1977
1976
|
149
|
|
1978
1977
|
150
|
|
1979
1978
|
151
|
|
1980
1979
|
152
|
|
1981
|
-
153
|
|
1980
|
+
153
|
|
1981
|
+
154</pre>
|
|
1982
1982
|
</td>
|
|
1983
1983
|
<td>
|
|
1984
|
-
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace/system.rb', line
|
|
1984
|
+
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace/system.rb', line 147</span>
|
|
1985
1985
|
|
|
1986
1986
|
<span class='kw'>def</span> <span class='id identifier rubyid_compiler_module_paths'>compiler_module_paths</span>
|
|
1987
1987
|
<span class='ivar'>@files</span><span class='period'>
|
|
@@ -2027,17 +2027,17 @@ master with a different ID.</p>
|
|
|
2027
2027
|
<pre class="lines">
|
|
2028
2028
|
|
|
2029
2029
|
|
|
2030
|
-
126
|
|
2031
2030
|
127
|
|
2032
2031
|
128
|
|
2033
2032
|
129
|
|
2034
2033
|
130
|
|
2035
2034
|
131
|
|
2036
2035
|
132
|
|
2037
|
-
133
|
|
2036
|
+
133
|
|
2037
|
+
134</pre>
|
|
2038
2038
|
</td>
|
|
2039
2039
|
<td>
|
|
2040
|
-
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace/system.rb', line
|
|
2040
|
+
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace/system.rb', line 127</span>
|
|
2041
2041
|
|
|
2042
2042
|
<span class='kw'>def</span> <span class='id identifier rubyid_compiler_target_files'>compiler_target_files</span>
|
|
2043
2043
|
<span class='ivar'>@files</span><span class='period'>
|
|
@@ -2096,7 +2096,6 @@ master with a different ID.</p>
|
|
|
2096
2096
|
<pre class="lines">
|
|
2097
2097
|
|
|
2098
2098
|
|
|
2099
|
-
161
|
|
2100
2099
|
162
|
|
2101
2100
|
163
|
|
2102
2101
|
164
|
|
@@ -2111,10 +2110,11 @@ master with a different ID.</p>
|
|
|
2111
2110
|
173
|
|
2112
2111
|
174
|
|
2113
2112
|
175
|
|
2114
|
-
176
|
|
2113
|
+
176
|
|
2114
|
+
177</pre>
|
|
2115
2115
|
</td>
|
|
2116
2116
|
<td>
|
|
2117
|
-
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace/system.rb', line
|
|
2117
|
+
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace/system.rb', line 162</span>
|
|
2118
2118
|
|
|
2119
2119
|
<span class='kw'>def</span> <span class='id identifier rubyid_include?'>include?</span> <span class='id identifier rubyid_file'>file</span>
|
|
2120
2120
|
<span class='id identifier rubyid_included'>included</span> <span class='op'>=</span> <span class='kw'>false</span>
|
|
@@ -2272,7 +2272,8 @@ master with a different ID.</p>
|
|
|
2272
2272
|
120
|
|
2273
2273
|
121
|
|
2274
2274
|
122
|
|
2275
|
-
123
|
|
2275
|
+
123
|
|
2276
|
+
124</pre>
|
|
2276
2277
|
</td>
|
|
2277
2278
|
<td>
|
|
2278
2279
|
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace/system.rb', line 91</span>
|
|
@@ -2281,9 +2282,10 @@ master with a different ID.</p>
|
|
|
2281
2282
|
<span class='const'>REXML</span><span class='op'>::</span><span class='const'>Element</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>System</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_tap'>tap</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_system'>system</span><span class='op'>|</span>
|
|
2282
2283
|
<span class='id identifier rubyid_system'>system</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>IsActive</span><span class='tstring_end'>'</span></span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='id identifier rubyid_active'>active</span>
|
|
2283
2284
|
<span class='id identifier rubyid_system'>system</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Platform</span><span class='tstring_end'>'</span></span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Netlinx</span><span class='tstring_end'>'</span></span>
|
|
2284
|
-
<span class='id identifier
|
|
2285
|
-
<span class='id identifier rubyid_system'>system</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>
|
|
2286
|
-
|
|
2285
|
+
<span class='id identifier rubyid_transport'>transport</span> <span class='op'>=</span> <span class='lparen'>(</span><span class='id identifier rubyid_ip_address'>ip_address</span> <span class='op'>==</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>0.0.0.0</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span> <span class='op'>?</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Serial</span><span class='tstring_end'>'</span></span> <span class='op'>:</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>TCPIP</span><span class='tstring_end'>'</span></span>
|
|
2286
|
+
<span class='id identifier rubyid_system'>system</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Transport</span><span class='tstring_end'>'</span></span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='id identifier rubyid_transport'>transport</span>
|
|
2287
|
+
<span class='id identifier rubyid_system'>system</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>TransportEx</span><span class='tstring_end'>'</span></span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='id identifier rubyid_transport'>transport</span>
|
|
2288
|
+
|
|
2287
2289
|
|
|
2288
2290
|
<span class='id identifier rubyid_system'>system</span><span class='period'>.</span><span class='id identifier rubyid_add_element'>add_element</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Identifier</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_tap'>tap</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_e'>e</span><span class='op'>|</span> <span class='id identifier rubyid_e'>e</span><span class='period'>.</span><span class='id identifier rubyid_text'>text</span> <span class='op'>=</span> <span class='id identifier rubyid_name'>name</span> <span class='rbrace'>}</span>
|
|
2289
2291
|
<span class='id identifier rubyid_system'>system</span><span class='period'>.</span><span class='id identifier rubyid_add_element'>add_element</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>SysID</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_tap'>tap</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_e'>e</span><span class='op'>|</span> <span class='id identifier rubyid_e'>e</span><span class='period'>.</span><span class='id identifier rubyid_text'>text</span> <span class='op'>=</span> <span class='id identifier rubyid_id'>id</span> <span class='rbrace'>}</span>
|
|
@@ -2291,8 +2293,8 @@ master with a different ID.</p>
|
|
|
2291
2293
|
|
|
2292
2294
|
<span class='comment'># These don't seem to change in NetLinx Studio 4.0; possibly 3.x legacy.
|
|
2293
2295
|
</span> <span class='comment'># The 'Ex' suffixes are used.
|
|
2294
|
-
</span> <span class='id identifier rubyid_system'>system</span><span class='period'>.</span><span class='id identifier rubyid_add_element'>add_element</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>TransTCPIP</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_tap'>tap</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_e'>e</span><span class='op'>|</span> <span class='id identifier rubyid_e'>e</span><span class='period'>.</span><span class='id identifier rubyid_text'>text</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'
|
|
2295
|
-
<span class='id identifier rubyid_system'>system</span><span class='period'>.</span><span class='id identifier rubyid_add_element'>add_element</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>TransSerial</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_tap'>tap</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_e'>e</span><span class='op'>|</span> <span class='id identifier rubyid_e'>e</span><span class='period'>.</span><span class='id identifier rubyid_text'>text</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'
|
|
2296
|
+
</span> <span class='id identifier rubyid_system'>system</span><span class='period'>.</span><span class='id identifier rubyid_add_element'>add_element</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>TransTCPIP</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_tap'>tap</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_e'>e</span><span class='op'>|</span> <span class='id identifier rubyid_e'>e</span><span class='period'>.</span><span class='id identifier rubyid_text'>text</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>"</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_ip_address'>ip_address</span><span class='embexpr_end'>}</span><span class='tstring_content'>,</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_ip_port'>ip_port</span><span class='embexpr_end'>}</span><span class='tstring_content'>,</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_ensure_availability'>ensure_availability</span> <span class='op'>?</span> <span class='int'>1</span> <span class='op'>:</span> <span class='int'>0</span><span class='embexpr_end'>}</span><span class='tstring_content'>,,,</span><span class='tstring_end'>"</span></span> <span class='rbrace'>}</span>
|
|
2297
|
+
<span class='id identifier rubyid_system'>system</span><span class='period'>.</span><span class='id identifier rubyid_add_element'>add_element</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>TransSerial</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_tap'>tap</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_e'>e</span><span class='op'>|</span> <span class='id identifier rubyid_e'>e</span><span class='period'>.</span><span class='id identifier rubyid_text'>text</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>"</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_com_port'>com_port</span><span class='period'>.</span><span class='id identifier rubyid_upcase'>upcase</span><span class='embexpr_end'>}</span><span class='tstring_content'>,</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_baud_rate'>baud_rate</span><span class='embexpr_end'>}</span><span class='tstring_content'>,</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_data_bits'>data_bits</span><span class='embexpr_end'>}</span><span class='tstring_content'>,</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_parity'>parity</span><span class='period'>.</span><span class='id identifier rubyid_capitalize'>capitalize</span><span class='embexpr_end'>}</span><span class='tstring_content'>,</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_stop_bits'>stop_bits</span><span class='embexpr_end'>}</span><span class='tstring_content'>,,,</span><span class='tstring_end'>"</span></span> <span class='rbrace'>}</span>
|
|
2296
2298
|
|
|
2297
2299
|
<span class='comment'># TODO: Generate communication settings.
|
|
2298
2300
|
</span> <span class='id identifier rubyid_system'>system</span><span class='period'>.</span><span class='id identifier rubyid_add_element'>add_element</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>TransTCPIPEx</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_tap'>tap</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_e'>e</span><span class='op'>|</span>
|
|
@@ -2320,7 +2322,7 @@ master with a different ID.</p>
|
|
|
2320
2322
|
</div>
|
|
2321
2323
|
|
|
2322
2324
|
<div id="footer">
|
|
2323
|
-
Generated on
|
|
2325
|
+
Generated on Tue Mar 31 15:22:01 2015 by
|
|
2324
2326
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
2325
2327
|
0.8.7.6 (ruby-2.1.3).
|
|
2326
2328
|
</div>
|
data/doc/NetLinx/SystemFile.html
CHANGED
|
@@ -1041,7 +1041,7 @@
|
|
|
1041
1041
|
</div>
|
|
1042
1042
|
|
|
1043
1043
|
<div id="footer">
|
|
1044
|
-
Generated on
|
|
1044
|
+
Generated on Tue Mar 31 15:22:01 2015 by
|
|
1045
1045
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
1046
1046
|
0.8.7.6 (ruby-2.1.3).
|
|
1047
1047
|
</div>
|
data/doc/NetLinx/Workspace.html
CHANGED
|
@@ -977,7 +977,11 @@ found.</p>
|
|
|
977
977
|
88
|
|
978
978
|
89
|
|
979
979
|
90
|
|
980
|
-
91
|
|
980
|
+
91
|
|
981
|
+
92
|
|
982
|
+
93
|
|
983
|
+
94
|
|
984
|
+
95</pre>
|
|
981
985
|
</td>
|
|
982
986
|
<td>
|
|
983
987
|
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace.rb', line 83</span>
|
|
@@ -985,8 +989,12 @@ found.</p>
|
|
|
985
989
|
<span class='kw'>def</span> <span class='id identifier rubyid_compile'>compile</span>
|
|
986
990
|
<span class='id identifier rubyid_compiler_results'>compiler_results</span> <span class='op'>=</span> <span class='lbracket'>[</span><span class='rbracket'>]</span>
|
|
987
991
|
|
|
988
|
-
<span class='ivar'>@projects</span><span class='period'>.</span><span class='id identifier
|
|
989
|
-
<span class='id identifier rubyid_project'>project</span><span class='period'>.</span><span class='id identifier
|
|
992
|
+
<span class='ivar'>@projects</span><span class='period'>.</span><span class='id identifier rubyid_map'>map</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_project'>project</span><span class='op'>|</span>
|
|
993
|
+
<span class='id identifier rubyid_project'>project</span><span class='period'>.</span><span class='id identifier rubyid_systems'>systems</span><span class='period'>.</span><span class='id identifier rubyid_select'>select</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_system'>system</span><span class='op'>|</span>
|
|
994
|
+
<span class='const'>ENV</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>NETLINX_ACTIVE_SYSTEM_ONLY</span><span class='tstring_end'>'</span></span><span class='rbracket'>]</span> <span class='op'>?</span> <span class='id identifier rubyid_system'>system</span><span class='period'>.</span><span class='id identifier rubyid_active'>active</span> <span class='op'>:</span> <span class='kw'>true</span>
|
|
995
|
+
<span class='kw'>end</span>
|
|
996
|
+
<span class='kw'>end</span><span class='period'>.</span><span class='id identifier rubyid_flatten'>flatten</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_system'>system</span><span class='op'>|</span>
|
|
997
|
+
<span class='id identifier rubyid_system'>system</span><span class='period'>.</span><span class='id identifier rubyid_compile'>compile</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_result'>result</span><span class='op'>|</span> <span class='id identifier rubyid_compiler_results'>compiler_results</span> <span class='op'><<</span> <span class='id identifier rubyid_result'>result</span> <span class='rbrace'>}</span>
|
|
990
998
|
<span class='kw'>end</span>
|
|
991
999
|
|
|
992
1000
|
<span class='id identifier rubyid_compiler_results'>compiler_results</span>
|
|
@@ -1113,13 +1121,13 @@ found.</p>
|
|
|
1113
1121
|
<pre class="lines">
|
|
1114
1122
|
|
|
1115
1123
|
|
|
1116
|
-
|
|
1117
|
-
|
|
1118
|
-
|
|
1119
|
-
|
|
1124
|
+
127
|
|
1125
|
+
128
|
|
1126
|
+
129
|
|
1127
|
+
130</pre>
|
|
1120
1128
|
</td>
|
|
1121
1129
|
<td>
|
|
1122
|
-
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace.rb', line
|
|
1130
|
+
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace.rb', line 127</span>
|
|
1123
1131
|
|
|
1124
1132
|
<span class='kw'>def</span> <span class='id identifier rubyid_parse_xml'>parse_xml</span> <span class='id identifier rubyid_string'>string</span>
|
|
1125
1133
|
<span class='id identifier rubyid_parse_xml_element'>parse_xml_element</span> <span class='const'>REXML</span><span class='op'>::</span><span class='const'>Document</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='id identifier rubyid_string'>string</span><span class='rparen'>)</span>
|
|
@@ -1266,19 +1274,19 @@ href="https://bugs.ruby-lang.org/issues/10864">bugs.ruby-lang.org/issues/10864</
|
|
|
1266
1274
|
<pre class="lines">
|
|
1267
1275
|
|
|
1268
1276
|
|
|
1269
|
-
110
|
|
1270
|
-
111
|
|
1271
|
-
112
|
|
1272
|
-
113
|
|
1273
1277
|
114
|
|
1274
1278
|
115
|
|
1275
1279
|
116
|
|
1276
1280
|
117
|
|
1277
1281
|
118
|
|
1278
|
-
119
|
|
1282
|
+
119
|
|
1283
|
+
120
|
|
1284
|
+
121
|
|
1285
|
+
122
|
|
1286
|
+
123</pre>
|
|
1279
1287
|
</td>
|
|
1280
1288
|
<td>
|
|
1281
|
-
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace.rb', line
|
|
1289
|
+
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace.rb', line 114</span>
|
|
1282
1290
|
|
|
1283
1291
|
<span class='kw'>def</span> <span class='id identifier rubyid_to_xml'>to_xml</span> <span class='label'>indent:</span> <span class='op'>-</span><span class='int'>1</span>
|
|
1284
1292
|
<span class='id identifier rubyid_str'>str</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'><?xml version="1.0" encoding="UTF-8"?></span><span class='tstring_end'>'</span></span> <span class='op'>+</span> <span class='tstring'><span class='tstring_beg'>"</span><span class='tstring_content'>\n</span><span class='tstring_end'>"</span></span>
|
|
@@ -1339,20 +1347,20 @@ href="https://bugs.ruby-lang.org/issues/10864">bugs.ruby-lang.org/issues/10864</
|
|
|
1339
1347
|
<pre class="lines">
|
|
1340
1348
|
|
|
1341
1349
|
|
|
1342
|
-
94
|
|
1343
|
-
95
|
|
1344
|
-
96
|
|
1345
|
-
97
|
|
1346
1350
|
98
|
|
1347
1351
|
99
|
|
1348
1352
|
100
|
|
1349
1353
|
101
|
|
1350
1354
|
102
|
|
1351
1355
|
103
|
|
1352
|
-
104
|
|
1356
|
+
104
|
|
1357
|
+
105
|
|
1358
|
+
106
|
|
1359
|
+
107
|
|
1360
|
+
108</pre>
|
|
1353
1361
|
</td>
|
|
1354
1362
|
<td>
|
|
1355
|
-
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace.rb', line
|
|
1363
|
+
<pre class="code"><span class="info file"># File 'lib/netlinx/workspace.rb', line 98</span>
|
|
1356
1364
|
|
|
1357
1365
|
<span class='kw'>def</span> <span class='id identifier rubyid_to_xml_element'>to_xml_element</span>
|
|
1358
1366
|
<span class='const'>REXML</span><span class='op'>::</span><span class='const'>Element</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Workspace</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_tap'>tap</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_workspace'>workspace</span><span class='op'>|</span>
|
|
@@ -1375,7 +1383,7 @@ href="https://bugs.ruby-lang.org/issues/10864">bugs.ruby-lang.org/issues/10864</
|
|
|
1375
1383
|
</div>
|
|
1376
1384
|
|
|
1377
1385
|
<div id="footer">
|
|
1378
|
-
Generated on
|
|
1386
|
+
Generated on Tue Mar 31 15:22:00 2015 by
|
|
1379
1387
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
1380
1388
|
0.8.7.6 (ruby-2.1.3).
|
|
1381
1389
|
</div>
|
|
@@ -393,7 +393,7 @@
|
|
|
393
393
|
</div>
|
|
394
394
|
|
|
395
395
|
<div id="footer">
|
|
396
|
-
Generated on
|
|
396
|
+
Generated on Tue Mar 31 15:22:00 2015 by
|
|
397
397
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
398
398
|
0.8.7.6 (ruby-2.1.3).
|
|
399
399
|
</div>
|
data/doc/_index.html
CHANGED
|
@@ -263,7 +263,7 @@
|
|
|
263
263
|
</div>
|
|
264
264
|
|
|
265
265
|
<div id="footer">
|
|
266
|
-
Generated on
|
|
266
|
+
Generated on Tue Mar 31 15:21:59 2015 by
|
|
267
267
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
268
268
|
0.8.7.6 (ruby-2.1.3).
|
|
269
269
|
</div>
|
data/doc/file.README.html
CHANGED
|
@@ -285,7 +285,7 @@ available.</p>
|
|
|
285
285
|
</div></div>
|
|
286
286
|
|
|
287
287
|
<div id="footer">
|
|
288
|
-
Generated on
|
|
288
|
+
Generated on Tue Mar 31 15:22:00 2015 by
|
|
289
289
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
290
290
|
0.8.7.6 (ruby-2.1.3).
|
|
291
291
|
</div>
|
data/doc/file.license.html
CHANGED
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
<div id="content"><div id='filecontents'>Copyright 2013-2015 Alex McLain<br/><br/>Licensed under the Apache License, Version 2.0 (the "License");<br/>you may not use this file except in compliance with the License.<br/>You may obtain a copy of the License at<br/><br/> http://www.apache.org/licenses/LICENSE-2.0<br/><br/>Unless required by applicable law or agreed to in writing, software<br/>distributed under the License is distributed on an "AS IS" BASIS,<br/>WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<br/>See the License for the specific language governing permissions and<br/>limitations under the License.</div></div>
|
|
65
65
|
|
|
66
66
|
<div id="footer">
|
|
67
|
-
Generated on
|
|
67
|
+
Generated on Tue Mar 31 15:22:00 2015 by
|
|
68
68
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
69
69
|
0.8.7.6 (ruby-2.1.3).
|
|
70
70
|
</div>
|
data/doc/index.html
CHANGED
|
@@ -285,7 +285,7 @@ available.</p>
|
|
|
285
285
|
</div></div>
|
|
286
286
|
|
|
287
287
|
<div id="footer">
|
|
288
|
-
Generated on
|
|
288
|
+
Generated on Tue Mar 31 15:21:59 2015 by
|
|
289
289
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
290
290
|
0.8.7.6 (ruby-2.1.3).
|
|
291
291
|
</div>
|
|
@@ -103,7 +103,7 @@
|
|
|
103
103
|
</div>
|
|
104
104
|
|
|
105
105
|
<div id="footer">
|
|
106
|
-
Generated on
|
|
106
|
+
Generated on Tue Mar 31 15:22:00 2015 by
|
|
107
107
|
<a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
|
|
108
108
|
0.8.7.6 (ruby-2.1.3).
|
|
109
109
|
</div>
|
data/lib/netlinx/workspace.rb
CHANGED
|
@@ -83,8 +83,12 @@ module NetLinx
|
|
|
83
83
|
def compile
|
|
84
84
|
compiler_results = []
|
|
85
85
|
|
|
86
|
-
@projects.
|
|
87
|
-
project.
|
|
86
|
+
@projects.map do |project|
|
|
87
|
+
project.systems.select do |system|
|
|
88
|
+
ENV['NETLINX_ACTIVE_SYSTEM_ONLY'] ? system.active : true
|
|
89
|
+
end
|
|
90
|
+
end.flatten.each do |system|
|
|
91
|
+
system.compile.each { |result| compiler_results << result }
|
|
88
92
|
end
|
|
89
93
|
|
|
90
94
|
compiler_results
|
|
@@ -92,9 +92,10 @@ module NetLinx
|
|
|
92
92
|
REXML::Element.new('System').tap do |system|
|
|
93
93
|
system.attributes['IsActive'] = active
|
|
94
94
|
system.attributes['Platform'] = 'Netlinx'
|
|
95
|
-
|
|
96
|
-
system.attributes['
|
|
97
|
-
|
|
95
|
+
transport = (ip_address == '0.0.0.0') ? 'Serial' : 'TCPIP'
|
|
96
|
+
system.attributes['Transport'] = transport
|
|
97
|
+
system.attributes['TransportEx'] = transport
|
|
98
|
+
|
|
98
99
|
|
|
99
100
|
system.add_element('Identifier').tap { |e| e.text = name }
|
|
100
101
|
system.add_element('SysID').tap { |e| e.text = id }
|
|
@@ -102,8 +103,8 @@ module NetLinx
|
|
|
102
103
|
|
|
103
104
|
# These don't seem to change in NetLinx Studio 4.0; possibly 3.x legacy.
|
|
104
105
|
# The 'Ex' suffixes are used.
|
|
105
|
-
system.add_element('TransTCPIP').tap { |e| e.text =
|
|
106
|
-
system.add_element('TransSerial').tap { |e| e.text =
|
|
106
|
+
system.add_element('TransTCPIP').tap { |e| e.text = "#{ip_address},#{ip_port},#{ensure_availability ? 1 : 0},,," }
|
|
107
|
+
system.add_element('TransSerial').tap { |e| e.text = "#{com_port.upcase},#{baud_rate},#{data_bits},#{parity.capitalize},#{stop_bits},,," }
|
|
107
108
|
|
|
108
109
|
# TODO: Generate communication settings.
|
|
109
110
|
system.add_element('TransTCPIPEx').tap { |e|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: netlinx-workspace
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.2.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Alex McLain
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-
|
|
11
|
+
date: 2015-03-31 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: netlinx-compile
|