From 5bd0b6dd98dbe43f4e2af2d83387f1ac7ff2c36f Mon Sep 17 00:00:00 2001 From: mcmicha Date: Thu, 5 Oct 2017 21:47:44 +0200 Subject: [PATCH] Add function call to ExportScript.AF.FC_EngineLamps_SU2733() for Engine Start and Afterburner lamps... Delete old Engine Start and Afterburner lamps export. --- .../DCS-ExportScript/ExportsModules/Su-27.lua | 21 ++++--------------- .../DCS-ExportScript/ExportsModules/Su-33.lua | 21 ++++--------------- 2 files changed, 8 insertions(+), 34 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/Su-27.lua b/Scripts/DCS-ExportScript/ExportsModules/Su-27.lua index 8e2c062..72289f7 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/Su-27.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/Su-27.lua @@ -134,14 +134,11 @@ function ExportScript.ProcessIkarusFCLowImportanceConfig() -- Hydraulic Pressure Right ExportScript.AF.FC_OneNeedleGauge(lEngineInfo.HydraulicPressure.right, 240, 86) - - ExportScript.Tools.SendData(728, lEngineInfo.EngineStart.left ) -- lamp start left engine (0|1) - ExportScript.Tools.SendData(729, lEngineInfo.EngineStart.right ) -- lamp start right engine (0|1) - - ExportScript.Tools.SendData(730, (lEngineInfo.RPM.left > 99.8 and 1 or 0) ) -- lamp after burner left engine - ExportScript.Tools.SendData(731, (lEngineInfo.RPM.right > 99.8 and 1 or 0) ) -- lam after burner right engine end + -- Engine Lamps, Start and Afterburner + ExportScript.AF.FC_EngineLamps_SU2733(lFunctionTyp) + -- Mechanical Configuration Indicator ExportScript.AF.MechanicalDevicesIndicator(lFunctionTyp) @@ -209,6 +206,7 @@ function ExportScript.ProcessDACConfigLowImportance() ExportScript.AF.FC_SPO15RWR(lFunctionTyp) ExportScript.AF.MechanicalDevicesIndicator(lFunctionTyp) ExportScript.AF.FuelQuantityIndicator(lFunctionTyp) + ExportScript.AF.FC_EngineLamps_SU2733(lFunctionTyp) ExportScript.AF.StatusLamp() ExportScript.AF.SightingSystem() ExportScript.AF.PPDSPPanel() @@ -365,17 +363,6 @@ function ExportScript.AF.StatusLamp() ExportScript.Tools.SendDataDAC("726", lMCPState.StallSignalization == true and 1 or 0 ) ExportScript.Tools.SendDataDAC("727", lMCPState.AutopilotOn == true and 1 or 0 ) - local lEngineInfo = LoGetEngineInfo() - if lEngineInfo ~= nil then - --ExportScript.Tools.WriteToLog('lEngineInfo: '..ExportScript.Tools.dump(lEngineInfo)) - - ExportScript.Tools.SendDataDAC("728", lEngineInfo.EngineStart.left ) -- lamp start left engine (0|1) - ExportScript.Tools.SendDataDAC("729", lEngineInfo.EngineStart.right ) -- lamp start right engine (0|1) - - ExportScript.Tools.SendDataDAC("730", (lEngineInfo.RPM.left > 99.8 and 1 or 0) ) -- lamp after burner left engine - ExportScript.Tools.SendDataDAC("731", (lEngineInfo.RPM.right > 99.8 and 1 or 0) ) -- lam after burner right engine - end - local lAccelerationUnits = LoGetAccelerationUnits() if lAccelerationUnits ~= nil then --ExportScript.Tools.WriteToLog('lAccelerationUnits: '..ExportScript.Tools.dump(lAccelerationUnits)) diff --git a/Scripts/DCS-ExportScript/ExportsModules/Su-33.lua b/Scripts/DCS-ExportScript/ExportsModules/Su-33.lua index 30141a5..9982491 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/Su-33.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/Su-33.lua @@ -137,14 +137,11 @@ function ExportScript.ProcessIkarusFCLowImportanceConfig() -- Hydraulic Pressure Right ExportScript.AF.FC_OneNeedleGauge(lEngineInfo.HydraulicPressure.left, 300, 86) - - ExportScript.Tools.SendData(728, lEngineInfo.EngineStart.left ) -- lamp start left engine (0|1) - ExportScript.Tools.SendData(729, lEngineInfo.EngineStart.right ) -- lamp start right engine (0|1) - - ExportScript.Tools.SendData(730, (lEngineInfo.RPM.left > 99.8 and 1 or 0) ) -- lamp after burner left engine - ExportScript.Tools.SendData(731, (lEngineInfo.RPM.right > 99.8 and 1 or 0) ) -- lam after burner right engine end + -- Engine Lamps, Start and Afterburner + ExportScript.AF.FC_EngineLamps_SU2733(lFunctionTyp) + local lMechInfo = LoGetMechInfo() -- mechanical components, e.g. Flaps, Wheelbrakes,... if lMechInfo ~= nil then -- Wheelbrakes Hydraulic Pressure Left @@ -210,6 +207,7 @@ function ExportScript.ProcessDACConfigLowImportance() ExportScript.AF.FC_SPO15RWR(lFunctionTyp) ExportScript.AF.MechanicalDevicesIndicator(lFunctionTyp) ExportScript.AF.FuelQuantityIndicator(lFunctionTyp) + ExportScript.AF.FC_EngineLamps_SU2733(lFunctionTyp) ExportScript.AF.StatusLamp() ExportScript.AF.SightingSystem() ExportScript.AF.PPDSPPanel() @@ -366,17 +364,6 @@ function ExportScript.AF.StatusLamp() ExportScript.Tools.SendDataDAC("726", lMCPState.StallSignalization == true and 1 or 0 ) ExportScript.Tools.SendDataDAC("727", lMCPState.AutopilotOn == true and 1 or 0 ) - local lEngineInfo = LoGetEngineInfo() - if lEngineInfo ~= nil then - --ExportScript.Tools.WriteToLog('lEngineInfo: '..ExportScript.Tools.dump(lEngineInfo)) - - ExportScript.Tools.SendDataDAC("728", lEngineInfo.EngineStart.left ) -- lamp start left engine (0|1) - ExportScript.Tools.SendDataDAC("729", lEngineInfo.EngineStart.right ) -- lamp start right engine (0|1) - - ExportScript.Tools.SendDataDAC("730", (lEngineInfo.RPM.left > 99.8 and 1 or 0) ) -- lamp after burner left engine - ExportScript.Tools.SendDataDAC("731", (lEngineInfo.RPM.right > 99.8 and 1 or 0) ) -- lam after burner right engine - end - local lAccelerationUnits = LoGetAccelerationUnits() if lAccelerationUnits ~= nil then --ExportScript.Tools.WriteToLog('lAccelerationUnits: '..ExportScript.Tools.dump(lAccelerationUnits))