Skip to content

update patch #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
QuasarZero wants to merge 19 commits into
base: master
Choose a base branch
from
Open

update patch #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
730028f
feat: Add atmosphere pressure indicator for F-15C
quasarxue-gif Sep 10, 2024
9fd7f17
feat: Add ECM power, xmit, selector, refine some knobs (from Norsk_L'…
quasarxue-gif Sep 10, 2024
eb4879f
fix: ky-58 volume int -> float
quasarxue-gif Sep 10, 2024
8efdf66
chore: add git ignore
quasarxue-gif Sep 10, 2024
8d15430
feat: complete JF-17 ufc display (from Norsk_L)
quasarxue-gif Sep 10, 2024
ca4857a
fix: refine JF-17 formation light & anti-collision light var type (fr…
quasarxue-gif Sep 10, 2024
b52389c
chore: added independent display of chaff and flare quantities for Mi…
quasarxue-gif Sep 11, 2024
a96c9d8
chore: refine pitch & roll radio switch value for F-15E (float to int)
quasarxue-gif Sep 11, 2024
3d59dbe
feat: add spin cover, generator tie cover for F/A-18C
quasarxue-gif Sep 11, 2024
390729a
style: format JF-17 script
quasarxue-gif Sep 11, 2024
4d5b1ae
fix:
QuasarZero Sep 11, 2024
238b5d1
fix: refine air condition source, fuel bingo, warning/caution light t…
QuasarZero Sep 11, 2024
b3cd3bb
fix: refine oxygen switch for F-15E
QuasarZero Sep 11, 2024
529e3f3
fix: refine start ready light, engine panel, generator, ground power,…
QuasarZero Sep 12, 2024
7540889
fix:
QuasarZero Sep 19, 2024
f814c9f
chore: av-8b float 4->2
QuasarZero Nov 24, 2024
ceaacb9
feat:
QuasarZero Nov 24, 2024
2c97a96
chore: av-8b video brt&cont float(4) -> float(2)
QuasarZero Dec 5, 2024
1d4e37e
chore: av-8b edp brt float(4) -> float(2)
QuasarZero Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@ luac.out

# Working Files
# *.psd

# JetBrains IDEs' workdir
.idea
18 changes: 10 additions & 8 deletions Scripts/DCS-ExportScript/ExportsModules/A-10A.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ function ExportScript.ProcessIkarusFCHighImportanceConfig()

local lEngineRPMleft = LoGetEngineInfo().RPM.left -- ENG1 RPM %
local lEngineRPMright = LoGetEngineInfo().RPM.right -- ENG2 RPM %
local lEngineTempLeft = LoGetEngineInfo().Temperature.left -- ENG1 EGT �C
local lEngineTempRight = LoGetEngineInfo().Temperature.right -- ENG2 EGT �C
local lEngineTempLeft = LoGetEngineInfo().Temperature.left -- ENG1 EGT �C
local lEngineTempRight = LoGetEngineInfo().Temperature.right -- ENG2 EGT �C

local lIAS = LoGetIndicatedAirSpeed() -- INDICATED AIRSPEED (Meter/Second)
local lAoA = LoGetAngleOfAttack() -- ANGLE OF ATTACK AoA (Radian)
Expand Down Expand Up @@ -372,6 +372,7 @@ function ExportScript.ProcessIkarusFCLowImportanceConfig()
local lCounter = {[0] = 0.0, [1] = 0.1, [2] = 0.2, [3] = 0.3, [4] = 0.4, [5] = 0.5, [6] = 0.6, [7] = 0.7, [8] = 0.8, [9] = 0.9}

lEngineFuelInternal = lEngineFuelInternal * 2.2046223302272 -- kg to lbs
lEngineFuelExternal = lEngineFuelExternal * 2.2046223302272 -- kg to lbs
local lFuelNeedle = (lEngineFuelInternal / 2) / 6000 -- 6000 = scala
lEngineFuelInternal = lEngineFuelInternal / 100 -- um unf die ersten drei stellen zukommen
local lEngineFuelInternalTmp = string.format("%03d", lEngineFuelInternal)
Expand All @@ -388,6 +389,7 @@ function ExportScript.ProcessIkarusFCLowImportanceConfig()
ExportScript.Tools.SendData(302, string.format("%.2f", lFuelCounter3))
ExportScript.Tools.SendData(303, string.format("%.4f", lFuelNeedle))
ExportScript.Tools.SendData(304, string.format("%.4f", lFuelNeedle))
ExportScript.Tools.SendData(311, string.format("%d", lEngineFuelExternal))
-- Fuel Indicator end

-- Weapon Panel
Expand Down Expand Up @@ -489,6 +491,7 @@ function ExportScript.ProcessIkarusFCLowImportanceConfig()
-- local lNameByType = LoGetNameByType () -- args 4 (number : level1,level2,level3,level4), result string
-- values from LoGetTargetInformation().type
-- ExportScript.Tools.WriteToLog('lNameByType: '..ExportScript.Tools.dump(lNameByType))
ExportScript.AF.FlareChaff()
end

function ExportScript.ProcessDACConfigLowImportance()
Expand All @@ -498,7 +501,6 @@ function ExportScript.ProcessDACConfigLowImportance()
ExportScript.AF.SightingSystem()
ExportScript.AF.FuelQuantityIndicator()
ExportScript.AF.StatusLamp()
ExportScript.AF.FlareChaff()
ExportScript.AF.WeaponStatusPanel()
ExportScript.AF.AOAIndicator()
end
Expand Down Expand Up @@ -689,8 +691,8 @@ function ExportScript.AF.FlareChaff()
--[chaff] = number: "30"
--[flare] = number: "30"

ExportScript.Tools.SendDataDAC("800", lSnares.chaff )
ExportScript.Tools.SendDataDAC("801", lSnares.flare )
ExportScript.Tools.SendData("800", lSnares.chaff )
ExportScript.Tools.SendData("801", lSnares.flare )
end

function ExportScript.AF.MechanicalDevicesIndicator(FunctionTyp)
Expand Down Expand Up @@ -1167,8 +1169,8 @@ function ExportScript.AF.WeaponStatusPanel()
ExportScript.Tools.SendDataDAC("131", (ExportScript.AF.PayloadInfo.Stations[2].count == 0 and 1 or 0) ) -- weapon presend > 0 (panel 11)
--ExportScript.Tools.SendDataDAC("CurrentStation", ExportScript.AF.PayloadInfo.CurrentStation )
-- air-to-air missils panel 1 and 11, air combat modus, CurrentStation = 1, panel 1 and 11 on
-- wenn die Waffenstationen gleichm�ssig belegt sind, hat bei Auswahl CurrentStation immer den Wert der linken Station
-- bei ungleichm��iger Belegung, hat CurrentStation immer den Wert der jeweiligen Station
-- wenn die Waffenstationen gleichm�ssig belegt sind, hat bei Auswahl CurrentStation immer den Wert der linken Station
-- bei ungleichm��iger Belegung, hat CurrentStation immer den Wert der jeweiligen Station
-- Waffenbezeichnung als UUID, ExportScript.AF.PayloadInfo.Stations[X].CLSID

-- defination
Expand Down Expand Up @@ -1204,7 +1206,7 @@ function ExportScript.AF.WeaponStatusPanel()
--ExportScript.Tools.WriteToLog('aktiv2: '..ExportScript.AF.TmpStationToPanel[ExportScript.AF.PayloadInfo.CurrentStation].CurrentID2)
end
end
table.foreach(ExportScript.AF.PayloadInfo.Stations, ExportScript.AF.WeaponStatusPanel_selectCurrentPayloadStation_A10A) -- zugeh�rige Stationen
table.foreach(ExportScript.AF.PayloadInfo.Stations, ExportScript.AF.WeaponStatusPanel_selectCurrentPayloadStation_A10A) -- zugeh�rige Stationen
elseif ExportScript.AF.PayloadInfo.CurrentStation == 0 and ExportScript.AF.CurrentStationTmp > 0 then
ExportScript.AF.WeaponStatusPanel_Reset(201, 211)
ExportScript.AF.WeaponStatusPanel_Reset(221, 231)
Expand Down
48 changes: 24 additions & 24 deletions Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,13 @@ ExportScript.ConfigEveryFrameArguments =
[389] = "%.4f", --QTY 1. Drum
[390] = "%.4f", --QTY 2.
--LOWER AMARMENT PANEL
[406] = "%.4f", --SET FLAG 1
[408] = "%.4f", --SET FLAG 2
[410] = "%.4f", --SET FLAG 3
[412] = "%.4f", --SET FLAG 4
[414] = "%.4f", --SET FLAG 5
[416] = "%.4f", --SET FLAG 6
[418] = "%.4f", --SET FLAG 7
[406] = "%1d", --SET FLAG 1
[408] = "%1d", --SET FLAG 2
[410] = "%1d", --SET FLAG 3
[412] = "%1d", --SET FLAG 4
[414] = "%1d", --SET FLAG 5
[416] = "%1d", --SET FLAG 6
[418] = "%1d", --SET FLAG 7
--GEAR PANEL DISPLAY --STATUS LIGHTS--
[462] = "%.f", --NOSE GEAR (YELLOW)
[463] = "%.f", --NOSE GEAR (GREEN)
Expand Down Expand Up @@ -248,14 +248,14 @@ ExportScript.ConfigArguments =
[284] = "%.1f", --VSTOL Master Mode Selector
[280] = "%.1f", --AG Master Mode Selector
-- Engine Display Panel
[272] = "%.4f", --EDP Brightness Control
[272] = "%.2f", --EDP Brightness Control
[655] = "%1d", --EDP BIT Button
-- HUD Control Panel
[288] = "%.4f", --HUD
[289] = "%.4f", --HUD Off/Brightness Control
[290] = "%.1f", --HUD Display Mode Switch
[291] = "%.4f", --HUD Video Brightness Control
[292] = "%.4f", --HUD Video Contrast Control
[291] = "%.2f", --HUD Video Brightness Control
[292] = "%.2f", --HUD Video Contrast Control
[293] = "%1d", --HUD Altitude Selector Switch
-- UFC Panel
[302] = "%1d", --UFC Button 1
Expand Down Expand Up @@ -285,9 +285,9 @@ ExportScript.ConfigArguments =
[323] = "%1d", --Radar Beacon Function Selector
[297] = "%1d", --I/P Button
[309] = "%1d", --Save Data Button
[295] = "%1d", --Display Brightness Control
[298] = "%.4f", --Comm 1 Volume Control
[299] = "%.4f", --Comm 2 Volume Control
[295] = "%.2f", --Display Brightness Control
[298] = "%.2f", --Comm 1 Volume Control
[299] = "%.2f", --Comm 2 Volume Control
[300] = "%.4f", --Comm 1 Channel Selector
[301] = "%.4f", --Comm 2 Channel Selector
[178] = "%.4f", --Comm 1 Channel Show Button
Expand Down Expand Up @@ -329,7 +329,7 @@ ExportScript.ConfigArguments =
[221] = "%1d", --MPCD Left Display Symbology
[222] = "%1d", --MPCD Left Display Gain
[223] = "%1d", --MPCD Left Display Contrast
[194] = "%.4f", --MPCD Left Off/Brightness Control
[194] = "%.2f", --MPCD Left Off/Brightness Control
-- MPCD Right
[224] = "%1d", --MPCD Right Button 1
[225] = "%1d", --MPCD Right Button 2
Expand All @@ -355,7 +355,7 @@ ExportScript.ConfigArguments =
[245] = "%1d", --MPCD Right Display Symbology
[246] = "%1d", --MPCD Right Display Gain
[247] = "%1d", --MPCD Right Display Contrast
[195] = "%.4f", --MPCD Right Off/Brightness Control
[195] = "%.2f", --MPCD Right Off/Brightness Control
-- Armament Control Panel ACP
[395] = "%.1f", --Manual Release Control Knob
[396] = "%1d", --Armament Mode Control
Expand Down Expand Up @@ -480,7 +480,7 @@ ExportScript.ConfigArguments =
[612] = "%.1f", --Generator Switch
[613] = "%.1f", --Battery Switch
-- V/UHF Radio Panel
[614] = "%.4f", --V/UHF RSC Volume Knob
[614] = "%.2f", --V/UHF RSC Volume Knob
[615] = "%.3f", --V/UHF RSC Chan/Freq Knob
[616] = "%.1f", --V/UHF RSC Operational Mode Switch
[617] = "%1d", --V/UHF RSC Ancillary Mode Pointer
Expand All @@ -497,18 +497,18 @@ ExportScript.ConfigArguments =
[627] = "%1d", --KY-58 Codes Clear Switch
[628] = "%1d", --KY-58 Remote Codes Load Switch
-- ICS
[629] = "%.4f", --ICS Aux Volume Knob
[630] = "%.4f", --ICS Ground Volume Knob
[629] = "%.2f", --ICS Aux Volume Knob
[630] = "%.2f", --ICS Ground Volume Knob
[631] = "%.1f", --ICS Mic Operational Mode Switch
-- IFF
[632] = "%1d", --IFF Operational Mode Switch
[633] = "%1d", --IFF Crypto Mode Switch
-- Interior Lights Panel
[634] = "%1d", --Compass Light/Test Lights
[635] = "%.4f", --Instruments Lights
[636] = "%.4f", --Console Lights
[637] = "%.4f", --Flood Lights
[638] = "%.4f", --Annunciator Lights
[635] = "%.2f", --Instruments Lights
[636] = "%.2f", --Console Lights
[637] = "%.2f", --Flood Lights
[638] = "%.2f", --Annunciator Lights
}

-----------------------------
Expand Down Expand Up @@ -735,11 +735,11 @@ function ExportScript.ProcessIkarusDCSConfigLowImportance(mainPanelDevice)
elseif digits[1] == "2" then
ExportScript.Tools.SendData(2018, "AUT")
elseif digits[1] == "4" then
ExportScript.Tools.SendData(2018, "CP ")
ExportScript.Tools.SendData(2018, "CIP")
elseif digits[1] == "6" then
ExportScript.Tools.SendData(2018, "DSL")
elseif digits[1] == "8" then
ExportScript.Tools.SendData(2018, "DR ")
ExportScript.Tools.SendData(2018, "DIR ")
elseif digits[1] == "10" then
ExportScript.Tools.SendData(2018, "AGM")
end
Expand Down
28 changes: 23 additions & 5 deletions Scripts/DCS-ExportScript/ExportsModules/F-15C.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ function ExportScript.ProcessIkarusFCHighImportanceConfig()

local lEngineRPMleft = LoGetEngineInfo().RPM.left -- ENG1 RPM %
local lEngineRPMright = LoGetEngineInfo().RPM.right -- ENG2 RPM %
local lEngineTempLeft = LoGetEngineInfo().Temperature.left -- ENG1 EGT �C
local lEngineTempRight = LoGetEngineInfo().Temperature.right -- ENG2 EGT �C
local lEngineTempLeft = LoGetEngineInfo().Temperature.left -- ENG1 EGT �C
local lEngineTempRight = LoGetEngineInfo().Temperature.right -- ENG2 EGT �C

local lIAS = LoGetIndicatedAirSpeed() -- INDICATED AIRSPEED (Meter/Second)
local lMachNumber = LoGetMachNumber() -- MACH
Expand Down Expand Up @@ -105,6 +105,24 @@ function ExportScript.ProcessIkarusFCHighImportanceConfig()
local lAltBarTmp = lAltBar * 3.28084 -- meter to feeds
local lAltBarTmp2 = ((lAltBar * 3.28084) / 100) -- meter to feeds


-- Export atmosphere pressure indicator
-- Because the damn ED has hidden the inHg value in the altimeter!
local AtmospherePressureFor_mmHg = ExportScript.Tools.round(lBasicAtmospherePressure, 2)
local AtmospherePressureFor_inHg = ExportScript.Tools.round(lBasicAtmospherePressure / 25.4, 2)
local AtmospherePressureFor_kPa = ExportScript.Tools.round(lBasicAtmospherePressure * 1.33322, 2)
-- mmHg
ExportScript.Tools.SendData(1011, AtmospherePressureFor_mmHg)
ExportScript.Tools.SendData(1021, AtmospherePressureFor_mmHg..'\nmmHg')
-- inHg
ExportScript.Tools.SendData(1012, AtmospherePressureFor_inHg)
ExportScript.Tools.SendData(1022, AtmospherePressureFor_inHg..'\ninHg')
-- kPa
ExportScript.Tools.SendData(1013, AtmospherePressureFor_kPa)
ExportScript.Tools.SendData(1023, AtmospherePressureFor_kPa..'\nhPa')
-- Combine mmHg, inHg, kPa
ExportScript.Tools.SendData(1025, AtmospherePressureFor_inHg..' inHg\n'..AtmospherePressureFor_mmHg..' mmHg\n'..AtmospherePressureFor_kPa..' hPa')

lAltBarTmp = lAltBarTmp / 1000
lAltBarTmp = lAltBarTmp - ExportScript.Tools.round(lAltBarTmp, 0, "floor")

Expand Down Expand Up @@ -1274,8 +1292,8 @@ function ExportScript.AF.WeaponStatusPanel(FunctionTyp)

--ExportScript.Tools.SendDataDAC("CurrentStation", ExportScript.AF.PayloadInfo.CurrentStation )
-- air-to-air missils panel 1 and 11, air combat modus, CurrentStation = 1, panel 1 and 11 on
-- wenn die Waffenstationen gleichm�ssig belegt sind, hat bei Auswahl CurrentStation immer den Wert der linken Station
-- bei ungleichm��iger Belegung, hat CurrentStation immer den Wert der jeweiligen Station
-- wenn die Waffenstationen gleichm�ssig belegt sind, hat bei Auswahl CurrentStation immer den Wert der linken Station
-- bei ungleichm��iger Belegung, hat CurrentStation immer den Wert der jeweiligen Station
-- Waffenbezeichnung als UUID, ExportScript.AF.PayloadInfo.Stations[X].CLSID
ExportScript.Tools.SendDataDAC("100", ExportScript.AF.PayloadInfo.Cannon.shells ) -- count cannon shells
ExportScript.Tools.SendDataDAC("101", (ExportScript.AF.PayloadInfo.Stations[1].count > 0 and 1 or 0) ) -- weapon presend > 0 (panel 1)
Expand Down Expand Up @@ -1335,7 +1353,7 @@ function ExportScript.AF.WeaponStatusPanel(FunctionTyp)
--ExportScript.Tools.WriteToLog('aktiv2: '..ExportScript.AF.TmpStationToPanel[ExportScript.AF.PayloadInfo.CurrentStation].CurrentID2)
end
end
table.foreach(ExportScript.AF.PayloadInfo.Stations, ExportScript.AF.WeaponStatusPanel_selectCurrentPayloadStation_F15C) -- zugeh�rige Stationen
table.foreach(ExportScript.AF.PayloadInfo.Stations, ExportScript.AF.WeaponStatusPanel_selectCurrentPayloadStation_F15C) -- zugeh�rige Stationen
elseif ExportScript.AF.PayloadInfo.CurrentStation == 0 and ExportScript.AF.CurrentStationTmp > 0 then
ExportScript.AF.WeaponStatusPanel_Reset(201, 211)
ExportScript.AF.WeaponStatusPanel_Reset(221, 231)
Expand Down
Loading