diff --git a/Modbus-CAPL/include/CAPL/DEU Power.can b/Modbus-CAPL/include/CAPL/DEU Power.can index 7ba5f96..2cf7e15 100644 --- a/Modbus-CAPL/include/CAPL/DEU Power.can +++ b/Modbus-CAPL/include/CAPL/DEU Power.can @@ -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"); +} \ No newline at end of file diff --git a/Modbus-CAPL/include/Panels/DEU_Power.xvp b/Modbus-CAPL/include/Panels/DEU_Power.xvp index c8f8ade..702dc8a 100644 --- a/Modbus-CAPL/include/Panels/DEU_Power.xvp +++ b/Modbus-CAPL/include/Panels/DEU_Power.xvp @@ -1,11 +1,30 @@ + + SwitchControl10 + 13, 13 + 38, 314 + 3 + 1;3;0;1;-1 + leds.png + 4;16;Airbus;;;DeuPower_Input;1;;;-1 + 10 + True + + + StaticTextControl2 + 34, 13 + 3, 314 + Input: + StaticTextControl1 - 68, 13 - 52, 5 + 117, 16 + 28, 5 Transparent + Microsoft Sans Serif, 9.75pt, style=Bold + TopCenter TL CUT OFF diff --git a/Modbus-CAPL/include/SysVars/airbus.vmap b/Modbus-CAPL/include/SysVars/airbus.vmap index faf2817..d49c5d9 100644 --- a/Modbus-CAPL/include/SysVars/airbus.vmap +++ b/Modbus-CAPL/include/SysVars/airbus.vmap @@ -145,7 +145,7 @@ 1 - 0 + 5 Ethernet1::Client_3::Data::InputBits @@ -288,4 +288,260 @@ 5 + + + -1 + Airbus::DEU228RH06::DC1_E + + + Airbus::DEU228RH06::DC1_E + 2 + + Airbus::DEU228RH06::DC1_E + False + + + + 1 + + + 9 + Ethernet1::Client_2::Data::OutputBits + + + Ethernet1::Client_2::Data::OutputBits + 5 + + Ethernet1::Client_2::Data::OutputBits + False + + + + 5 + + + + + -1 + Airbus::DEU228RH06::DC1_N + + + Airbus::DEU228RH06::DC1_N + 2 + + Airbus::DEU228RH06::DC1_N + False + + + + 1 + + + 11 + Ethernet1::Client_2::Data::OutputBits + + + Ethernet1::Client_2::Data::OutputBits + 5 + + Ethernet1::Client_2::Data::OutputBits + False + + + + 5 + + + + + -1 + Airbus::DEU228RH06::DC2_E + + + Airbus::DEU228RH06::DC2_E + 2 + + Airbus::DEU228RH06::DC2_E + False + + + + 1 + + + 8 + Ethernet1::Client_2::Data::OutputBits + + + Ethernet1::Client_2::Data::OutputBits + 5 + + Ethernet1::Client_2::Data::OutputBits + False + + + + 5 + + + + + -1 + Airbus::DEU228RH06::DC2_N + + + Airbus::DEU228RH06::DC2_N + 2 + + Airbus::DEU228RH06::DC2_N + False + + + + 1 + + + 10 + Ethernet1::Client_2::Data::OutputBits + + + Ethernet1::Client_2::Data::OutputBits + 5 + + Ethernet1::Client_2::Data::OutputBits + False + + + + 5 + + + + + -1 + Airbus::DEU229RH06::DC1_E + + + Airbus::DEU229RH06::DC1_E + 2 + + Airbus::DEU229RH06::DC1_E + False + + + + 1 + + + 13 + Ethernet1::Client_2::Data::OutputBits + + + Ethernet1::Client_2::Data::OutputBits + 5 + + Ethernet1::Client_2::Data::OutputBits + False + + + + 5 + + + + + -1 + Airbus::DEU229RH06::DC1_N + + + Airbus::DEU229RH06::DC1_N + 2 + + Airbus::DEU229RH06::DC1_N + False + + + + 1 + + + 15 + Ethernet1::Client_2::Data::OutputBits + + + Ethernet1::Client_2::Data::OutputBits + 5 + + Ethernet1::Client_2::Data::OutputBits + False + + + + 5 + + + + + -1 + Airbus::DEU229RH06::DC2_E + + + Airbus::DEU229RH06::DC2_E + 2 + + Airbus::DEU229RH06::DC2_E + False + + + + 1 + + + 12 + Ethernet1::Client_2::Data::OutputBits + + + Ethernet1::Client_2::Data::OutputBits + 5 + + Ethernet1::Client_2::Data::OutputBits + False + + + + 5 + + + + + -1 + Airbus::DEU229RH06::DC2_N + + + Airbus::DEU229RH06::DC2_N + 2 + + Airbus::DEU229RH06::DC2_N + False + + + + 1 + + + 14 + Ethernet1::Client_2::Data::OutputBits + + + Ethernet1::Client_2::Data::OutputBits + 5 + + Ethernet1::Client_2::Data::OutputBits + False + + + + 5 + + \ No newline at end of file diff --git a/Modbus-CAPL/include/SysVars/airbus.vsysvar b/Modbus-CAPL/include/SysVars/airbus.vsysvar index ce95a8f..7a55acd 100644 --- a/Modbus-CAPL/include/SysVars/airbus.vsysvar +++ b/Modbus-CAPL/include/SysVars/airbus.vsysvar @@ -28,25 +28,25 @@ + + - + - - + + - + - - @@ -55,6 +55,13 @@ + + + + + + + \ No newline at end of file