From 31c6538f234f7fa981d2cb6036b3a4fdc0cfaf75 Mon Sep 17 00:00:00 2001 From: mcmicha Date: Thu, 5 Oct 2017 21:45:51 +0200 Subject: [PATCH] Add function call to ExportScript.AF.FC_EngineLamps_MiG29() for Engine Start and Afterburner lamps... Delete old Engine Start and Afterburner lamps export. --- .../DCS-ExportScript/ExportsModules/MiG-29A.lua | 15 ++++----------- .../DCS-ExportScript/ExportsModules/MiG-29G.lua | 15 ++++----------- .../DCS-ExportScript/ExportsModules/MiG-29S.lua | 15 ++++----------- 3 files changed, 12 insertions(+), 33 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/MiG-29A.lua b/Scripts/DCS-ExportScript/ExportsModules/MiG-29A.lua index 1c19507..671b893 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/MiG-29A.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/MiG-29A.lua @@ -147,6 +147,9 @@ function ExportScript.ProcessIkarusFCLowImportanceConfig() ExportScript.AF.FC_OneNeedleGauge(lEngineInfo.HydraulicPressure.right, 240, 86) end + -- Engine Lamps, Start and Afterburner + ExportScript.AF.FC_EngineLamps_MiG29(lFunctionTyp) + local lMechInfo = LoGetMechInfo() -- mechanical components, e.g. Flaps, Wheelbrakes,... if lMechInfo ~= nil then -- Wheelbrakes Hydraulic Pressure Left @@ -207,6 +210,7 @@ function ExportScript.ProcessDACConfigLowImportance() ExportScript.AF.FC_Russian_MDI_MiG29(lFunctionTyp) ExportScript.AF.FuelQuantityIndicator_MiG29(lFunctionTyp) ExportScript.AF.FC_Russian_FlareChaff_MiG29(lFunctionTyp) + ExportScript.AF.FC_EngineLamps_MiG29(lFunctionTyp) ExportScript.AF.StatusLamp() ExportScript.AF.SightingSystem_MiG29() @@ -282,17 +286,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 1 (0|1) - ExportScript.Tools.SendDataDAC("729", lEngineInfo.EngineStart.right ) -- lamp start right engine 1 (0|1) - - ExportScript.Tools.SendDataDAC("730", (lEngineInfo.RPM.left > 100.0 and 1 or 0) ) -- lamp after burner left engine - ExportScript.Tools.SendDataDAC("731", (lEngineInfo.RPM.right > 100.0 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/MiG-29G.lua b/Scripts/DCS-ExportScript/ExportsModules/MiG-29G.lua index afb4e5b..e37d9c6 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/MiG-29G.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/MiG-29G.lua @@ -147,6 +147,9 @@ function ExportScript.ProcessIkarusFCLowImportanceConfig() ExportScript.AF.FC_OneNeedleGauge(lEngineInfo.HydraulicPressure.right, 240, 86) end + -- Engine Lamps, Start and Afterburner + ExportScript.AF.FC_EngineLamps_MiG29(lFunctionTyp) + local lMechInfo = LoGetMechInfo() -- mechanical components, e.g. Flaps, Wheelbrakes,... if lMechInfo ~= nil then -- Wheelbrakes Hydraulic Pressure Left @@ -207,6 +210,7 @@ function ExportScript.ProcessDACConfigLowImportance() ExportScript.AF.FC_Russian_MDI_MiG29(lFunctionTyp) ExportScript.AF.FuelQuantityIndicator_MiG29(lFunctionTyp) ExportScript.AF.FC_Russian_FlareChaff_MiG29(lFunctionTyp) + ExportScript.AF.FC_EngineLamps_MiG29(lFunctionTyp) ExportScript.AF.StatusLamp() ExportScript.AF.SightingSystem_MiG29() @@ -282,17 +286,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 1 (0|1) - ExportScript.Tools.SendDataDAC("729", lEngineInfo.EngineStart.right ) -- lamp start right engine 1 (0|1) - - ExportScript.Tools.SendDataDAC("730", (lEngineInfo.RPM.left > 100.0 and 1 or 0) ) -- lamp after burner left engine - ExportScript.Tools.SendDataDAC("731", (lEngineInfo.RPM.right > 100.0 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/MiG-29S.lua b/Scripts/DCS-ExportScript/ExportsModules/MiG-29S.lua index 6de2651..6db47b6 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/MiG-29S.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/MiG-29S.lua @@ -147,6 +147,9 @@ function ExportScript.ProcessIkarusFCLowImportanceConfig() ExportScript.AF.FC_OneNeedleGauge(lEngineInfo.HydraulicPressure.right, 240, 86) end + -- Engine Lamps, Start and Afterburner + ExportScript.AF.FC_EngineLamps_MiG29(lFunctionTyp) + local lMechInfo = LoGetMechInfo() -- mechanical components, e.g. Flaps, Wheelbrakes,... if lMechInfo ~= nil then -- Wheelbrakes Hydraulic Pressure Left @@ -207,6 +210,7 @@ function ExportScript.ProcessDACConfigLowImportance() ExportScript.AF.FC_Russian_MDI_MiG29(lFunctionTyp) ExportScript.AF.FuelQuantityIndicator_MiG29(lFunctionTyp) ExportScript.AF.FC_Russian_FlareChaff_MiG29(lFunctionTyp) + ExportScript.AF.FC_EngineLamps_MiG29(lFunctionTyp) ExportScript.AF.StatusLamp() ExportScript.AF.SightingSystem_MiG29() @@ -282,17 +286,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 1 (0|1) - ExportScript.Tools.SendDataDAC("729", lEngineInfo.EngineStart.right ) -- lamp start right engine 1 (0|1) - - ExportScript.Tools.SendDataDAC("730", (lEngineInfo.RPM.left > 100.0 and 1 or 0) ) -- lamp after burner left engine - ExportScript.Tools.SendDataDAC("731", (lEngineInfo.RPM.right > 100.0 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))