diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 372f5660..dcb4d28c 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -34,11 +34,11 @@ <object-name>FAC1Btn1F</object-name> <object-name>FAC1Btn2O</object-name> <object-name>IR1Btn1F</object-name> - <object-name>IR1Btn2A</object-name> + <object-name>IR1Btn2O</object-name> <object-name>IR2Btn1F</object-name> - <object-name>IR2Btn2A</object-name> + <object-name>IR2Btn2O</object-name> <object-name>IR3Btn1F</object-name> - <object-name>IR3Btn2A</object-name> + <object-name>IR3Btn2O</object-name> <object-name>RamAirBtn2O</object-name> <object-name>SEC1Btn1F</object-name> <object-name>SEC1Btn2O</object-name> @@ -608,7 +608,7 @@ </animation> <animation> <type>select</type> - <object-name>IR1Btn2A</object-name> + <object-name>IR1Btn2O</object-name> <condition> <or> <equals> @@ -704,7 +704,7 @@ </animation> <animation> <type>select</type> - <object-name>IR2Btn2A</object-name> + <object-name>IR2Btn2O</object-name> <condition> <or> <equals> @@ -800,7 +800,7 @@ </animation> <animation> <type>select</type> - <object-name>IR3Btn2A</object-name> + <object-name>IR3Btn2O</object-name> <condition> <or> <equals> diff --git a/Models/Instruments/OHpanel/res/ohpanel.ac b/Models/Instruments/OHpanel/res/ohpanel.ac index 2522d761..532cc1d7 100644 --- a/Models/Instruments/OHpanel/res/ohpanel.ac +++ b/Models/Instruments/OHpanel/res/ohpanel.ac @@ -32096,13 +32096,13 @@ refs 4 SURF 0X32 mat 9 refs 2 -129 0 0 -142 0 0 +128 0 0 +139 0 0 SURF 0X32 mat 9 refs 2 -128 0 0 -139 0 0 +129 0 0 +142 0 0 kids 0 OBJECT poly name "Eng2FireTst" @@ -43564,11 +43564,11 @@ refs 4 4 0.5 0 kids 0 OBJECT poly -name "IR1Btn2A" +name "IR1Btn2O" data 9 Cube.1025 crease 30.0 -texture "buttons3.png" +texture "buttons2.png" texrep 1 1 numvert 8 0.00773 0.19745 0.28598 @@ -44081,11 +44081,11 @@ refs 4 6 0 0.5 kids 0 OBJECT poly -name "IR2Btn2A" +name "IR2Btn2O" data 9 Cube.1029 crease 30.0 -texture "buttons3.png" +texture "buttons2.png" texrep 1 1 numvert 8 -0.00317 0.19745 0.19429 @@ -44690,11 +44690,11 @@ refs 4 4 0.5 0 kids 0 OBJECT poly -name "IR3Btn2A" +name "IR3Btn2O" data 9 Cube.1027 crease 30.0 -texture "buttons3.png" +texture "buttons2.png" texrep 1 1 numvert 8 -0.00046 0.20745 0.24088 diff --git a/Nasal/Systems/ADIRS/ADR.nas b/Nasal/Systems/ADIRS/ADR.nas index 1c9ebe37..18e25c77 100644 --- a/Nasal/Systems/ADIRS/ADR.nas +++ b/Nasal/Systems/ADIRS/ADR.nas @@ -80,7 +80,7 @@ var ADIRU = { ADIRS.Lights.adrOff[me.num].setValue(!ADIRS.Switches.adrSw[me.num].getValue()); ADIRS.Lights.adrFault[me.num].setValue(0); ADIRS.Lights.irFault[me.num].setValue(0); - ADIRS.Lights.irOff[me.num].setValue(!ADIRS.Switches.irSw[me.num].getValue()); + ADIRS.Lights.irOff[me.num].setValue(0); }, 1.1); ADIRS.selfTest();