Skip to content

Commit

Permalink
Merge pull request #211 from ni/dev/enable-disable
Browse files Browse the repository at this point in the history
Add enable/disable functionality to custom device
  • Loading branch information
papowerNI authored Mar 4, 2022
2 parents a92aa3d + 3844ccd commit 5ad7cb2
Show file tree
Hide file tree
Showing 30 changed files with 936 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@
<Item Name="Deployment" Type="Folder">
<Item Name="Deployment.lvclass" Type="LVClass" URL="../Tests/System/Deployment/Deployment.lvclass"/>
</Item>
<Item Name="Disabled Custom Device" Type="Folder">
<Item Name="Disabled Custom Device.lvclass" Type="LVClass" URL="../Tests/System/Disabled Custom Device/Disabled Custom Device.lvclass"/>
</Item>
<Item Name="Logging Loopback" Type="Folder">
<Item Name="Logging Loopback.lvclass" Type="LVClass" URL="../Tests/System/Logging Loopback/Logging Loopback.lvclass"/>
</Item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,7 @@ Hardware configuration file path must equal a path to an existing hardware confi
<nierror code="-732359">
Parameter configuration file MD5 checksum is not equal to the MD5 checksum saved in the system definition. This difference indicates that the parameter configuration file has changed since import.
</nierror>
<nierror code="-732360">
Invalid GUID stored for this item.
</nierror>
</nidocument>
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
</Item>
<Item Name="Custom Device" Type="Folder">
<Item Name="Add Custom Device.vi" Type="VI" URL="../Custom Device/Add Custom Device.vi"/>
<Item Name="Check If Custom Device Enabled.vi" Type="VI" URL="../Custom Device/Check If Custom Device Enabled.vi"/>
<Item Name="Disable Custom Device.vi" Type="VI" URL="../Custom Device/Disable Custom Device.vi"/>
<Item Name="Enable Custom Device.vi" Type="VI" URL="../Custom Device/Enable Custom Device.vi"/>
<Item Name="Add Status Section.vi" Type="VI" URL="../Custom Device/Add Status Section.vi"/>
<Item Name="Check If Error Exists.vi" Type="VI" URL="../Custom Device/Check If Error Exists.vi"/>
<Item Name="Export Custom Device.vi" Type="VI" URL="../Custom Device/Export Custom Device.vi"/>
Expand Down
Binary file modified Source/Custom Device Support/Scripting/Constants.vi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Source/Custom Device Support/Scripting/Palettes/dir.mnu
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@
<Item Name="Trigger Channel.vi" Type="VI" URL="../System Explorer/Pages/Trigger Channel.vi"/>
</Item>
<Item Name="RTM" Type="Folder">
<Item Name="EnableDisable RTM.vi" Type="VI" URL="../System Explorer/RTM/EnableDisable RTM.vi"/>
<Item Name="Export Configuration RTM.vi" Type="VI" URL="../System Explorer/RTM/Export Configuration RTM.vi"/>
<Item Name="Import Configuration RTM.vi" Type="VI" URL="../System Explorer/RTM/Import Configuration RTM.vi"/>
</Item>
<Item Name="SubVIs" Type="Folder">
<Item Name="Channel Cluster to Table.vi" Type="VI" URL="../System Explorer/subVIs/Channel Cluster to Table.vi"/>
<Item Name="Check If Custom Device Enabled.vi" Type="VI" URL="../System Explorer/subVIs/Check If Custom Device Enabled.vi"/>
<Item Name="Device Parameters to Configuration Elements.vi" Type="VI" URL="../System Explorer/subVIs/Device Parameters to Configuration Elements.vi"/>
<Item Name="Load Help File.vi" Type="VI" URL="../System Explorer/Load Help File.vi"/>
<Item Name="Set System Explorer Busy.vi" Type="VI" URL="../System Explorer/subVIs/Set System Explorer Busy.vi"/>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,236 @@
<?xml version="1.0"?>
<parameters xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<channel>
<hardwareChannel>0</hardwareChannel>
<terminals>
<terminal>
<terminalAddress>0</terminalAddress>
</terminal>
<terminal>
<terminalAddress>1</terminalAddress>
</terminal>
<terminal>
<terminalAddress>15</terminalAddress>
</terminal>
<terminal>
<terminalAddress>21</terminalAddress>
</terminal>
<terminal>
<terminalAddress>31</terminalAddress>
</terminal>
</terminals>
<acyclicFrame>
<createTriggerChannel>true</createTriggerChannel>
<name>acyclicFrame ID56</name>
</acyclicFrame>
<message>
<name>BC to RT 1.2</name>
<address>
<terminalAddress>1</terminalAddress>
<subAddress>2</subAddress>
<direction>Rx</direction>
</address>
<messageType>BC to RT</messageType>
<numberOfWords>3</numberOfWords>
<createTimestampChannel>true</createTimestampChannel>
</message>
<message>
<name>RT 15.21 to RT 31.21</name>
<address>
<terminalAddress>15</terminalAddress>
<subAddress>21</subAddress>
<direction>Tx</direction>
</address>
<address>
<terminalAddress>31</terminalAddress>
<subAddress>21</subAddress>
<direction>Rx</direction>
</address>
<messageType>RT to RT</messageType>
<numberOfWords>11</numberOfWords>
<createTimestampChannel>true</createTimestampChannel>
<parameters>
<parameter>
<encoding>BNR</encoding>
<signed>false</signed>
<startBit>0</startBit>
<numberOfBits>16</numberOfBits>
<scale>2</scale>
<offset>0.0</offset>
<name>Parameter 0</name>
<defaultValue>0.0</defaultValue>
</parameter>
<parameter>
<encoding>BNR</encoding>
<signed>false</signed>
<startBit>16</startBit>
<numberOfBits>16</numberOfBits>
<scale>1</scale>
<offset>50</offset>
<name>Parameter 1</name>
<defaultValue>0.0</defaultValue>
</parameter>
<parameter>
<encoding>BNR</encoding>
<signed>true</signed>
<startBit>32</startBit>
<numberOfBits>16</numberOfBits>
<scale>1</scale>
<offset>0.0</offset>
<name>Parameter 2</name>
<defaultValue>0.0</defaultValue>
</parameter>
<parameter>
<encoding>BNR</encoding>
<signed>false</signed>
<startBit>48</startBit>
<numberOfBits>16</numberOfBits>
<scale>1</scale>
<offset>0.0</offset>
<name>Parameter 3</name>
<defaultValue>0.0</defaultValue>
</parameter>
<parameter>
<encoding>BNR</encoding>
<signed>false</signed>
<startBit>64</startBit>
<numberOfBits>16</numberOfBits>
<scale>1</scale>
<offset>0.0</offset>
<name>Parameter 4</name>
<defaultValue>0.0</defaultValue>
</parameter>
<parameter>
<encoding>BNR</encoding>
<signed>false</signed>
<startBit>80</startBit>
<numberOfBits>16</numberOfBits>
<scale>1</scale>
<offset>0.0</offset>
<name>Parameter 5</name>
<defaultValue>0.0</defaultValue>
</parameter>
<parameter>
<encoding>BCD</encoding>
<signed>false</signed>
<startBit>96</startBit>
<numberOfBits>32</numberOfBits>
<scale>1</scale>
<offset>0.0</offset>
<name>Parameter 6</name>
<defaultValue>0.0</defaultValue>
</parameter>
<parameter>
<encoding>BNR</encoding>
<signed>true</signed>
<startBit>128</startBit>
<numberOfBits>8</numberOfBits>
<scale>1</scale>
<offset>0.0</offset>
<name>Parameter 8</name>
<defaultValue>0.0</defaultValue>
</parameter>
<parameter>
<encoding>BNR</encoding>
<signed>false</signed>
<startBit>136</startBit>
<numberOfBits>40</numberOfBits>
<scale>1</scale>
<offset>0.0</offset>
<name>Parameter 9</name>
<defaultValue>0.0</defaultValue>
</parameter>
</parameters>
</message>
<message>
<name>BC to RT 1.3</name>
<address>
<terminalAddress>1</terminalAddress>
<subAddress>3</subAddress>
<direction>Rx</direction>
</address>
<messageType>BC to RT</messageType>
<numberOfWords>4</numberOfWords>
</message>
<message>
<name>RT 1.5 to BC</name>
<address>
<terminalAddress>1</terminalAddress>
<subAddress>5</subAddress>
<direction>Tx</direction>
</address>
<messageType>RT to BC</messageType>
<numberOfWords>6</numberOfWords>
</message>
<message>
<name>RT 1.6 to BC</name>
<address>
<terminalAddress>1</terminalAddress>
<subAddress>6</subAddress>
<direction>Tx</direction>
</address>
<messageType>RT to BC</messageType>
<numberOfWords>2</numberOfWords>
<createTimestampChannel>true</createTimestampChannel>
</message>
<message>
<name>RT 1.20 to RT 15.20</name>
<address>
<terminalAddress>1</terminalAddress>
<subAddress>20</subAddress>
<direction>Tx</direction>
</address>
<address>
<terminalAddress>15</terminalAddress>
<subAddress>20</subAddress>
<direction>Rx</direction>
</address>
<messageType>RT to RT</messageType>
<numberOfWords>4</numberOfWords>
<createTimestampChannel>false</createTimestampChannel>
</message>
<message>
<name>MC 16</name>
<address>
<terminalAddress>1</terminalAddress>
<subAddress>31</subAddress>
<direction>Tx</direction>
</address>
<messageType>MC</messageType>
<numberOfWords>1</numberOfWords>
<modeCode>16</modeCode>
</message>
<message>
<name>MC 17</name>
<address>
<terminalAddress>1</terminalAddress>
<subAddress>31</subAddress>
<direction>Rx</direction>
</address>
<messageType>MC</messageType>
<numberOfWords>1</numberOfWords>
<modeCode>17</modeCode>
</message>
<message>
<name>BC to RT 31.28</name>
<address>
<terminalAddress>31</terminalAddress>
<subAddress>28</subAddress>
<direction>Rx</direction>
</address>
<messageType>BC to RT</messageType>
<numberOfWords>6</numberOfWords>
</message>
<message>
<name>MC 01</name>
<address>
<terminalAddress>31</terminalAddress>
<subAddress>31</subAddress>
<direction>Rx</direction>
</address>
<messageType>MC</messageType>
<numberOfWords>0</numberOfWords>
<modeCode>1</modeCode>
</message>
</channel>
</parameters>

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Supported Targets]
Linux64PXI = vs-eco-slave-8880

[Active Configuration]
Platform = Linux64PXI
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 5ad7cb2

Please sign in to comment.