Jonny007-MKD
/
Bachelorthesis
1
0
Fork 0
Code Pull Requests Releases Activity

Improve Panel

This commit is contained in:
Jonny007-MKD 2014-07-16 11:00:16 +00:00
parent a95e4d0245
commit 35e434874a
4 changed files with 369 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
Modbus-CAPL/include/CAPL/DEU Power.can
View File

@ -243,3 +243,81 @@ void update()
}
}
on key 'D'
{
@sysvar::Airbus::DeuPower_Input = !@sysvar::Airbus::DeuPower_Input;
}
on key 'e'
{
if (!@sysvar::Airbus::DeuPower_Input)
return;
@sysvar::Airbus::DEU223RH06::B_DC1_E=1;
@sysvar::Airbus::DEU226RH06::B_DC1_E=1;
@sysvar::Airbus::DEU228RH06::B_DC1_E=1;
@sysvar::Airbus::DEU229RH06::B_DC1_E=1;
}
on key 'r'
{
if (!@sysvar::Airbus::DeuPower_Input)
return;
@sysvar::Airbus::DEU223RH06::B_DC2_E=1;
@sysvar::Airbus::DEU226RH06::B_DC2_E=1;
@sysvar::Airbus::DEU228RH06::B_DC2_E=1;
@sysvar::Airbus::DEU229RH06::B_DC2_E=1;
}
on key 'n'
{
if (!@sysvar::Airbus::DeuPower_Input)
return;
@sysvar::Airbus::DEU223RH06::B_DC1_N=1;
@sysvar::Airbus::DEU226RH06::B_DC1_N=1;
@sysvar::Airbus::DEU228RH06::B_DC1_N=1;
@sysvar::Airbus::DEU229RH06::B_DC1_N=1;
}
on key 'm'
{
if (!@sysvar::Airbus::DeuPower_Input)
return;
@sysvar::Airbus::DEU223RH06::B_DC2_N=1;
@sysvar::Airbus::DEU226RH06::B_DC2_N=1;
@sysvar::Airbus::DEU228RH06::B_DC2_N=1;
@sysvar::Airbus::DEU229RH06::B_DC2_N=1;
}
on key 'o'
{
if (!@sysvar::Airbus::DeuPower_Input)
return;
@sysvar::Airbus::DEU223RH06::B_DC1_E = 0;
@sysvar::Airbus::DEU223RH06::B_DC1_N = 0;
@sysvar::Airbus::DEU223RH06::B_DC2_E = 0;
@sysvar::Airbus::DEU223RH06::B_DC2_N = 0;
@sysvar::Airbus::DEU226RH06::B_DC1_E = 0;
@sysvar::Airbus::DEU226RH06::B_DC1_N = 0;
@sysvar::Airbus::DEU226RH06::B_DC2_E = 0;
@sysvar::Airbus::DEU226RH06::B_DC2_N = 0;
@sysvar::Airbus::DEU228RH06::B_DC1_E = 0;
@sysvar::Airbus::DEU228RH06::B_DC1_N = 0;
@sysvar::Airbus::DEU228RH06::B_DC2_E = 0;
@sysvar::Airbus::DEU228RH06::B_DC2_N = 0;
@sysvar::Airbus::DEU229RH06::B_DC1_E = 0;
@sysvar::Airbus::DEU229RH06::B_DC1_N = 0;
@sysvar::Airbus::DEU229RH06::B_DC2_E = 0;
@sysvar::Airbus::DEU229RH06::B_DC2_N = 0;
}
on start
{
openPanel("DEU Power");
}
on preStop
{
closePanel("DEU Power");
}

23
Modbus-CAPL/include/Panels/DEU_Power.xvp
View File

@ -1,11 +1,30 @@
<?xml version="1.0"?>
<Panel Type="Vector.CANalyzer.Panels.PanelSerializer, Vector.CANalyzer.Panels.Serializer, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null">
<Object Type="Vector.CANalyzer.Panels.Runtime.Panel, Vector.CANalyzer.Panels.Common, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null" Name="Panel" Children="Controls" ControlName="DEU Power">
<Object Type="Vector.CANalyzer.Panels.Design.SwitchControl, Vector.CANalyzer.Panels.CommonControls, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null" Name="SwitchControl10" ControlName="Switch/Indicator">
<Property Name="Name">SwitchControl10</Property>
<Property Name="Size">13, 13</Property>
<Property Name="Location">38, 314</Property>
<Property Name="StateCnt">3</Property>
<Property Name="SwitchValues">1;3;0;1;-1</Property>
<Property Name="ImageFile">leds.png</Property>
<Property Name="SymbolConfiguration">4;16;Airbus;;;DeuPower_Input;1;;;-1</Property>
<Property Name="TabIndex">10</Property>
<Property Name="ReadOnlyControl">True</Property>
</Object>
<Object Type="Vector.CANalyzer.Panels.Design.StaticTextControl, Vector.CANalyzer.Panels.CommonControls, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null" Name="StaticTextControl2" Children="Controls" ControlName="Input">
<Property Name="Name">StaticTextControl2</Property>
<Property Name="Size">34, 13</Property>
<Property Name="Location">3, 314</Property>
<Property Name="Text">Input:</Property>
</Object>
<Object Type="Vector.CANalyzer.Panels.Design.StaticTextControl, Vector.CANalyzer.Panels.CommonControls, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null" Name="StaticTextControl1" Children="Controls" ControlName="Static Text">
<Property Name="Name">StaticTextControl1</Property>
<Property Name="Size">68, 13</Property>
<Property Name="Location">52, 5</Property>
<Property Name="Size">117, 16</Property>
<Property Name="Location">28, 5</Property>
<Property Name="BackColor">Transparent</Property>
<Property Name="Font">Microsoft Sans Serif, 9.75pt, style=Bold</Property>
<Property Name="TextAlign">TopCenter</Property>
<Property Name="Text">TL CUT OFF</Property>
</Object>
<Object Type="Vector.CANalyzer.Panels.Design.SwitchControl, Vector.CANalyzer.Panels.CommonControls, Version=8.2.40.0, Culture=neutral, PublicKeyToken=null" Name="SwitchControl5" ControlName="Switch/Indicator 2">

258
Modbus-CAPL/include/SysVars/airbus.vmap
View File

@ -145,7 +145,7 @@
<VariableType>1</VariableType>
</ValueObject1>
<ValueObject2 ItemType="symSystemVariable">
<BusType>0</BusType>
<BusType>5</BusType>
<DatabaseName>Ethernet1::Client_3::Data::InputBits</DatabaseName>
<Description />
<EnvVarName />
@ -288,4 +288,260 @@
<VariableType>5</VariableType>
</ValueObject2>
</MappingRelation>
<MappingRelation Active="True" DirectionVar1ToVar2="True" Offset="0" Factor="1" Assignment="OnChange">
<ValueObject1 ItemType="symSystemVariable">
<BusType>-1</BusType>
<DatabaseName>Airbus::DEU228RH06::DC1_E</DatabaseName>
<Description />
<EnvVarName />
<FullName>Airbus::DEU228RH06::DC1_E</FullName>
<ID>2</ID>
<MessageName />
<Name>Airbus::DEU228RH06::DC1_E</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>1</VariableType>
</ValueObject1>
<ValueObject2 ItemType="symSystemVariable">
<BusType>9</BusType>
<DatabaseName>Ethernet1::Client_2::Data::OutputBits</DatabaseName>
<Description />
<EnvVarName />
<FullName>Ethernet1::Client_2::Data::OutputBits</FullName>
<ID>5</ID>
<MessageName />
<Name>Ethernet1::Client_2::Data::OutputBits</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>5</VariableType>
</ValueObject2>
</MappingRelation>
<MappingRelation Active="True" DirectionVar1ToVar2="True" Offset="0" Factor="1" Assignment="OnChange">
<ValueObject1 ItemType="symSystemVariable">
<BusType>-1</BusType>
<DatabaseName>Airbus::DEU228RH06::DC1_N</DatabaseName>
<Description />
<EnvVarName />
<FullName>Airbus::DEU228RH06::DC1_N</FullName>
<ID>2</ID>
<MessageName />
<Name>Airbus::DEU228RH06::DC1_N</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>1</VariableType>
</ValueObject1>
<ValueObject2 ItemType="symSystemVariable">
<BusType>11</BusType>
<DatabaseName>Ethernet1::Client_2::Data::OutputBits</DatabaseName>
<Description />
<EnvVarName />
<FullName>Ethernet1::Client_2::Data::OutputBits</FullName>
<ID>5</ID>
<MessageName />
<Name>Ethernet1::Client_2::Data::OutputBits</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>5</VariableType>
</ValueObject2>
</MappingRelation>
<MappingRelation Active="True" DirectionVar1ToVar2="True" Offset="0" Factor="1" Assignment="OnChange">
<ValueObject1 ItemType="symSystemVariable">
<BusType>-1</BusType>
<DatabaseName>Airbus::DEU228RH06::DC2_E</DatabaseName>
<Description />
<EnvVarName />
<FullName>Airbus::DEU228RH06::DC2_E</FullName>
<ID>2</ID>
<MessageName />
<Name>Airbus::DEU228RH06::DC2_E</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>1</VariableType>
</ValueObject1>
<ValueObject2 ItemType="symSystemVariable">
<BusType>8</BusType>
<DatabaseName>Ethernet1::Client_2::Data::OutputBits</DatabaseName>
<Description />
<EnvVarName />
<FullName>Ethernet1::Client_2::Data::OutputBits</FullName>
<ID>5</ID>
<MessageName />
<Name>Ethernet1::Client_2::Data::OutputBits</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>5</VariableType>
</ValueObject2>
</MappingRelation>
<MappingRelation Active="True" DirectionVar1ToVar2="True" Offset="0" Factor="1" Assignment="OnChange">
<ValueObject1 ItemType="symSystemVariable">
<BusType>-1</BusType>
<DatabaseName>Airbus::DEU228RH06::DC2_N</DatabaseName>
<Description />
<EnvVarName />
<FullName>Airbus::DEU228RH06::DC2_N</FullName>
<ID>2</ID>
<MessageName />
<Name>Airbus::DEU228RH06::DC2_N</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>1</VariableType>
</ValueObject1>
<ValueObject2 ItemType="symSystemVariable">
<BusType>10</BusType>
<DatabaseName>Ethernet1::Client_2::Data::OutputBits</DatabaseName>
<Description />
<EnvVarName />
<FullName>Ethernet1::Client_2::Data::OutputBits</FullName>
<ID>5</ID>
<MessageName />
<Name>Ethernet1::Client_2::Data::OutputBits</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>5</VariableType>
</ValueObject2>
</MappingRelation>
<MappingRelation Active="True" DirectionVar1ToVar2="True" Offset="0" Factor="1" Assignment="OnChange">
<ValueObject1 ItemType="symSystemVariable">
<BusType>-1</BusType>
<DatabaseName>Airbus::DEU229RH06::DC1_E</DatabaseName>
<Description />
<EnvVarName />
<FullName>Airbus::DEU229RH06::DC1_E</FullName>
<ID>2</ID>
<MessageName />
<Name>Airbus::DEU229RH06::DC1_E</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>1</VariableType>
</ValueObject1>
<ValueObject2 ItemType="symSystemVariable">
<BusType>13</BusType>
<DatabaseName>Ethernet1::Client_2::Data::OutputBits</DatabaseName>
<Description />
<EnvVarName />
<FullName>Ethernet1::Client_2::Data::OutputBits</FullName>
<ID>5</ID>
<MessageName />
<Name>Ethernet1::Client_2::Data::OutputBits</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>5</VariableType>
</ValueObject2>
</MappingRelation>
<MappingRelation Active="True" DirectionVar1ToVar2="True" Offset="0" Factor="1" Assignment="OnChange">
<ValueObject1 ItemType="symSystemVariable">
<BusType>-1</BusType>
<DatabaseName>Airbus::DEU229RH06::DC1_N</DatabaseName>
<Description />
<EnvVarName />
<FullName>Airbus::DEU229RH06::DC1_N</FullName>
<ID>2</ID>
<MessageName />
<Name>Airbus::DEU229RH06::DC1_N</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>1</VariableType>
</ValueObject1>
<ValueObject2 ItemType="symSystemVariable">
<BusType>15</BusType>
<DatabaseName>Ethernet1::Client_2::Data::OutputBits</DatabaseName>
<Description />
<EnvVarName />
<FullName>Ethernet1::Client_2::Data::OutputBits</FullName>
<ID>5</ID>
<MessageName />
<Name>Ethernet1::Client_2::Data::OutputBits</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>5</VariableType>
</ValueObject2>
</MappingRelation>
<MappingRelation Active="True" DirectionVar1ToVar2="True" Offset="0" Factor="1" Assignment="OnChange">
<ValueObject1 ItemType="symSystemVariable">
<BusType>-1</BusType>
<DatabaseName>Airbus::DEU229RH06::DC2_E</DatabaseName>
<Description />
<EnvVarName />
<FullName>Airbus::DEU229RH06::DC2_E</FullName>
<ID>2</ID>
<MessageName />
<Name>Airbus::DEU229RH06::DC2_E</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>1</VariableType>
</ValueObject1>
<ValueObject2 ItemType="symSystemVariable">
<BusType>12</BusType>
<DatabaseName>Ethernet1::Client_2::Data::OutputBits</DatabaseName>
<Description />
<EnvVarName />
<FullName>Ethernet1::Client_2::Data::OutputBits</FullName>
<ID>5</ID>
<MessageName />
<Name>Ethernet1::Client_2::Data::OutputBits</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>5</VariableType>
</ValueObject2>
</MappingRelation>
<MappingRelation Active="True" DirectionVar1ToVar2="True" Offset="0" Factor="1" Assignment="OnChange">
<ValueObject1 ItemType="symSystemVariable">
<BusType>-1</BusType>
<DatabaseName>Airbus::DEU229RH06::DC2_N</DatabaseName>
<Description />
<EnvVarName />
<FullName>Airbus::DEU229RH06::DC2_N</FullName>
<ID>2</ID>
<MessageName />
<Name>Airbus::DEU229RH06::DC2_N</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>1</VariableType>
</ValueObject1>
<ValueObject2 ItemType="symSystemVariable">
<BusType>14</BusType>
<DatabaseName>Ethernet1::Client_2::Data::OutputBits</DatabaseName>
<Description />
<EnvVarName />
<FullName>Ethernet1::Client_2::Data::OutputBits</FullName>
<ID>5</ID>
<MessageName />
<Name>Ethernet1::Client_2::Data::OutputBits</Name>
<NeedsMessage>False</NeedsMessage>
<NetworkName />
<NodeName />
<SignalName />
<VariableType>5</VariableType>
</ValueObject2>
</MappingRelation>
</Mapping>

19
Modbus-CAPL/include/SysVars/airbus.vsysvar
View File

@ -28,25 +28,25 @@
</namespace>
<namespace name="DEU228RH06" comment="">
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="B_DC1_E" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="B_DC2_N" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="DC2_E" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="B_DC1_N" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="B_DC2_E" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="B_DC2_N" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="DC2_N" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="DC1_E" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="DC1_N" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="DC2_E" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="DC2_N" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="E" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="N" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
</namespace>
<namespace name="DEU229RH06" comment="">
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="B_DC1_E" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="B_DC2_N" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="DC2_E" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="B_DC1_N" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="B_DC2_E" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="B_DC2_N" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="DC2_N" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="DC1_E" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="DC1_N" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="DC2_E" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="DC2_N" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="E" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="N" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
</namespace>
@ -55,6 +55,13 @@
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="ESS_DC2" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="NORM_DC2" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="TL_CUT_OFF" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" />
<variable anlyzLocal="2" readOnly="false" valueSequence="false" unit="" name="DeuPower_Input" comment="" bitcount="32" isSigned="true" encoding="65001" type="int" startValue="1" minValue="0" minValuePhys="0" maxValue="2" maxValuePhys="2">
<valuetable definesMinMax="true">
<valuetableentry value="0" description="Off" />
<valuetableentry value="1" description="On" />
<valuetableentry value="2" description="Invalid" />
</valuetable>
</variable>
</namespace>
</namespace>
</systemvariables>