diff --git a/Modbus-CAPL/include/CAPL/DEU Power.can b/Modbus-CAPL/include/CAPL/DEU Power.can
index 9054d0f..7ba5f96 100644
--- a/Modbus-CAPL/include/CAPL/DEU Power.can
+++ b/Modbus-CAPL/include/CAPL/DEU Power.can
@@ -15,6 +15,8 @@ on sysvar sysvar::Airbus::ESS_DC1
{
@sysvar::Airbus::DEU223RH06::B_DC1_E=@this;
@sysvar::Airbus::DEU226RH06::B_DC1_E=@this;
+ @sysvar::Airbus::DEU228RH06::B_DC1_E=@this;
+ @sysvar::Airbus::DEU229RH06::B_DC1_E=@this;
}
}
@@ -24,6 +26,8 @@ on sysvar sysvar::Airbus::ESS_DC2
{
@sysvar::Airbus::DEU223RH06::B_DC2_E=@this;
@sysvar::Airbus::DEU226RH06::B_DC2_E=@this;
+ @sysvar::Airbus::DEU228RH06::B_DC2_E=@this;
+ @sysvar::Airbus::DEU229RH06::B_DC2_E=@this;
}
}
@@ -33,6 +37,8 @@ on sysvar sysvar::Airbus::NORM_DC1
{
@sysvar::Airbus::DEU223RH06::B_DC1_N=@this;
@sysvar::Airbus::DEU226RH06::B_DC1_N=@this;
+ @sysvar::Airbus::DEU228RH06::B_DC1_N=@this;
+ @sysvar::Airbus::DEU229RH06::B_DC1_N=@this;
}
}
@@ -42,9 +48,13 @@ on sysvar sysvar::Airbus::NORM_DC2
{
@sysvar::Airbus::DEU223RH06::B_DC2_N=@this;
@sysvar::Airbus::DEU226RH06::B_DC2_N=@this;
+ @sysvar::Airbus::DEU228RH06::B_DC2_N=@this;
+ @sysvar::Airbus::DEU229RH06::B_DC2_N=@this;
};
}
+
+
on sysvar sysvar::Airbus::DEU223RH06::B_DC1_E
{
if (@this)
@@ -78,6 +88,7 @@ on sysvar sysvar::Airbus::DEU223RH06::B_DC2_N
}
+
on sysvar sysvar::Airbus::DEU226RH06::B_DC1_E
{
if (@this)
@@ -111,6 +122,76 @@ on sysvar sysvar::Airbus::DEU226RH06::B_DC2_N
update();
}
+
+
+on sysvar sysvar::Airbus::DEU228RH06::B_DC1_E
+{
+ if (@this)
+ @sysvar::Airbus::DEU228RH06::B_DC2_E=0;
+
+ update();
+}
+
+on sysvar sysvar::Airbus::DEU228RH06::B_DC2_E
+{
+ if (@this)
+ @sysvar::Airbus::DEU228RH06::B_DC1_E=0;
+
+ update();
+}
+
+on sysvar sysvar::Airbus::DEU228RH06::B_DC1_N
+{
+ if (@this)
+ @sysvar::Airbus::DEU228RH06::B_DC2_N=0;
+
+ update();
+}
+
+on sysvar sysvar::Airbus::DEU228RH06::B_DC2_N
+{
+ if (@this)
+ @sysvar::Airbus::DEU228RH06::B_DC1_N=0;
+
+ update();
+}
+
+
+
+on sysvar sysvar::Airbus::DEU229RH06::B_DC1_E
+{
+ if (@this)
+ @sysvar::Airbus::DEU229RH06::B_DC2_E=0;
+
+ update();
+}
+
+on sysvar sysvar::Airbus::DEU229RH06::B_DC2_E
+{
+ if (@this)
+ @sysvar::Airbus::DEU229RH06::B_DC1_E=0;
+
+ update();
+}
+
+on sysvar sysvar::Airbus::DEU229RH06::B_DC1_N
+{
+ if (@this)
+ @sysvar::Airbus::DEU229RH06::B_DC2_N=0;
+
+ update();
+}
+
+on sysvar sysvar::Airbus::DEU229RH06::B_DC2_N
+{
+ if (@this)
+ @sysvar::Airbus::DEU229RH06::B_DC1_N=0;
+
+ update();
+}
+
+
+
on sysvar sysvar::Airbus::TL_CUT_OFF
{
update();
@@ -126,13 +207,25 @@ void update()
@sysvar::Airbus::DEU226RH06::DC1_N = @sysvar::Airbus::DEU226RH06::B_DC1_N && @sysvar::Airbus::TL_CUT_OFF;
@sysvar::Airbus::DEU226RH06::DC2_E = @sysvar::Airbus::DEU226RH06::B_DC2_E && @sysvar::Airbus::TL_CUT_OFF;
@sysvar::Airbus::DEU226RH06::DC2_N = @sysvar::Airbus::DEU226RH06::B_DC2_N && @sysvar::Airbus::TL_CUT_OFF;
+ @sysvar::Airbus::DEU228RH06::DC1_E = @sysvar::Airbus::DEU228RH06::B_DC1_E && @sysvar::Airbus::TL_CUT_OFF;
+ @sysvar::Airbus::DEU228RH06::DC1_N = @sysvar::Airbus::DEU228RH06::B_DC1_N && @sysvar::Airbus::TL_CUT_OFF;
+ @sysvar::Airbus::DEU228RH06::DC2_E = @sysvar::Airbus::DEU228RH06::B_DC2_E && @sysvar::Airbus::TL_CUT_OFF;
+ @sysvar::Airbus::DEU228RH06::DC2_N = @sysvar::Airbus::DEU228RH06::B_DC2_N && @sysvar::Airbus::TL_CUT_OFF;
+ @sysvar::Airbus::DEU229RH06::DC1_E = @sysvar::Airbus::DEU229RH06::B_DC1_E && @sysvar::Airbus::TL_CUT_OFF;
+ @sysvar::Airbus::DEU229RH06::DC1_N = @sysvar::Airbus::DEU229RH06::B_DC1_N && @sysvar::Airbus::TL_CUT_OFF;
+ @sysvar::Airbus::DEU229RH06::DC2_E = @sysvar::Airbus::DEU229RH06::B_DC2_E && @sysvar::Airbus::TL_CUT_OFF;
+ @sysvar::Airbus::DEU229RH06::DC2_N = @sysvar::Airbus::DEU229RH06::B_DC2_N && @sysvar::Airbus::TL_CUT_OFF;
if (@sysvar::Airbus::TL_CUT_OFF == -1) // value could not be read
{
@sysvar::Airbus::DEU223RH06::E = -1;
- @sysvar::Airbus::DEU223RH06::N = -1;
+ @sysvar::Airbus::DEU223RH06::N = -1;
@sysvar::Airbus::DEU226RH06::E = -1;
- @sysvar::Airbus::DEU226RH06::N = -1;
+ @sysvar::Airbus::DEU226RH06::N = -1;
+ @sysvar::Airbus::DEU228RH06::E = -1;
+ @sysvar::Airbus::DEU228RH06::N = -1;
+ @sysvar::Airbus::DEU229RH06::E = -1;
+ @sysvar::Airbus::DEU229RH06::N = -1;
}
else
{
@@ -141,6 +234,12 @@ void update()
@sysvar::Airbus::DEU226RH06::E = (@sysvar::Airbus::DEU226RH06::B_DC1_E || @sysvar::Airbus::DEU226RH06::B_DC2_E);
@sysvar::Airbus::DEU226RH06::N = (@sysvar::Airbus::DEU226RH06::B_DC1_N || @sysvar::Airbus::DEU226RH06::B_DC2_N);
+
+ @sysvar::Airbus::DEU228RH06::E = (@sysvar::Airbus::DEU228RH06::B_DC1_E || @sysvar::Airbus::DEU228RH06::B_DC2_E);
+ @sysvar::Airbus::DEU228RH06::N = (@sysvar::Airbus::DEU228RH06::B_DC1_N || @sysvar::Airbus::DEU228RH06::B_DC2_N);
+
+ @sysvar::Airbus::DEU229RH06::E = (@sysvar::Airbus::DEU229RH06::B_DC1_E || @sysvar::Airbus::DEU229RH06::B_DC2_E);
+ @sysvar::Airbus::DEU229RH06::N = (@sysvar::Airbus::DEU229RH06::B_DC1_N || @sysvar::Airbus::DEU229RH06::B_DC2_N);
}
}
diff --git a/Modbus-CAPL/include/Panels/DEU_Power.xvp b/Modbus-CAPL/include/Panels/DEU_Power.xvp
index 66dabbf..c8f8ade 100644
--- a/Modbus-CAPL/include/Panels/DEU_Power.xvp
+++ b/Modbus-CAPL/include/Panels/DEU_Power.xvp
@@ -4,14 +4,14 @@
+
CheckBoxControl5
@@ -55,12 +116,12 @@
SwitchControl3
60, 60
- 107, 88
+ 99, 88
3
1;3;0;1;-1
leds.png
4;16;Airbus::DEU226RH06;;;E;1;;;-1
- 5
+ 0
True
@@ -71,7 +132,7 @@
1;3;0;1;-1
leds.png
4;16;Airbus::DEU226RH06;;;N;1;;;-1
- 4
+ 0
True
GroupBoxControl2
@@ -80,6 +141,67 @@
226RH06
6
+
+
+ CheckBoxControl9
+ 75, 17
+ 14, 53
+ DC2 Norm
+ 4;16;Airbus::DEU228RH06;;;B_DC2_N;1;;;-1
+ 9
+
+
+ CheckBoxControl10
+ 67, 17
+ 99, 30
+ DC1 Ess
+ 4;16;Airbus::DEU228RH06;;;B_DC1_E;1;;;-1
+ 8
+
+
+ CheckBoxControl11
+ 67, 17
+ 99, 53
+ DC2 Ess
+ 4;16;Airbus::DEU228RH06;;;B_DC2_E;1;;;-1
+ 7
+
+
+ CheckBoxControl12
+ 75, 17
+ 14, 30
+ DC1 Norm
+ 4;16;Airbus::DEU228RH06;;;B_DC1_N;1;;;-1
+ 6
+
+
+ SwitchControl6
+ 60, 60
+ 21, 88
+ 3
+ 1;3;0;1;-1
+ J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus-CAPL\include\Panels\leds.png
+ 4;16;Airbus::DEU228RH06;;;N;1;;;-1
+ 0
+ True
+
+
+ SwitchControl7
+ 60, 60
+ 99, 88
+ 3
+ 1;3;0;1;-1
+ J:\HsKA\NB7\Bachelorthesis\CANoe\Modbus-CAPL\include\Panels\leds.png
+ 4;16;Airbus::DEU228RH06;;;E;1;;;-1
+ 0
+ True
+
+ GroupBoxControl3
+ 181, 158
+ 176, 167
+ 228RH06
+ 4
+
CheckBoxControl4
@@ -121,7 +243,7 @@
1;3;0;1;-1
leds.png
4;16;Airbus::DEU223RH06;;;E;1;;;-1
- 5
+ 0
True
@@ -132,7 +254,7 @@
1;3;0;1;-1
leds.png
4;16;Airbus::DEU223RH06;;;N;1;;;-1
- 4
+ 0
True
GroupBoxControl1
@@ -144,7 +266,7 @@
ButtonControl4
75, 38
- 89, 98
+ 89, 123
Norm DC1
4;16;Airbus;;;NORM_DC1;1;;;-1
3
@@ -152,7 +274,7 @@
ButtonControl3
75, 38
- 89, 142
+ 89, 167
Norm DC2
4;16;Airbus;;;NORM_DC2;1;;;-1
2
@@ -160,7 +282,7 @@
ButtonControl2
75, 38
- 3, 142
+ 3, 167
Ess DC2
4;16;Airbus;;;ESS_DC2;1;;;-1
1
@@ -168,12 +290,12 @@
ButtonControl1
75, 38
- 3, 98
+ 3, 123
Ess DC1
4;16;Airbus;;;ESS_DC1;1;;;-1
0
Panel
- 549, 183
+ 549, 330
\ No newline at end of file
diff --git a/Modbus-CAPL/include/SysVars/airbus.vsysvar b/Modbus-CAPL/include/SysVars/airbus.vsysvar
index 623dcf9..ce95a8f 100644
--- a/Modbus-CAPL/include/SysVars/airbus.vsysvar
+++ b/Modbus-CAPL/include/SysVars/airbus.vsysvar
@@ -26,6 +26,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Modbus-CAPL/include/SysVars/generated.vsysvar b/Modbus-CAPL/include/SysVars/generated.vsysvar
index 3775830..e9bc12c 100644
--- a/Modbus-CAPL/include/SysVars/generated.vsysvar
+++ b/Modbus-CAPL/include/SysVars/generated.vsysvar
@@ -1,16 +1,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -67,5 +57,15 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file