Merge pull request #214 from DCSFlightpanels/WarLord211-patch-3

Fix for #187 and half #188

Scripts/DCS-BIOS/lib/C-101.lua

@@ -804,27 +804,27 @@ defineToggleSwitch("EB_FRONT_CB_VOR_26", 1,3078,532, "CB Panel", "C-101EB FRONT
 defineToggleSwitch("EB_FRONT_CB_SMOKE_COL", 1,3643,851, "CB Panel", "C-101EB FRONT Circuit Breaker Colour Smoke")
 defineToggleSwitch("EB_FRONT_CB_SMOKE_WH", 1,3644,852, "CB Panel", "C-101EB FRONT Circuit Breaker White Smoke")
 
-defineIndicatorLight("CC_FRONT_WP_LOW_FUEL", 150, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel LOW FUEL Lamp (red)")
-defineIndicatorLight("CC_FRONT_WP_FIRE", 151, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel FIRE Lamp (red)")
-defineIndicatorLight("CC_FRONT_WP_OXY_P", 152, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel OXY PRESS Lamp (red)")
-defineIndicatorLight("CC_FRONT_WP_CANOPY", 153, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel CANOPY Lamp (red)")
-defineIndicatorLight("CC_FRONT_WP_CKPT_P", 154, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel CKPT RESS Lamp (red)")
-defineIndicatorLight("CC_FRONT_WP_HYD_P", 155, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel HYD PRESS Lamp (red)")
-defineIndicatorLight("CC_FRONT_WP_OIL_P", 156, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel OIL PRESS Lamp (red)")
-defineIndicatorLight("CC_FRONT_WP_CHP_DECT", 157, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel CHP DETECT Lamp (red)")
-defineIndicatorLight("CC_FRONT_WP_BAT", 158, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel BATTERY Lamp (red)")
-defineIndicatorLight("CC_FRONT_WP_GEN", 159, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel GENERATOR Lamp (red)")
-defineIndicatorLight("CC_FRONT_WP_FUEL_P", 160, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel FUEL PRESS Lamp (yellow)")
-defineIndicatorLight("CC_FRONT_WP_FUEL_V", 161, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel FUEL VALVE Lamp (yellow)")
-defineIndicatorLight("CC_FRONT_WP_AIR", 162, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel AIR COND Lamp (yellow)")
-defineIndicatorLight("CC_FRONT_WP_GEAR", 163, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel GEAR^ Lamp (yellow)")
-defineIndicatorLight("CC_FRONT_WP_PITOT", 164, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel PITOT HEAT Lamp (yellow)")
-defineIndicatorLight("CC_FRONT_WP_COMP", 165, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel COMPUTER Lamp (yellow)")
-defineIndicatorLight("CC_FRONT_WP_AICE", 166, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel ANTI-ICE Lamp (yellow)")
-defineIndicatorLight("CC_FRONT_WP_AOA", 167, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel AOA/STALL Lamp (yellow)")
-defineIndicatorLight("CC_FRONT_WP_NORM", 168, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel NORM INV Lamp (yellow)")
-defineIndicatorLight("CC_FRONT_WP_STBY", 169, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel STBY INV Lamp (yellow)")
-defineIndicatorLight("CC_FRONT_WP_BUS_ON", 175, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel Bus Transfer ON Lamp (yellow)")
+defineIndicatorLight("CC_FRONT_WARN_LOW_FUEL", 150, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel LOW FUEL Lamp (red)")
+defineIndicatorLight("CC_FRONT_WARN_FIRE", 151, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel FIRE Lamp (red)")
+defineIndicatorLight("CC_FRONT_WARN_OXY_P", 152, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel OXY PRESS Lamp (red)")
+defineIndicatorLight("CC_FRONT_WARN_CANOPY", 153, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel CANOPY Lamp (red)")
+defineIndicatorLight("CC_FRONT_WARN_CKPT_P", 154, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel CKPT RESS Lamp (red)")
+defineIndicatorLight("CC_FRONT_WARN_HYD_P", 155, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel HYD PRESS Lamp (red)")
+defineIndicatorLight("CC_FRONT_WARN_OIL_P", 156, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel OIL PRESS Lamp (red)")
+defineIndicatorLight("CC_FRONT_WARN_CHP_DECT", 157, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel CHP DETECT Lamp (red)")
+defineIndicatorLight("CC_FRONT_WARN_BAT", 158, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel BATTERY Lamp (red)")
+defineIndicatorLight("CC_FRONT_WARN_GEN", 159, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel GENERATOR Lamp (red)")
+defineIndicatorLight("CC_FRONT_WARN_FUEL_P", 160, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel FUEL PRESS Lamp (yellow)")
+defineIndicatorLight("CC_FRONT_WARN_FUEL_V", 161, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel FUEL VALVE Lamp (yellow)")
+defineIndicatorLight("CC_FRONT_WARN_AIR", 162, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel AIR COND Lamp (yellow)")
+defineIndicatorLight("CC_FRONT_WARN_GEAR", 163, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel GEAR^ Lamp (yellow)")
+defineIndicatorLight("CC_FRONT_WARN_PITOT", 164, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel PITOT HEAT Lamp (yellow)")
+defineIndicatorLight("CC_FRONT_WARN_COMP", 165, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel COMPUTER Lamp (yellow)")
+defineIndicatorLight("CC_FRONT_WARN_AICE", 166, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel ANTI-ICE Lamp (yellow)")
+defineIndicatorLight("CC_FRONT_WARN_AOA", 167, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel AOA/STALL Lamp (yellow)")
+defineIndicatorLight("CC_FRONT_WARN_NORM", 168, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel NORM INV Lamp (yellow)")
+defineIndicatorLight("CC_FRONT_WARN_STBY", 169, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel STBY INV Lamp (yellow)")
+defineIndicatorLight("CC_FRONT_WARN_BUS_ON", 175, "Warning, Caution and IndicatorLights", "C-101CC FRONT Warning Panel Bus Transfer ON Lamp (yellow)")
 defineIndicatorLight("CC_FRONT_WARN_L", 170, "Warning, Caution and IndicatorLights", "C-101CC FRONT WARNING Lamp (red)")
 defineIndicatorLight("CC_FRONT_FIRE_L", 171, "Warning, Caution and IndicatorLights", "C-101CC FRONT FIRE Lamp (red)")
 defineIndicatorLight("CC_FRONT_CAUTION_L", 172, "Warning, Caution and IndicatorLights", "C-101CC FRONT CAUTION Lamp (yellow)")

Scripts/DCS-BIOS/lib/MB-339.lua

@@ -1,6 +1,6 @@
 BIOS.protocol.beginModule("MB-339", 0x8200)
 BIOS.protocol.setExportModuleAircrafts({"MB-339A", "MB-339APAN"})
---by WarLord v1.0
+--by WarLord v1.1
 local documentation = moduleBeingDefined.documentation
 
 local document = BIOS.util.document
@@ -368,7 +368,7 @@ defineIndicatorLight08("MCP_BATT2_L", 213, "Warning Panel Light", "NO 2 BATT Lig
 defineIndicatorLight08("MCP_BATT_HOT_L", 214, "Warning Panel Light", "BATT HOT Light (yellow)")
 defineIndicatorLight08("MCP_AC_ESS_BUS_L", 215, "Warning Panel Light", "AC ESS BUS Light (yellow)")
 defineIndicatorLight08("MCP_AC_SEC_BUS_L", 216, "Warning Panel Light", "AC SEC BUS Light (yellow)")
-defineIndicatorLight08("MCP_CKT BKR_L", 217, "Warning Panel Light", "CKT BKR Light (yellow)")
+defineIndicatorLight08("MCP_CKT_BKR_L", 217, "Warning Panel Light", "CKT BKR Light (yellow)")
 defineIndicatorLight08("MCP_AIL_SERVO_L", 218, "Warning Panel Light", "AIL SERVO Light (yellow)")
 defineIndicatorLight08("MCP_OXY_LOW_L", 219, "Warning Panel Light", "OXY LOW Light (yellow)")
 defineIndicatorLight08("MCP_DUCT_AICE_L", 220, "Warning Panel Light", "DUCT ANTI-ICE Light (yellow)")
@@ -458,18 +458,18 @@ definePushButton("AFT_CONTROL_COM1", 1, 3234, 267, "Control Shift AFT", "Aft COM
 definePushButton("AFT_CONTROL_COM2", 1, 3235, 269, "Control Shift AFT", "Aft COMM2 Control Shift")
 definePushButton("AFT_CONTROL_ADF", 1, 3236, 271, "Control Shift AFT", "Aft ADF Control Shift")
 
-defineIndicatorLight08("FW_CONTROL_TCN", 325, "Control Shift Lights", "Forward TACAN Control Shift Light (green)")
-defineIndicatorLight08("FW_CONTROL_ILS", 327, "Control Shift Lights", "Forward VOR-ILS Control Shift Light (green)")
-defineIndicatorLight08("FW_CONTROL_NAV", 385, "Control Shift Lights", "Forward NAV Control Shift Light (green)")
+defineIndicatorLight08("FW_CONTROL_TCN_L", 325, "Control Shift Lights", "Forward TACAN Control Shift Light (green)")
+defineIndicatorLight08("FW_CONTROL_ILS_L", 327, "Control Shift Lights", "Forward VOR-ILS Control Shift Light (green)")
+defineIndicatorLight08("FW_CONTROL_NAV_L", 385, "Control Shift Lights", "Forward NAV Control Shift Light (green)")
 defineIndicatorLight08("FW_CONTROL_COM1_L", 308, "Control Shift Lights", "Forward COMM1 Control Shift Light (green)")
 defineIndicatorLight08("FW_CONTROL_COM2_L", 316, "Control Shift Lights", "Forward COMM2 Control Shift Light (green)")
-defineIndicatorLight08("FW_CONTROL_ADF", 318, "Control Shift Lights", "Forward ADF Control Shift Light (green)")
-defineIndicatorLight08("AFT_CONTROL_TCN", 274, "Control Shift Lights", "Aft TACAN Control Shift Light (green)")
-defineIndicatorLight08("AFT_CONTROL_ILS", 276, "Control Shift Lights", "Aft VOR-ILS Control Shift Light (green)")
-defineIndicatorLight08("AFT_CONTROL_NAV", 278, "Control Shift Lights", "Aft NAV Control Shift Light (green)")
+defineIndicatorLight08("FW_CONTROL_ADF_L", 318, "Control Shift Lights", "Forward ADF Control Shift Light (green)")
+defineIndicatorLight08("AFT_CONTROL_TCN_L", 274, "Control Shift Lights", "Aft TACAN Control Shift Light (green)")
+defineIndicatorLight08("AFT_CONTROL_ILS_L", 276, "Control Shift Lights", "Aft VOR-ILS Control Shift Light (green)")
+defineIndicatorLight08("AFT_CONTROL_NAV_L", 278, "Control Shift Lights", "Aft NAV Control Shift Light (green)")
 defineIndicatorLight08("AFT_CONTROL_COM1_L", 268, "Control Shift Lights", "Aft COMM1 Control Shift Light (green)")
 defineIndicatorLight08("AFT_CONTROL_COM2_L", 270, "Control Shift Lights", "Aft COMM2 Control Shift Light (green)")
-defineIndicatorLight08("AFT_CONTROL_ADF", 272, "Control Shift Lights", "Aft ADF Control Shift Light (green)")
+defineIndicatorLight08("AFT_CONTROL_ADF_L", 272, "Control Shift Lights", "Aft ADF Control Shift Light (green)")
 
 --CDU
 defineToggleSwitch("FW_CDU_GPS_PW", 1, 3237, 345, "CDU FW", "Forward CDU AHRS/GPS System")
@@ -552,12 +552,12 @@ defineFloat("WP_SEQU_G", 161, {0, 1}, "Weapons Gauges", "Sequence Drum")
 defineFloat("WP_BOMB_FUZE_G", 162, {-1, 1}, "Weapons Gauges", "Bomb Fuze Drum")
 
 defineIndicatorLight("WP_MASTER_ARM_L", 163, "Weapons Lights", "Master Arm Light (red)")
-defineIndicatorLight("WP_STAT1_G", 496, "Weapons Lights", "Station 1 Light (green)")
-defineIndicatorLight("WP_STAT2_G", 497, "Weapons Lights", "Station 2 Light (green)")
-defineIndicatorLight("WP_STAT3_G", 498, "Weapons Lights", "Station 3 Light (green)")
-defineIndicatorLight("WP_STAT4_G", 499, "Weapons Lights", "Station 4 Light (green)")
-defineIndicatorLight("WP_STAT5_G", 500, "Weapons Lights", "Station 5 Light (green)")
-defineIndicatorLight("WP_STAT6_G", 501, "Weapons Lights", "Station 6 Light (green)")
+defineIndicatorLight("WP_STAT1_L", 496, "Weapons Lights", "Station 1 Light (green)")
+defineIndicatorLight("WP_STAT2_L", 497, "Weapons Lights", "Station 2 Light (green)")
+defineIndicatorLight("WP_STAT3_L", 498, "Weapons Lights", "Station 3 Light (green)")
+defineIndicatorLight("WP_STAT4_L", 499, "Weapons Lights", "Station 4 Light (green)")
+defineIndicatorLight("WP_STAT5_L", 500, "Weapons Lights", "Station 5 Light (green)")
+defineIndicatorLight("WP_STAT6_L", 501, "Weapons Lights", "Station 6 Light (green)")
 
 --Gunsight
 define3PosTumb("GUN_PWR", 1, 3304, 478, "Gunsight", "Gunsight Power")