From 730028f5e9373b8c62ff1d42e47f8515a7feab1b Mon Sep 17 00:00:00 2001 From: Quasar Date: Tue, 10 Sep 2024 10:29:48 +0800 Subject: [PATCH 01/19] feat: Add atmosphere pressure indicator for F-15C --- .../DCS-ExportScript/ExportsModules/F-15C.lua | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Scripts/DCS-ExportScript/ExportsModules/F-15C.lua b/Scripts/DCS-ExportScript/ExportsModules/F-15C.lua index 5ccb6ac9..f19e481e 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/F-15C.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/F-15C.lua @@ -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(AtmospherePressureFor_mmHg / 25.4, 2) + local AtmospherePressureFor_kPa = ExportScript.Tools.round(AtmospherePressureFor_mmHg * 0.133322, 2) + -- mmHg + ExportScript.Tools.SendData(1011, AtmospherePressureFor_mmHg) + ExportScript.Tools.SendData(1021, AtmospherePressureFor_mmHg..'\ninHg') + -- inHg + ExportScript.Tools.SendData(1012, AtmospherePressureFor_inHg) + ExportScript.Tools.SendData(1022, AtmospherePressureFor_inHg..'\nmmHg') + -- kPa + ExportScript.Tools.SendData(1013, AtmospherePressureFor_kPa) + ExportScript.Tools.SendData(1023, AtmospherePressureFor_kPa..'\nkPa') + -- Combine mmHg, inHg, kPa + ExportScript.Tools.SendData(1025, AtmospherePressureFor_inHg..' inHg\n'..AtmospherePressureFor_mmHg..' mmHg\n'..AtmospherePressureFor_kPa..' kPa') + lAltBarTmp = lAltBarTmp / 1000 lAltBarTmp = lAltBarTmp - ExportScript.Tools.round(lAltBarTmp, 0, "floor") From 9fd7f173b08cb1af8cd0d930a46841e7753c826d Mon Sep 17 00:00:00 2001 From: Quasar Date: Tue, 10 Sep 2024 10:32:23 +0800 Subject: [PATCH 02/19] feat: Add ECM power, xmit, selector, refine some knobs (from Norsk_L's config) --- .../ExportsModules/F-16C_50.lua | 50 ++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/F-16C_50.lua b/Scripts/DCS-ExportScript/ExportsModules/F-16C_50.lua index 06d9f46c..8f2b36a5 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/F-16C_50.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/F-16C_50.lua @@ -131,6 +131,10 @@ ExportScript.ConfigEveryFrameArguments = [497]= "%.1f", -- Btn_SPL_A [498]= "%.1f", -- Btn_SPL_F [499]= "%.1f", -- Btn_SPL_T + [455]= "%.1f", -- PTR-ECM-TMB-OPR-455, ECM POWER SWITCH, , OFF/STBY/OPR, (1, 0, 1) + [455]= "%.1f", -- PTR-ECM-TMB-OPR-455, ECM POWER SWITCH, , OFF/STBY/OPR, (-1, 0, -1) + [457]= "%.1f", -- PTR-ECM-TMB-XMIT-457, ECM EXMIT SWITCH, , 1/2/3, (1, 0, 1) + [457]= "%.1f", -- PTR-ECM-TMB-XMIT-457, ECM EXMIT SWITCH, , 1/2/3, (-1, 0, -1) -- EPU Control Panel [524]= "%.1f", -- ( CautionLights.HYDRAZN) @@ -284,13 +288,13 @@ ExportScript.ConfigArguments = [796] = "%1d", --PTR-STICK-HIDE-796, Hide Stick toggle, Hide Stick toggle, , , (1, 0, 1) -- CPTLIGHTS_SYSTEM(12) [691] = "%1d", --PTR-RLGT-TMB-MALIND-691, MAL & IND LTS Switch, MAL & IND LTS Switch, , BRT/Center/DIM, (-1, -1, 0) - [685] = "%1d", --PTR-RLGT-LVR-PRICNS-685, PRIMARY CONSOLES BRT Knob, PRIMARY CONSOLES BRT Knob, , , (0, 0, 1) - [686] = "%1d", --PTR-RLGT-LVR-PRIPNL-686, PRIMARY INST PNL BRT Knob, PRIMARY INST PNL BRT Knob, , , (0, 0, 1) - [687] = "%1d", --PTR-RLGT-LVR-PRIDATA-687, PRIMARY DATA ENTRY DISPLAY BRT Knob, PRIMARY DATA ENTRY DISPLAY BRT Knob, , , (0, 0, 1) - [688] = "%1d", --PTR-RLGT-LVR-FLDCNS-688, FLOOD CONSOLES BRT Knob, FLOOD CONSOLES BRT Knob, , , (0, 0, 1) - [690] = "%1d", --PTR-RLGT-LVR-FLDPNL-690, FLOOD INST PNL BRT Knob, FLOOD INST PNL BRT Knob, , , (0, 0, 1) - [794] = "%1d", --PTR-AOA-LVL-794, AOA Indexer Dimming Lever, AOA Indexer Dimming Lever, , , (0, 0, 1) - [795] = "%1d", --PTR-AR-LVL-795, AR Status Indicator Dimming Lever, AR Status Indicator Dimming Lever, , , (0, 0, 1) + [685] = "%.2f", --PTR-RLGT-LVR-PRICNS-685, PRIMARY CONSOLES BRT Knob, PRIMARY CONSOLES BRT Knob, , , (0, 0, 1) + [686] = "%.2f", --PTR-RLGT-LVR-PRIPNL-686, PRIMARY INST PNL BRT Knob, PRIMARY INST PNL BRT Knob, , , (0, 0, 1) + [687] = "%.2f", --PTR-RLGT-LVR-PRIDATA-687, PRIMARY DATA ENTRY DISPLAY BRT Knob, PRIMARY DATA ENTRY DISPLAY BRT Knob, , , (0, 0, 1) + [688] = "%.2f", --PTR-RLGT-LVR-FLDCNS-688, FLOOD CONSOLES BRT Knob, FLOOD CONSOLES BRT Knob, , , (0, 0, 1) + [690] = "%.2f", --PTR-RLGT-LVR-FLDPNL-690, FLOOD INST PNL BRT Knob, FLOOD INST PNL BRT Knob, , , (0, 0, 1) + [794] = "%.2f", --PTR-AOA-LVL-794, AOA Indexer Dimming Lever, AOA Indexer Dimming Lever, , , (0, 0, 1) + [795] = "%.2f", --PTR-AR-LVL-795, AR Status Indicator Dimming Lever, AR Status Indicator Dimming Lever, , , (0, 0, 1) [116] = "%1d", --PTR-CPBC-BTN-MCAUT-116, Master Caution Button - Push to reset, Master Caution Button - Push to reset, , , (1, 0, 1) [577] = "%1d", --PTR-TESTCP-BTN-MAL-577, MAL & IND LTS Test Button - Push to test, MAL & IND LTS Test Button - Push to test, , , (1, 0, 1) [691] = "%1d", --PTR-RLGT-TMB-MALIND-691, MAL & IND LTS Switch, MAL & IND LTS Switch, , BRT/Center/DIM, (1, 0, 1) @@ -341,8 +345,8 @@ ExportScript.ConfigArguments = [533] = "%1d", --PTR-EXTLGT-TMB-WNGTAIL-533, WING/TAIL Switch, WING/TAIL Switch, , BRT/OFF/DIM, (-1, -1, 1) [534] = "%1d", --PTR-EXTLGT-TMB-FUS-534, FUSELAGE Switch, FUSELAGE Switch, , BRT/OFF/DIM, (-1, -1, 1) [360] = "%1d", --PTR-LGCP-TMB-LIGHTS-360, LANDING TAXI LIGHTS Switch, LANDING TAXI LIGHTS Switch, , LANDING/OFF/TAXI, (-1, -1, 1) - [535] = "%1d", --PTR-EXTLGT-LVR-FORM-535, FORM Knob, FORM Knob, , , (0, 0, 1) - [537] = "%1d", --PTR-EXTLGT-LVR-AREF-537, AERIAL REFUELING Knob, AERIAL REFUELING Knob, , , (0, 0, 1) + [535] = "%.2f", --PTR-EXTLGT-LVR-FORM-535, FORM Knob, FORM Knob, , , (0, 0, 1) + [537] = "%.2f", --PTR-EXTLGT-LVR-AREF-537, AERIAL REFUELING Knob, AERIAL REFUELING Knob, , , (0, 0, 1) [532] = "%1d", --PTR-EXTLGT-TMB-FLSH-532, FLASH STEADY Switch, FLASH STEADY Switch, , FLASH/STEADY, (1, 0, 1) [533] = "%1d", --PTR-EXTLGT-TMB-WNGTAIL-533, WING/TAIL Switch, WING/TAIL Switch, , BRT/OFF/DIM, (1, -1, 1) [534] = "%1d", --PTR-EXTLGT-TMB-FUS-534, FUSELAGE Switch, FUSELAGE Switch, , BRT/OFF/DIM, (1, -1, 1) @@ -420,15 +424,15 @@ ExportScript.ConfigArguments = [701] = "%1d", --PTR-NUCLR-TMB-PLAIN-701, PLAIN Cipher Switch, PLAIN Cipher Switch, , CRAD 1/PLAIN/CRAD 2, (-1, -1, 1) [694] = "%1d", --PTR-ZROIZE-CVR-ZERO-694, ZEROIZE Switch Cover, ZEROIZE Switch Cover, , OPEN/CLOSE, (-1, 0, 1) [695] = "%1d", --PTR-ZROIZE-TMB-ZERO-695, ZEROIZE Switch, ZEROIZE Switch, , OFP/OFF/DATA, (-1, -1, 1) - [430] = "%1d", --PTR-AUDIO1-LVR-COMM1-430, COMM 1 Power Knob, COMM 1 Power Knob, , , (0, 0, 1) - [431] = "%1d", --PTR-AUDIO1-LVR-COMM2-431, COMM 2 Power Knob, COMM 2 Power Knob, , , (0, 0, 1) - [432] = "%1d", --PTR-AUDIO1-LVR-SV-432, SECURE VOICE Knob, SECURE VOICE Knob, , , (0, 0, 1) - [433] = "%1d", --PTR-AUDIO1-LVR-MSL-433, MSL Tone Knob, MSL Tone Knob, , , (0, 0, 1) - [436] = "%1d", --PTR-AUDIO1-LVR-TF-436, TF Tone Knob, TF Tone Knob, , , (0, 0, 1) - [437] = "%1d", --PTR-AUDIO1-LVR-THREAT-437, THREAT Tone Knob, THREAT Tone Knob, , , (0, 0, 1) - [442] = "%1d", --PTR-AUDIO2-LVR-ILS-442, ILS Power Knob, ILS Power Knob, , , (0, 0, 1) - [441] = "%1d", --PTR-AUDIO2-LVR-TACAN-441, TACAN Knob, TACAN Knob, , , (0, 0, 1) - [440] = "%1d", --PTR-AUDIO2-LVR-INTERCOM-440, INTERCOM Knob, INTERCOM Knob, , , (0, 0, 1) + [430] = "%.2f", --PTR-AUDIO1-LVR-COMM1-430, COMM 1 Power Knob, COMM 1 Power Knob, , , (0, 0, 1) + [431] = "%.2f", --PTR-AUDIO1-LVR-COMM2-431, COMM 2 Power Knob, COMM 2 Power Knob, , , (0, 0, 1) + [432] = "%.2f", --PTR-AUDIO1-LVR-SV-432, SECURE VOICE Knob, SECURE VOICE Knob, , , (0, 0, 1) + [433] = "%.2f", --PTR-AUDIO1-LVR-MSL-433, MSL Tone Knob, MSL Tone Knob, , , (0, 0, 1) + [436] = "%.2f", --PTR-AUDIO1-LVR-TF-436, TF Tone Knob, TF Tone Knob, , , (0, 0, 1) + [437] = "%.2f", --PTR-AUDIO1-LVR-THREAT-437, THREAT Tone Knob, THREAT Tone Knob, , , (0, 0, 1) + [442] = "%.2f", --PTR-AUDIO2-LVR-ILS-442, ILS Power Knob, ILS Power Knob, , , (0, 0, 1) + [441] = "%.2f", --PTR-AUDIO2-LVR-TACAN-441, TACAN Knob, TACAN Knob, , , (0, 0, 1) + [440] = "%.2f", --PTR-AUDIO2-LVR-INTERCOM-440, INTERCOM Knob, INTERCOM Knob, , , (0, 0, 1) [443] = "%1d", --PTR-AUDIO2-TMB-MODE-443, HOT MIC CIPHER Switch, HOT MIC CIPHER Switch, , HOT MIC / OFF / CIPHER, (1, -1, 1) [711] = "%1d", --PTR-ANTICE-TMB-IFF-711, IFF ANT SEL Switch, IFF ANT SEL Switch, , LOWER/NORM/UPPER, (1, -1, 1) [712] = "%1d", --PTR-ANTICE-TMB-UHF-712, UHF ANT SEL Switch, UHF ANT SEL Switch, , LOWER/NORM/UPPER, (1, -1, 1) @@ -587,10 +591,10 @@ ExportScript.ConfigArguments = [185] = "%1d", --PTR-ICP-TMB-RTNSEQ-DN-185, ICP Data Control Switch, ICP Data Control Switch, , DN, (-1, -1, 0) [185] = "%1d", --PTR-ICP-TMB-RTNSEQ-DN-185, ICP Data Control Switch, ICP Data Control Switch, , DN, (-1, -1, 0) [100] = "%1d", --PTR-CLCP-TMB-RF-100, RF Switch, RF Switch, , SILENT/QUIET/NORM, (-1, -1, 1) - [192] = "%1d", --PTR-ICP-LVR-RET-192, ICP Reticle Depression Control Knob, ICP Reticle Depression Control Knob, , , (0, 0, 1) - [193] = "%1d", --PTR-ICP-LVR-CONT-193, ICP Raster Contrast Knob, ICP Raster Contrast Knob, , , (0, 0, 1) - [190] = "%.1f", --PTR-ICP-LVR-SYM-190, ICP HUD Symbology Intensity Knob, ICP HUD Symbology Intensity Knob, , , (0,1) - [191] = "%1d", --PTR-ICP-LVR-BRT-191, ICP Raster Intensity Knob, ICP Raster Intensity Knob, , , (0, 0, 1) + [192] = "%.2f", --PTR-ICP-LVR-RET-192, ICP Reticle Depression Control Knob, ICP Reticle Depression Control Knob, , , (0, 0, 1) + [193] = "%.2f", --PTR-ICP-LVR-CONT-193, ICP Raster Contrast Knob, ICP Raster Contrast Knob, , , (0, 0, 1) + [190] = "%.2f", --PTR-ICP-LVR-SYM-190, ICP HUD Symbology Intensity Knob, ICP HUD Symbology Intensity Knob, , , (0,1) + [191] = "%.2f", --PTR-ICP-LVR-BRT-191, ICP Raster Intensity Knob, ICP Raster Intensity Knob, , , (0, 0, 1) [718] = "%1d", --PTR-AVIPWR-TMB-UFC-718, UFC Switch, UFC Switch, , UFC/OFF, (1, 0, 1) [182] = "%1d", --PTR-ICP-BTN-NMB0-182, ICP Priority Function Button, ICP Priority Function Button, , 0(M-SEL), (1, 0, 1) [171] = "%1d", --PTR-ICP-BTN-NMB1-171, ICP Priority Function Button, ICP Priority Function Button, , 1(T-ILS), (1, 0, 1) @@ -624,7 +628,7 @@ ExportScript.ConfigArguments = -- UHF_CONTROL_PANEL(37) [419] = "%1d", --PTR-ANARC164-SQUELCH-419, UHF SQUELCH Switch, UHF SQUELCH Switch, , , (-1, 0, 1) [734] = "%1d", --PTR_ANARC164-CHNL-SELECTOR01-734, Access Door, Access Door, , OPEN/CLOSE, (-1, 0, 1) - [420] = "%1d", --PTR-ANARC164-VOLUME-420, UHF VOL Knob, UHF VOL Knob, , , (0, 0, 1) + [420] = "%.2f", --PTR-ANARC164-VOLUME-420, UHF VOL Knob, UHF VOL Knob, , , (0, 0, 1) [418] = "%1d", --PTR-ANARC164-T-TONE-418, UHF Tone Button, UHF Tone Button, , , (1, 0, 1) [419] = "%1d", --PTR-ANARC164-SQUELCH-419, UHF SQUELCH Switch, UHF SQUELCH Switch, , , (1, 0, 1) [421] = "%1d", --PTR-ANARC164-TEST-DISPLAY-421, UHF TEST DISPLAY Button, UHF TEST DISPLAY Button, , , (1, 0, 1) From eb4879f2147e6bbfeb8d385e6f05647c2f75eb6b Mon Sep 17 00:00:00 2001 From: Quasar Date: Tue, 10 Sep 2024 17:35:23 +0800 Subject: [PATCH 03/19] fix: ky-58 volume int -> float --- Scripts/DCS-ExportScript/ExportsModules/F-16C_50.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/F-16C_50.lua b/Scripts/DCS-ExportScript/ExportsModules/F-16C_50.lua index 8f2b36a5..7237379b 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/F-16C_50.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/F-16C_50.lua @@ -445,7 +445,7 @@ ExportScript.ConfigArguments = [434] = "%.1f", --PTR-AUDIO1-TMB-COMM1-434, COMM 1 (UHF) Mode Knob, COMM 1 (UHF) Mode Knob, , , (-0.5, 0, 1) [435] = "%.1f", --PTR-AUDIO1-TMB-COMM2-435, COMM 2 (VHF) Mode Knob, COMM 2 (VHF) Mode Knob, , , (-0.5, 0, 1) -- KY58(42) - [708] = "%1d", --PTR-KY58-LVR-VOL-708, KY-58 VOLUME Knob, KY-58 VOLUME Knob, , , (0, 0, 1) + [708] = "%.2f", --PTR-KY58-LVR-VOL-708, KY-58 VOLUME Knob, KY-58 VOLUME Knob, , , (0, 0, 1) [705] = "%.1f", --PTR-KY58-LVR-MODE1-705, KY-58 MODE Knob, KY-58 MODE Knob, , P/C/LD/RV, (0.1, 0, 0.3) [706] = "%.1f", --PTR-KY58-LVR-MODE2-706, KY-58 FILL Knob, KY-58 FILL Knob, , Z 1-5/1/2/3/4/5/6/Z ALL, (0.1, 0, 0.7) [705] = "%.1f", --PTR-KY58-LVR-MODE1-705, KY-58 MODE Knob, KY-58 MODE Knob, , P/C/LD/RV, (-0.1, 0, 0.3) From 8efdf660bdb5df0cad201ad434a1906159a8dbf7 Mon Sep 17 00:00:00 2001 From: Quasar Date: Tue, 10 Sep 2024 17:37:20 +0800 Subject: [PATCH 04/19] chore: add git ignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 4008f5e1..04132562 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,6 @@ luac.out # Working Files # *.psd + +# JetBrains IDEs' workdir +.idea \ No newline at end of file From 8d15430a24a826d44ab468e61f9421749df153ea Mon Sep 17 00:00:00 2001 From: Quasar Date: Tue, 10 Sep 2024 18:34:39 +0800 Subject: [PATCH 05/19] feat: complete JF-17 ufc display (from Norsk_L) --- .../DCS-ExportScript/ExportsModules/JF-17.lua | 80 ++++++++++++++++++- 1 file changed, 77 insertions(+), 3 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/JF-17.lua b/Scripts/DCS-ExportScript/ExportsModules/JF-17.lua index 7edcab52..e41c3242 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/JF-17.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/JF-17.lua @@ -454,6 +454,80 @@ function ExportScript.ProcessIkarusDCSConfigLowImportance(mainPanelDevice) ExportScript.arrowExample(mainPanelDevice) ExportScript.RadioTile(mainPanelDevice) + -- UFCP Text Display Windows 1-4 + local ufcp_1 = ExportScript.Tools.split(list_indication(3), "%c")[6] + local ufcp_2 = ExportScript.Tools.split(list_indication(4), "%c")[6] + local ufcp_3 = ExportScript.Tools.split(list_indication(5), "%c")[6] + local ufcp_4 = ExportScript.Tools.split(list_indication(6), "%c")[6] + local radio1 = ExportScript.Tools.split(list_indication(7), "%c")[3] + local radio2 = ExportScript.Tools.split(list_indication(7), "%c")[8] + + + -- Temporary fix: DCS-ExportScript uses colons (:) as separation between uplink messages. + -- Replace all colons with semicolons for TOT view, TODO: add escape char parsing in streamdeck plugin (ctytler). + ufcp_1 = ufcp_1:gsub(":",";") + ufcp_2 = ufcp_2:gsub(":",";") + ufcp_3 = ufcp_3:gsub(":",";") + ufcp_4 = ufcp_4:gsub(":",";") + radio1 = radio1:gsub(":",";") + radio1 = radio1:gsub(":",";") + + -- The below logic handles the case where a UFCP display has been selected for entry and + -- has blinking "--". + -- Additional logic could be added to handle the blinking itself and show the other side + -- with the e.g. win1fill value, however this logic seemed sufficient for now. + if ufcp_1 == nil then + ufcp_1 = "" + elseif list_indication(3):match("txt_win1r") then + ufcp_1 = string.format("%8s", ufcp_1) + end + if ufcp_2 == nil then + ufcp_2 = "" + elseif list_indication(3):match("txt_win2r") then + ufcp_2 = string.format("%8s", ufcp_2) + end + if ufcp_3 == nil then + ufcp_3 = "" + elseif list_indication(3):match("txt_win3r") then + ufcp_3 = string.format("%8s", ufcp_3) + end + if ufcp_4 == nil then + ufcp_4 = "" + elseif list_indication(3):match("txt_win4r") then + ufcp_4 = string.format("%8s", ufcp_4) + end + if radio1 == nil then + radio1 = "" + elseif list_indication(7):match("txt_win4r") then + radio1 = string.format("%8s", radio1) + end + if radio2 == nil then + radio2 = "" + elseif list_indication(7):match("txt_win4r") then + radio2 = string.format("%8s", radio2) + end + -- Full 8 character strings. + ExportScript.Tools.SendData(2001, string.format("%-8s", ufcp_1)) + ExportScript.Tools.SendData(2002, string.format("%-8s", ufcp_2)) + ExportScript.Tools.SendData(2003, string.format("%-8s", ufcp_3)) + ExportScript.Tools.SendData(2004, string.format("%-8s", ufcp_4)) + ExportScript.Tools.SendData(2013, string.format("%-8s", radio1)) + ExportScript.Tools.SendData(2016, string.format("%-8s", radio2)) + -- Left-Hand 4 character strings. + ExportScript.Tools.SendData(2005, string.format("%-4s", ufcp_1:sub(1,4))) + ExportScript.Tools.SendData(2006, string.format("%-4s", ufcp_2:sub(1,4))) + ExportScript.Tools.SendData(2007, string.format("%-4s", ufcp_3:sub(1,4))) + ExportScript.Tools.SendData(2008, string.format("%-4s", ufcp_4:sub(1,4))) + ExportScript.Tools.SendData(2014, string.format("%-4s", radio1:sub(1,4))) + ExportScript.Tools.SendData(2017, string.format("%-4s", radio2:sub(1,4))) + -- Right Hand 4 character strings. + ExportScript.Tools.SendData(2009, string.format("%-4s", ufcp_1:sub(5,8))) + ExportScript.Tools.SendData(2010, string.format("%-4s", ufcp_2:sub(5,8))) + ExportScript.Tools.SendData(2011, string.format("%-4s", ufcp_3:sub(5,8))) + ExportScript.Tools.SendData(2012, string.format("%-4s", ufcp_4:sub(5,8))) + ExportScript.Tools.SendData(2015, string.format("%-4s", radio1:sub(5,8))) + ExportScript.Tools.SendData(2018, string.format("%-4s", radio2:sub(5,8))) + end function ExportScript.ProcessDACConfigLowImportance(mainPanelDevice) @@ -482,9 +556,9 @@ function ExportScript.RadioTile(mainPanelDevice) local radio1 = (GetDevice(25):get_frequency())/1000000 --left radio freq unrounded local radio2 = (GetDevice(26):get_frequency())/1000000 --right radio freq unrounded - - ExportScript.Tools.SendData(2001, radio1) --results in "108.000568" for channel 1 - ExportScript.Tools.SendData(2002, radio2) --results in "108.500744" for channel 2 + + ExportScript.Tools.SendData(12001, radio1) --results in "108.000568" for channel 1 + ExportScript.Tools.SendData(12002, radio2) --results in "108.500744" for channel 2 end ----------------------- -- General Functions -- From ca4857a8a24b40f5a831abd549230674c528c0a6 Mon Sep 17 00:00:00 2001 From: Quasar Date: Tue, 10 Sep 2024 18:35:09 +0800 Subject: [PATCH 06/19] fix: refine JF-17 formation light & anti-collision light var type (from Norsk_L) --- Scripts/DCS-ExportScript/ExportsModules/JF-17.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/JF-17.lua b/Scripts/DCS-ExportScript/ExportsModules/JF-17.lua index e41c3242..9fee16cd 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/JF-17.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/JF-17.lua @@ -419,8 +419,8 @@ ExportScript.ConfigArguments = [942] = "%.3f", -- ECS Mode Knob Selector, DE-SMK/NORM/OFF/RAM {0,0.333,0.666,0.999} [943] = "%1d", -- Defog Button, OUT/IN {0,1} [947] = "%1d", -- Exterior Light Master Switch, NVG/OFF/NORMAL {-1,0,1} - [948] = "%.1f", -- Formation Light Knob Selector, OFF/1/2/3/4/BRT {0,0.2,0.4,0.6,0.8,1} - [949] = "%.1f", -- Anti-Collision Light Knob Selector, OFF/1/2/3/4/CODE {0,0.2,0.4,0.6,0.8,1} + [948] = "%.2f", -- Formation Light Knob Selector, OFF/1/2/3/4/BRT {0,0.25,0.50,0.75,1.0} + [949] = "%.2f", -- Anti-Collision Light Knob Selector, OFF/1/2/3/4/CODE {0,0.25,0.50,0.75,1.0} [950] = "%1d", -- Navigation Light Switch, DIM/OFF/BRIGHT {-1,0,1} [951] = "%1d", -- Navigation Light Switch, STEADY/FLASH {-1,1} [952] = "%1d", -- Light Switch, TOW/OFF/ANTI-COLLISION {-1,0,1} From b52389cd813d7afcf1b013133dd1dfdf74ed99f1 Mon Sep 17 00:00:00 2001 From: Quasar Date: Wed, 11 Sep 2024 10:19:56 +0800 Subject: [PATCH 07/19] chore: added independent display of chaff and flare quantities for MiG-29 --- .../ExportsModules/FC_AuxiliaryFuntions.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/FC_AuxiliaryFuntions.lua b/Scripts/DCS-ExportScript/ExportsModules/FC_AuxiliaryFuntions.lua index 436a690a..818928ca 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/FC_AuxiliaryFuntions.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/FC_AuxiliaryFuntions.lua @@ -1640,17 +1640,21 @@ end function ExportScript.AF.FC_Russian_FlareChaff_MiG29(FunctionTyp) local lFunctionTyp = FunctionTyp or "Ikarus" local lSnares = LoGetSnares() -- Flare and Chaff - --ExportScript.Tools.WriteToLog('lSnares: '..ExportScript.Tools.dump(lSnares)) + -- ExportScript.Tools.WriteToLog('lSnares: '..ExportScript.Tools.dump(lSnares)) --[chaff] = number: "30" --[flare] = number: "30" if ExportScript.Config.DACExport and lFunctionTyp == "DAC" then - ExportScript.Tools.SendDataDAC(800, lSnares.chaff + lSnares.flare ) + ExportScript.Tools.SendDataDAC(800, lSnares.chaff + lSnares.flare) + ExportScript.Tools.SendDataDAC(1801, lSnares.chaff) + ExportScript.Tools.SendDataDAC(1802, lSnares.flare) end if ExportScript.Config.IkarusExport and lFunctionTyp == "Ikarus" then - ExportScript.Tools.SendData(800, lSnares.chaff + lSnares.flare ) + ExportScript.Tools.SendData(800, lSnares.chaff + lSnares.flare) + ExportScript.Tools.SendData(1801, lSnares.chaff) + ExportScript.Tools.SendData(1802, lSnares.flare) end end From a96c9d8db3f5188dc0424dd02b86c67464695ef5 Mon Sep 17 00:00:00 2001 From: Quasar Date: Wed, 11 Sep 2024 10:20:56 +0800 Subject: [PATCH 08/19] chore: refine pitch & roll radio switch value for F-15E (float to int) --- Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua b/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua index 3f145ee3..d2c86740 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua @@ -432,7 +432,7 @@ ExportScript.ConfigArguments = -- arguments for export in low tick interval base [351] = "%.1f", -- PILOT Backup ADI Cage/Pitch Adjust Knob ( DEVICE_ID: 17 DCS_ID: 3351) [350] = "%.1f", -- PILOT Backup ADI Cage/Pitch Adjust Pull ( DEVICE_ID: 17 DCS_ID: 3350) [366] = "%.1f", -- PILOT Clock adjust ( DEVICE_ID: 17 DCS_ID: 3366) - [335] = "%.1f", -- PILOT Pitch Ratio Switch ( DEVICE_ID: 18 DCS_ID: 3335) + [335] = "%1d", -- PILOT Pitch Ratio Switch ( DEVICE_ID: 18 DCS_ID: 3335) [367] = "%.1f", -- PILOT Timer Stop ( DEVICE_ID: 17 DCS_ID: 3367) -- Fuel [532] = "%.1f", -- PILOT External Fuel Transfer ( DEVICE_ID: 16 DCS_ID: 3532) @@ -541,7 +541,7 @@ ExportScript.ConfigArguments = -- arguments for export in low tick interval base [535] = "%.1f", -- PILOT Left Inlet Ramp Switch ( DEVICE_ID: 15 DCS_ID: 3535) [401] = "%.1f", -- PILOT Master Caution Button ( DEVICE_ID: 29 DCS_ID: 3401) [536] = "%.1f", -- PILOT Right Inlet Ramp Switch ( DEVICE_ID: 15 DCS_ID: 3536) - [534] = "%.1f", -- PILOT Roll Ratio Switch ( DEVICE_ID: 18 DCS_ID: 3534) + [534] = "%1d", -- PILOT Roll Ratio Switch ( DEVICE_ID: 18 DCS_ID: 3534) [342] = "%.1f", -- PILOT Rudder Pedal Ajust Handle ( DEVICE_ID: 18 DCS_ID: 3342) -- Misc Controls [1010] = "%.1f", -- Mirror Center Adjust Angle ( DEVICE_ID: 24 DCS_ID: 3910) From 3d59dbecc9663892eff5ac3ec34dd325a853ead7 Mon Sep 17 00:00:00 2001 From: Quasar Date: Wed, 11 Sep 2024 10:27:37 +0800 Subject: [PATCH 09/19] feat: add spin cover, generator tie cover for F/A-18C --- .../ExportsModules/FA-18C_hornet.lua | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/FA-18C_hornet.lua b/Scripts/DCS-ExportScript/ExportsModules/FA-18C_hornet.lua index ceae3371..60290157 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/FA-18C_hornet.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/FA-18C_hornet.lua @@ -34,7 +34,7 @@ ExportScript.ConfigEveryFrameArguments = [242] = "%.4f", -- HydIndBrake {0.0, 1000.0, 2000.0, 3000.0, 4000.0, 5000.0}{0.0, 0.036, 0.338, 0.636, 0.924, 1.0} -- Gear Interface [228] = "%.4f", -- EmergGearDownHandle - -- [240] = "%.4f", -- EmergParkBrakeHandle delete + [240] = "%.4f", -- EmergParkBrakeHandle -- Instruments -------------------------- -- Standby Pressure Altimeter AAU-52/A [218] = "%.4f", -- Altimeter_100_footPtr {0.0, 1000.0} {0.0, 1.0} @@ -184,7 +184,6 @@ ExportScript.ConfigEveryFrameArguments = [149] = "%.4f", -- heading [150] = "%.4f", -- pitch [151] = "%.4f", -- bank - } ExportScript.ConfigArguments = { @@ -199,6 +198,7 @@ ExportScript.ConfigArguments = [347] = "%1d", -- GAIN Switch, NORM/ORIDE [234] = "%1d", -- FLAP Switch, AUTO/HALF/FULL {-1.0,0.0,1.0} [138] = "%1d", -- Spin Recovery Switch, RCVY/NORM + [139] = "%1d", -- Spin Recovery Switch Cover, OPEN/CLOSE {0.0,1.0} [470] = "%1d", -- FCS BIT Switch [295] = "%1d", -- Wing Fold Control Handle, (RMB)CW/(LMB)CCW [296] = "%1d", -- Wing Fold Control Handle, (MW)PULL/STOW @@ -208,6 +208,7 @@ ExportScript.ConfigArguments = [402] = "%1d", -- Left Generator Control Switch, NORM/OFF [403] = "%1d", -- Right Generator Control Switch, NORM/OFF [378] = "%1d", -- Generator TIE Control Switch, NORM/RESET + [379] = "%1d", -- Generator TIE Control Cover [336] = "%1d", -- External Power Switch, RESET/NORM/OFF {-1.0,0.0,1.0} [332] = "%1d", -- Ground Power Switch 1, A ON/AUTO/B ON {-1.0,0.0,1.0} [333] = "%1d", -- Ground Power Switch 2, A ON/AUTO/B ON {-1.0,0.0,1.0} @@ -303,7 +304,6 @@ ExportScript.ConfigArguments = [159] = "%1d", -- Station Jettison Select Button, RIGHT IN [161] = "%1d", -- Station Jettison Select Button, RIGHT OUT [235] = "%1d", -- Selective Jettison Pushbutton - --[236] = "%1d", -- Selective Jettison Knob, L FUS MSL/SAFE/R FUS MSL/ RACK/LCHR /STORES {0.0,0.1,0.2,0.3,0.4} [236] = "%.1f", -- Selective Jettison Knob, L FUS MSL/SAFE/R FUS MSL/ RACK/LCHR /STORES {0.0,0.1,0.2,0.3,0.4} [135] = "%.1f", -- IR Cooling Switch, ORIDE/NORM/OFF {0.0,0.1,0.2} -- Fire Systems @@ -315,7 +315,6 @@ ExportScript.ConfigArguments = [28] = "%1d", -- Right Engine/AMAD Fire Warning/Extinguisher Light - (RMB) cover control -- Multipurpose Display Group ----------- -- Head-Up Display - --[140] = "%1d", -- HUD Symbology Reject Switch, NORM/REJ 1/REJ 2 {0.0,0.1,0.2} [140] = "%.1f", -- HUD Symbology Reject Switch, NORM/REJ 1/REJ 2 {0.0,0.1,0.2} [141] = "%.2f", -- HUD Symbology Brightness Control Knob {0.0,1.0} in 0.1 Steps [142] = "%1d", -- HUD Symbology Brightness Selector Knob, DAY/NIGHT @@ -326,7 +325,6 @@ ExportScript.ConfigArguments = [147] = "%1d", -- HUD Altitude Switch, BARO/RDR [148] = "%1d", -- HUD Attitude Selector Switch, INS/AUTO/STBY {-1.0,0.0,1.0} -- Left MDI - --[51] = "%1d", -- Left MDI Brightness Selector Knob, OFF/NIGHT/DAY {0.0,0.1,0.2} [51] = "%.1f", -- Left MDI Brightness Selector Knob, OFF/NIGHT/DAY {0.0,0.1,0.2} [52] = "%.2f", -- Left MDI Brightness Control Knob {0.0,1.0} in 0.1 Steps [53] = "%.2f", -- Left MDI Contrast Control Knob {0.0,1.0} in 0.1 Steps @@ -534,7 +532,7 @@ function ExportScript.ProcessIkarusDCSConfigLowImportance(mainPanelDevice) ExportScript.Tools.SendData("ExportID", "Format") ExportScript.Tools.SendData(2000, string.format("%7.3f", lUHFRadio:get_frequency()/1000000)) <- special function for get frequency data ]] - + --this "calls" the function. the actual function is located at the bottom of the file ExportScript.TripleFireFeature(mainPanelDevice) -- Kneeboard Info. Contains Name of carrier, callsign, ATC freq, tacan, ils, and link4 @@ -543,7 +541,6 @@ function ExportScript.ProcessIkarusDCSConfigLowImportance(mainPanelDevice) --ExportScript.Tools.WriteToLog('list_cockpit_params(): '..ExportScript.Tools.dump(list_cockpit_params())) -- IFEI - Engine, Fuel and Clock informations - local lEngineFuelClock = ExportScript.Tools.getListIndicatorValue(5) if ExportScript.Config.Debug then ExportScript.Tools.WriteToLog('EngineFuelClock: '..ExportScript.Tools.dump(lEngineFuelClock)) @@ -604,7 +601,7 @@ function ExportScript.ProcessIkarusDCSConfigLowImportance(mainPanelDevice) ExportScript.Tools.SendData(2020, ExportScript.Tools.DisplayFormat(lUFCDisplays.UFC_ScratchPadString1Display, 2)) -- ScratchPadString1Display 2 character ExportScript.Tools.SendData(2021, ExportScript.Tools.DisplayFormat(lUFCDisplays.UFC_ScratchPadString2Display, 2)) -- ScratchPadString2Display 2 character ExportScript.Tools.SendData(2022, ExportScript.Tools.DisplayFormat(lUFCDisplays.UFC_ScratchPadNumberDisplay, 7)) -- ScratchPadNumberDisplay 7 character - ExportScript.Tools.SendData(2090, ExportScript.Tools.DisplayFormat( lUFCDisplays.UFC_ScratchPadString1Display .. lUFCDisplays.UFC_ScratchPadString2Display, 4) .. "\n" .. ExportScript.Tools.DisplayFormat(lUFCDisplays.UFC_ScratchPadNumberDisplay, 7)) -- ScratchPadString2Display all characters + ExportScript.Tools.SendData(2090, ExportScript.Tools.DisplayFormat(lUFCDisplays.UFC_ScratchPadString1Display .. lUFCDisplays.UFC_ScratchPadString2Display, 4) .. "\n" .. ExportScript.Tools.DisplayFormat(lUFCDisplays.UFC_ScratchPadNumberDisplay, 7)) -- ScratchPadString2Display all characters local lTmpCueing = " " -- Option Displays @@ -737,28 +734,28 @@ end function ExportScript.TripleFireFeature(mainPanelDevice) - --This function will get the status of the three fire lights. + --This function will get the status of the three fire lights. --When a light is lit, its text will be exported - + --we will make the variable 'light_leftEngFireValue' --it will contain the value of the light animation for the left engine fire light local light_leftEngFireValue = mainPanelDevice:get_argument_value(10) --'light_rightEngFireValue' will contain the value of the light animation for the right engine fire light local light_rightEngFireValue = mainPanelDevice:get_argument_value(26) - + --'light_apuFireValue' will contain the value of the light animation for the apu fire light local light_apuFireValue = mainPanelDevice:get_argument_value(29) - + --now that we have all of the values, we have to create some logic to see if any of them are on - + --a variable that begins with "is" can be considered a boolean, --which means we will make it true or false, represented by 1 or 0, respectively - + local isLeftEngFireLit local isRightEngFireLit local isApuFireLit - + --using the modelViewer, you can see that the light comes on for values above 0.51-ish --we will take that value and determine the true/false of its related boolean (bool) if light_leftEngFireValue > 0.51 then @@ -766,20 +763,20 @@ function ExportScript.TripleFireFeature(mainPanelDevice) else isLeftEngFireLit = 0 end - + --we will do the same for the right engine and apu if light_leftEngFireValue > 0.51 then isRightEngFireLit = 1 else isRightEngFireLit = 0 end - + if light_apuFireValue > 0.51 then isApuFireLit = 1 else isApuFireLit = 0 end - + --now that we have the status of all of the lights, we will use them in another logic local isFireHappening --if any of these values are true, there is a fire @@ -788,10 +785,10 @@ function ExportScript.TripleFireFeature(mainPanelDevice) else isFireHappening = 0 end - + --now we export the results in a unique export ID ExportScript.Tools.SendData(3000, isFireHappening) - + --But, remember how we also wanted the text too? --We will do that like this --if a light is lit, then we populate the variable with a string @@ -806,7 +803,7 @@ function ExportScript.TripleFireFeature(mainPanelDevice) else whatIsOnFire = "" --it will be blank if nothing is on fire end - + --use 3001 as a 'Title Text Change' in the streamdeck ExportScript.Tools.SendData(3001, whatIsOnFire) end \ No newline at end of file From 390729a8d1ed6c5dca0e48b1faf44b50e05f2719 Mon Sep 17 00:00:00 2001 From: Quasar Date: Wed, 11 Sep 2024 10:30:55 +0800 Subject: [PATCH 10/19] style: format JF-17 script --- Scripts/DCS-ExportScript/ExportsModules/JF-17.lua | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/JF-17.lua b/Scripts/DCS-ExportScript/ExportsModules/JF-17.lua index 9fee16cd..684ed760 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/JF-17.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/JF-17.lua @@ -451,8 +451,8 @@ end function ExportScript.ProcessIkarusDCSConfigLowImportance(mainPanelDevice) -ExportScript.arrowExample(mainPanelDevice) -ExportScript.RadioTile(mainPanelDevice) + ExportScript.arrowExample(mainPanelDevice) + ExportScript.RadioTile(mainPanelDevice) -- UFCP Text Display Windows 1-4 local ufcp_1 = ExportScript.Tools.split(list_indication(3), "%c")[6] @@ -461,17 +461,17 @@ ExportScript.RadioTile(mainPanelDevice) local ufcp_4 = ExportScript.Tools.split(list_indication(6), "%c")[6] local radio1 = ExportScript.Tools.split(list_indication(7), "%c")[3] local radio2 = ExportScript.Tools.split(list_indication(7), "%c")[8] - - + + -- Temporary fix: DCS-ExportScript uses colons (:) as separation between uplink messages. - -- Replace all colons with semicolons for TOT view, TODO: add escape char parsing in streamdeck plugin (ctytler). + -- Replace all colons with semicolons for TOT view, TODO: add escape char parsing in streamdeck plugin (ctytler). ufcp_1 = ufcp_1:gsub(":",";") ufcp_2 = ufcp_2:gsub(":",";") ufcp_3 = ufcp_3:gsub(":",";") ufcp_4 = ufcp_4:gsub(":",";") radio1 = radio1:gsub(":",";") radio1 = radio1:gsub(":",";") - + -- The below logic handles the case where a UFCP display has been selected for entry and -- has blinking "--". -- Additional logic could be added to handle the blinking itself and show the other side @@ -527,7 +527,6 @@ ExportScript.RadioTile(mainPanelDevice) ExportScript.Tools.SendData(2012, string.format("%-4s", ufcp_4:sub(5,8))) ExportScript.Tools.SendData(2015, string.format("%-4s", radio1:sub(5,8))) ExportScript.Tools.SendData(2018, string.format("%-4s", radio2:sub(5,8))) - end function ExportScript.ProcessDACConfigLowImportance(mainPanelDevice) From 4d5b1ae4127bdc558c9c6213196c3e03a146c21c Mon Sep 17 00:00:00 2001 From: Quasar Date: Wed, 11 Sep 2024 23:43:32 +0800 Subject: [PATCH 11/19] fix: refine FLIR, LTD/R, LST/NFLR, RWR buttons, park brake remove duplicate EmergParkBrakeHandle --- .../ExportsModules/FA-18C_hornet.lua | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/FA-18C_hornet.lua b/Scripts/DCS-ExportScript/ExportsModules/FA-18C_hornet.lua index 60290157..e02c911d 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/FA-18C_hornet.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/FA-18C_hornet.lua @@ -34,7 +34,6 @@ ExportScript.ConfigEveryFrameArguments = [242] = "%.4f", -- HydIndBrake {0.0, 1000.0, 2000.0, 3000.0, 4000.0, 5000.0}{0.0, 0.036, 0.338, 0.636, 0.924, 1.0} -- Gear Interface [228] = "%.4f", -- EmergGearDownHandle - [240] = "%.4f", -- EmergParkBrakeHandle -- Instruments -------------------------- -- Standby Pressure Altimeter AAU-52/A [218] = "%.4f", -- Altimeter_100_footPtr {0.0, 1000.0} {0.0, 1.0} @@ -165,18 +164,15 @@ ExportScript.ConfigEveryFrameArguments = [468] = "%1d", -- IFEI [469] = "%1d", -- IFEI_buttons -- RWR - [276] = "%1d", -- Lower - --[273] = "%1d", -- Limit + [276] = "%.1f", -- Lower [273] = "%.1f", -- Limit - [274] = "%1d", -- Display - --[270] = "%1d", -- SpecialEn - [271] = "%1d", -- Special - --[267] = "%1d", -- Enable + [274] = "%.1f", -- Display + --[270] = "%.1f", -- SpecialEn + [271] = "%.1f", -- Special [267] = "%.1f", -- Enable - [268] = "%1d", -- Offset - --[264] = "%1d", -- Fail + [268] = "%.1f", -- Offset [264] = "%.1f", -- Fail - [265] = "%1d", -- Bit + [265] = "%.1f", -- Bit [520] = "%.1f", -- RwrLightsBrightness -- CMDS [516] = "%1d", -- ecmJett @@ -230,7 +226,7 @@ ExportScript.ConfigArguments = [368] = "%1d", -- MC Switch, 1 OFF/NORM/2 OFF {-1.0,0.0,1.0} -- Power Plant [375] = "%1d", -- APU Control Switch, ON/OFF - [377] = "%1d", -- Engine Crank Switch, LEFT/OFF/RIGHT {-1.0,0.0,1.0} + [377] = "%1d", -- Engine Crank Switch, LEFT/OFF/RIGHT {-1,0,1} [331] = "%1d", -- Fire and Bleed Air Test Switch, (RMB) TEST A/(LMB) TEST B {-1.0,0.0,1.0} -- Hydraulic system [369] = "%1d", -- Hydraulic Isolate Override Switch, NORM/ORIDE @@ -239,8 +235,8 @@ ExportScript.ConfigArguments = [228] = "%1d", -- Landing Gear Control Handle, (MW)EMERGENCY DOWN {0.0,1.0} ??? [229] = "%1d", -- Down Lock Override Button - Push to unlock [238] = "%1d", -- Anti Skid Switch, ON/OFF - [240] = "%.3f", -- Emergency/Parking Brake Handle, (MW)Pull-Stow {0.0,1.0} in 0.001 Steps ??? - [241] = "%.3f", -- Emergency/Parking Brake Handle, (LMB)Rotate Left/(RMB)Rotate Right ??? + [240] = "%.1f", -- Emergency/Parking Brake Handle, (0.0: PUSH, 0.5: EMER PULL, 1.0: PARK PULL) + [241] = "%.1f", -- Emergency/Parking Brake Handle, (0.0: EMER, 0.7: PARK) [233] = "%1d", -- Launch Bar Control Switch, EXTEND/RETRACT [293] = "%1d", -- Arresting Hook Handle, UP/DOWN -- Fuel system @@ -499,9 +495,9 @@ ExportScript.ConfigArguments = -- Helmet [136] = "%.2f", -- HMD OFF/BRT Knob {0.0,0.75} in 0.01 Steps -- Targeting Pod, FLIR - [439] = "%.1f", -- FLIR Switch, ON/STBY/OFF {0.0,0.5,1.0} - [441] = "%.1f", -- LTD/R Switch, ARM/SAFE/AFT {0.0,0.5,1.0} - [442] = "%1d", -- LST/NFLR Switch, ON/OFF + [439] = "%1d", -- FLIR Switch, ON/STBY/OFF {-1,0,1} + [441] = "%1d", -- LTD/R Switch, ARM/SAFE {0,1} + [442] = "%1d", -- LST/NFLR Switch, ON/OFF {0,1} } ----------------------------- From 238b5d1f3143999c662f5ce36fa419a667361506 Mon Sep 17 00:00:00 2001 From: Quasar Date: Thu, 12 Sep 2024 00:12:12 +0800 Subject: [PATCH 12/19] fix: refine air condition source, fuel bingo, warning/caution light test for F-15E --- .../ExportsModules/F-15ESE.lua | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua b/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua index d2c86740..ab2b5b4e 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua @@ -355,7 +355,7 @@ ExportScript.ConfigArguments = -- arguments for export in low tick interval base [562] = "%.1f", -- PILOT Air Condition Auto/Manual/Off ( DEVICE_ID: 26 DCS_ID: 3562) [564] = "%.3f", -- PILOT Air Condition Cold/Hot ( DEVICE_ID: 26 DCS_ID: 3564) -- EDITED [563] = "%.1f", -- PILOT Air Condition Max/Norm/Min ( DEVICE_ID: 26 DCS_ID: 3563) - [565] = "%.3f", -- PILOT Air Conditioning Source ( DEVICE_ID: 26 DCS_ID: 3565) -- EDITED + [565] = "%.2f", -- PILOT Air Conditioning Source ( DEVICE_ID: 26 DCS_ID: 3565) -- EDITED -- AMAD Panel [314] = "%.1f", -- PILOT AMAD Fire Extinguisher Switch ( DEVICE_ID: 15 DCS_ID: 3314) [316] = "%.1f", -- PILOT AMAD Fire Switch ( DEVICE_ID: 15 DCS_ID: 3316) @@ -443,7 +443,7 @@ ExportScript.ConfigArguments = -- arguments for export in low tick interval base [527] = "%.1f", -- PILOT Fuel Control: Wing Tanks ( DEVICE_ID: 16 DCS_ID: 3527) [530] = "%.1f", -- PILOT Fuel Dump ( DEVICE_ID: 16 DCS_ID: 3530) -- Fuel Monitor Panel - [385] = "%.1f", -- PILOT Fuel Bingo Selection ( DEVICE_ID: 17 DCS_ID: 3385) + [385] = "%.3f", -- PILOT Fuel Bingo Selection ( DEVICE_ID: 17 DCS_ID: 3385) [381] = "%.1f", -- PILOT Fuel Totalizer Selector ( DEVICE_ID: 17 DCS_ID: 3381) -- Generators [589] = "%.1f", -- PILOT Emergency Generator ( DEVICE_ID: 6 DCS_ID: 3589) @@ -484,7 +484,7 @@ ExportScript.ConfigArguments = -- arguments for export in low tick interval base [574] = "%.1f", -- PILOT Storm FLood Lights ( DEVICE_ID: 23 DCS_ID: 3574) [573] = "%.1f", -- PILOT Warning/Caution Lights ( DEVICE_ID: 23 DCS_ID: 3573) [573] = "%.1f", -- PILOT Warning/Caution Lights Reset ( DEVICE_ID: 23 DCS_ID: 3473) - [569] = "%.1f", -- PILOT Warning/Caution Lights Test ( DEVICE_ID: 23 DCS_ID: 3569) + [569] = "%1d", -- PILOT Warning/Caution Lights Test ( DEVICE_ID: 23 DCS_ID: 3569) -- Landing Gear Panel [337] = "%.1f", -- PILOT Emergency Landing Gear Handle PUSH/PULL ( DEVICE_ID: 21 DCS_ID: 3337) [431] = "%.1f", -- PILOT Emergency Landing Gear Handle ROTATE ( DEVICE_ID: 21 DCS_ID: 3431) @@ -947,7 +947,7 @@ function ExportScript.ProcessIkarusDCSConfigLowImportance(mainPanelDevice) -- Po ExportScript.Tools.SendData(6009,HUD_display(ExportScript.Tools.getListIndicatorValue(1),"VVI")) ExportScript.Tools.SendData(6010,HUD_display(ExportScript.Tools.getListIndicatorValue(1),"NAV")) -- Combined Nav Block - ExportScript.Tools.SendData(6011,HUD_display(ExportScript.Tools.getListIndicatorValue(1),"UPLEFT")) + ExportScript.Tools.SendData(6011,HUD_display(ExportScript.Tools.getListIndicatorValue(1),"UPLEFT")) ExportScript.Tools.SendData(6012,HUD_display(ExportScript.Tools.getListIndicatorValue(1),"LOLEFT")) ExportScript.Tools.SendData(6013,HUD_display(ExportScript.Tools.getListIndicatorValue(1),"UPRIGHT")) ExportScript.Tools.SendData(6014,HUD_display(ExportScript.Tools.getListIndicatorValue(1),"LORIGHT")) @@ -964,7 +964,7 @@ function ExportScript.ProcessIkarusDCSConfigLowImportance(mainPanelDevice) -- Po -- SpeedBrake ExportScript.Tools.SendData(6579,Mech_Data("SPDBRK_Value")) - end + end -------------------------------------------------------------------------------------------------------------- ----------------------- -- GENERAL FUNCTIONS -- @@ -987,7 +987,7 @@ function ExportScript.ListIndicationLogDump(mainPanelDevice) -- list_indication ExportScript.Tools.WriteToLog(ltmp2..': '..ExportScript.Tools.dump(ltmp1)) end end -function Linearize(current_value, raw_tab, final_tab) -- Converts Guage value to readable format +function Linearize(current_value, raw_tab, final_tab) -- Converts Guage value to readable format if current_value <= 0 then return 0 end @@ -1113,7 +1113,7 @@ function FORMAT_SCRATCH(Input) return string.sub(Input,1,4).."\n"..string.sub(Input,5,8).."\n"..string.sub(Input, 9,Len) end end -function PILOT_UFC(UFC_PILOT) -- PILOT UFC export for Norsk-L +function PILOT_UFC(UFC_PILOT) if UFC_PILOT == nil then ExportScript.Tools.SendData(82001,"NO\nDATA") else @@ -1127,15 +1127,15 @@ function PILOT_UFC(UFC_PILOT) -- PILOT UFC export for Norsk-L ExportScript.Tools.SendData(82006,FORMAT_UFCRAD(nilToEmpty(UFC_PILOT.UFC_SC_06))) -- Radio Channel -- CENTRE DESCENDING FROM THE TOP - ExportScript.Tools.SendData(82011,nilToEmpty(UFC_PILOT.UFC_CC_01:gsub(":","."))) - ExportScript.Tools.SendData(82012,nilToEmpty(UFC_PILOT.UFC_CC_02:gsub(":","."))) - ExportScript.Tools.SendData(82013,nilToEmpty(UFC_PILOT.UFC_CC_03:gsub(":","."))) + ExportScript.Tools.SendData(82011,nilToEmpty(UFC_PILOT.UFC_CC_01:gsub(":","."))) + ExportScript.Tools.SendData(82012,nilToEmpty(UFC_PILOT.UFC_CC_02:gsub(":","."))) + ExportScript.Tools.SendData(82013,nilToEmpty(UFC_PILOT.UFC_CC_03:gsub(":","."))) ExportScript.Tools.SendData(82014,FORMAT_SCRATCH(nilToEmpty(UFC_PILOT.UFC_CC_04))) -- SCRATCHPAD - + -- RIGHT SIDE SIDE DESCENDING FROM THE TOP - ExportScript.Tools.SendData(82021,FORMAT_UFC(nilToEmpty(UFC_PILOT.UFC_SC_12))) - ExportScript.Tools.SendData(82022,FORMAT_UFC(nilToEmpty(UFC_PILOT.UFC_SC_11))) - ExportScript.Tools.SendData(82023,FORMAT_UFC(nilToEmpty(UFC_PILOT.UFC_SC_10))) + ExportScript.Tools.SendData(82021,FORMAT_UFC(nilToEmpty(UFC_PILOT.UFC_SC_12))) + ExportScript.Tools.SendData(82022,FORMAT_UFC(nilToEmpty(UFC_PILOT.UFC_SC_11))) + ExportScript.Tools.SendData(82023,FORMAT_UFC(nilToEmpty(UFC_PILOT.UFC_SC_10))) ExportScript.Tools.SendData(82024,FORMAT_UFC(nilToEmpty(UFC_PILOT.UFC_SC_09))) -- RADIO ExportScript.Tools.SendData(82025,FORMAT_UFCRAD(nilToEmpty(UFC_PILOT.UFC_SC_08))) -- Radio Freq @@ -1156,22 +1156,22 @@ function PILOT_UFCa(UFC_PILOT) -- PILOT UFC export for Norsk-L ExportScript.Tools.SendData(82006,FORMAT_UFCRAD(nilToEmpty(UFC_PILOT.UFC_SC_06))) -- Radio Channel -- RIGHT SIDE SIDE DESCENDING FROM THE TOP - ExportScript.Tools.SendData(82012,FORMAT_UFC(nilToEmpty(UFC_PILOT.UFC_SC_12))) - ExportScript.Tools.SendData(82011,FORMAT_UFC(nilToEmpty(UFC_PILOT.UFC_SC_11))) - ExportScript.Tools.SendData(82010,FORMAT_UFC(nilToEmpty(UFC_PILOT.UFC_SC_10))) + ExportScript.Tools.SendData(82012,FORMAT_UFC(nilToEmpty(UFC_PILOT.UFC_SC_12))) + ExportScript.Tools.SendData(82011,FORMAT_UFC(nilToEmpty(UFC_PILOT.UFC_SC_11))) + ExportScript.Tools.SendData(82010,FORMAT_UFC(nilToEmpty(UFC_PILOT.UFC_SC_10))) ExportScript.Tools.SendData(82009,FORMAT_UFC(nilToEmpty(UFC_PILOT.UFC_SC_09))) -- RADIO ExportScript.Tools.SendData(82008,FORMAT_UFCRAD(nilToEmpty(UFC_PILOT.UFC_SC_08))) -- Radio Freq ExportScript.Tools.SendData(82007,FORMAT_UFCRAD(nilToEmpty(UFC_PILOT.UFC_SC_07))) -- Radio Channel --CENTRE DESCENDING FROM THE TOP - ExportScript.Tools.SendData(82013,nilToEmpty(UFC_PILOT.UFC_CC_01:gsub(":","."))) - ExportScript.Tools.SendData(82014,nilToEmpty(UFC_PILOT.UFC_CC_02:gsub(":","."))) - ExportScript.Tools.SendData(82015,nilToEmpty(UFC_PILOT.UFC_CC_03:gsub(":","."))) + ExportScript.Tools.SendData(82013,nilToEmpty(UFC_PILOT.UFC_CC_01:gsub(":","."))) + ExportScript.Tools.SendData(82014,nilToEmpty(UFC_PILOT.UFC_CC_02:gsub(":","."))) + ExportScript.Tools.SendData(82015,nilToEmpty(UFC_PILOT.UFC_CC_03:gsub(":","."))) ExportScript.Tools.SendData(82016,FORMAT_SCRATCH(nilToEmpty(UFC_PILOT.UFC_CC_04))) -- SCRATCHPAD end end -function WSO_UFC(UFC_WSO) -- WSO UFC export for Norsk-L +function WSO_UFC(UFC_WSO) if UFC_WSO == nil then ExportScript.Tools.SendData(82000,"NO\nDATA\nWSO") else From b3cd3bb7b5d7a01503cc4b3b2c01cac23b92cd97 Mon Sep 17 00:00:00 2001 From: Quasar Date: Thu, 12 Sep 2024 01:50:15 +0800 Subject: [PATCH 13/19] fix: refine oxygen switch for F-15E --- Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua b/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua index ab2b5b4e..93bb621f 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua @@ -555,8 +555,8 @@ ExportScript.ConfigArguments = -- arguments for export in low tick interval base [451] = "%.1f", -- PILOT Nuclear Consent Switch ( DEVICE_ID: 17 DCS_ID: 3451) [450] = "%.1f", -- PILOT Nuclear Consent Switch Cover ( DEVICE_ID: 17 DCS_ID: 3450) -- Oxygen Control Panel - [552] = "%.1f", -- PILOT Oxygen 100%/Normal Switch ( DEVICE_ID: 26 DCS_ID: 3552) - [551] = "%.1f", -- PILOT Oxygen Emergency/Normal/Test Switch ( DEVICE_ID: 26 DCS_ID: 3551) + [552] = "%1d", -- PILOT Oxygen 100%/Normal Switch ( DEVICE_ID: 26 DCS_ID: 3552) + [551] = "%1d", -- PILOT Oxygen Emergency/Normal/Test Switch ( DEVICE_ID: 26 DCS_ID: 3551) [553] = "%.1f", -- PILOT Oxygen Supply/Mode Control Switch ( DEVICE_ID: 26 DCS_ID: 3553) -- Radio [514] = "%.1f", -- PILOT Radio Cypher Text Switch ( DEVICE_ID: 17 DCS_ID: 3514) From 529e3f3bebb30b2f32996cdecae4da72469391d1 Mon Sep 17 00:00:00 2001 From: Quasar Date: Thu, 12 Sep 2024 11:42:31 +0800 Subject: [PATCH 14/19] fix: refine start ready light, engine panel, generator, ground power, iff, compass light, mic crypto, radio panel, volume, fuel dump for F-15E --- .../ExportsModules/F-15ESE.lua | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua b/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua index 93bb621f..a33a3c9a 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/F-15ESE.lua @@ -206,7 +206,7 @@ ExportScript.ConfigEveryFrameArguments = -- arguments for export every frame (u [378] = "%.2f", -- PILOT Right Fuel Counter 100 [377] = "%.2f", -- PILOT Right Fuel Counter 1K -- Generators Lights - [596] = "%.2f", -- PILOT Starter Ready Light (green) + [596] = "%1d", -- PILOT Starter Ready Light (green) -- HUD Control Panel Lights [326] = "%.2f", -- PILOT HUD Master Mode AA Light (white) [327] = "%.2f", -- PILOT HUD Master Mode AG Light (white) @@ -415,12 +415,12 @@ ExportScript.ConfigArguments = -- arguments for export in low tick interval base [558] = "%.1f", -- PILOT Anti-Fog ( DEVICE_ID: 26 DCS_ID: 3558) [556] = "%.1f", -- PILOT Oxygen TEST ( DEVICE_ID: 26 DCS_ID: 3556) -- Engine Panel - [590] = "%.1f", -- PILOT Left Engine Control Switch ( DEVICE_ID: 15 DCS_ID: 3590) - [593] = "%.1f", -- PILOT Left Engine Master Switch ( DEVICE_ID: 15 DCS_ID: 3593) - [592] = "%.1f", -- PILOT Left Engine Master Switch Cover ( DEVICE_ID: 15 DCS_ID: 3592) - [591] = "%.1f", -- PILOT Right Engine Control Switch ( DEVICE_ID: 15 DCS_ID: 3591) - [598] = "%.1f", -- PILOT Right Engine Master Switch ( DEVICE_ID: 15 DCS_ID: 3598) - [597] = "%.1f", -- PILOT Right Engine Master Switch Cover ( DEVICE_ID: 15 DCS_ID: 3597) + [590] = "%1d", -- PILOT Left Engine Control Switch ( DEVICE_ID: 15 DCS_ID: 3590) + [593] = "%1d", -- PILOT Left Engine Master Switch ( DEVICE_ID: 15 DCS_ID: 3593) + [592] = "%1d", -- PILOT Left Engine Master Switch Cover ( DEVICE_ID: 15 DCS_ID: 3592) + [591] = "%1d", -- PILOT Right Engine Control Switch ( DEVICE_ID: 15 DCS_ID: 3591) + [598] = "%1d", -- PILOT Right Engine Master Switch ( DEVICE_ID: 15 DCS_ID: 3598) + [597] = "%1d", -- PILOT Right Engine Master Switch Cover ( DEVICE_ID: 15 DCS_ID: 3597) -- External Lights Panel [466] = "%.1f", -- PILOT Anti Collison Light Switch ( DEVICE_ID: 22 DCS_ID: 3466) [465] = "%.3f", -- PILOT Formation Lights Knob ( DEVICE_ID: 22 DCS_ID: 3465) -- EDITED @@ -441,23 +441,23 @@ ExportScript.ConfigArguments = -- arguments for export in low tick interval base [528] = "%.1f", -- PILOT Fuel Control: Centerline Tanks ( DEVICE_ID: 16 DCS_ID: 3528) [529] = "%.1f", -- PILOT Fuel Control: Conformal Tanks ( DEVICE_ID: 16 DCS_ID: 3529) [527] = "%.1f", -- PILOT Fuel Control: Wing Tanks ( DEVICE_ID: 16 DCS_ID: 3527) - [530] = "%.1f", -- PILOT Fuel Dump ( DEVICE_ID: 16 DCS_ID: 3530) + [530] = "%1d", -- PILOT Fuel Dump ( DEVICE_ID: 16 DCS_ID: 3530) -- Fuel Monitor Panel [385] = "%.3f", -- PILOT Fuel Bingo Selection ( DEVICE_ID: 17 DCS_ID: 3385) [381] = "%.1f", -- PILOT Fuel Totalizer Selector ( DEVICE_ID: 17 DCS_ID: 3381) -- Generators [589] = "%.1f", -- PILOT Emergency Generator ( DEVICE_ID: 6 DCS_ID: 3589) - [594] = "%.1f", -- PILOT External Power Switch ( DEVICE_ID: 6 DCS_ID: 3594) - [595] = "%.1f", -- PILOT Jet Starter ( DEVICE_ID: 6 DCS_ID: 3595) - [587] = "%.1f", -- PILOT Left Generator ( DEVICE_ID: 6 DCS_ID: 3587) - [588] = "%.1f", -- PILOT Right Generator ( DEVICE_ID: 6 DCS_ID: 3588) + [594] = "%1d", -- PILOT External Power Switch ( DEVICE_ID: 6 DCS_ID: 3594) + [595] = "%1d", -- PILOT Jet Starter ( DEVICE_ID: 6 DCS_ID: 3595) + [587] = "%1d", -- PILOT Left Generator ( DEVICE_ID: 6 DCS_ID: 3587) + [588] = "%1d", -- PILOT Right Generator ( DEVICE_ID: 6 DCS_ID: 3588) -- Ground Power - [483] = "%.1f", -- PILOT Ground Power 1 Switch ( DEVICE_ID: 6 DCS_ID: 3483) - [478] = "%.1f", -- PILOT Ground Power 2 Switch ( DEVICE_ID: 6 DCS_ID: 3478) - [479] = "%.1f", -- PILOT Ground Power 3 Switch ( DEVICE_ID: 6 DCS_ID: 3479) - [480] = "%.1f", -- PILOT Ground Power 4 Switch ( DEVICE_ID: 6 DCS_ID: 3480) - [484] = "%.1f", -- PILOT MPDP/A1U Switch ( DEVICE_ID: 6 DCS_ID: 3484) - [481] = "%.1f", -- PILOT PACS Switch ( DEVICE_ID: 6 DCS_ID: 3481) + [483] = "%1d", -- PILOT Ground Power 1 Switch ( DEVICE_ID: 6 DCS_ID: 3483) + [478] = "%1d", -- PILOT Ground Power 2 Switch ( DEVICE_ID: 6 DCS_ID: 3478) + [479] = "%1d", -- PILOT Ground Power 3 Switch ( DEVICE_ID: 6 DCS_ID: 3479) + [480] = "%1d", -- PILOT Ground Power 4 Switch ( DEVICE_ID: 6 DCS_ID: 3480) + [484] = "%1d", -- PILOT MPDP/A1U Switch ( DEVICE_ID: 6 DCS_ID: 3484) + [481] = "%1d", -- PILOT PACS Switch ( DEVICE_ID: 6 DCS_ID: 3481) -- HUD Control Panel [126] = "%.1f", -- PILOT HUD A/A Master Mode Selector ( DEVICE_ID: 32 DCS_ID: 3126) [127] = "%.1f", -- PILOT HUD A/G Master Mode Selector ( DEVICE_ID: 32 DCS_ID: 3127) @@ -470,13 +470,13 @@ ExportScript.ConfigArguments = -- arguments for export in low tick interval base [121] = "%.1f", -- PILOT HUD Symbology Reject Mode ( DEVICE_ID: 55 DCS_ID: 3121) [124] = "%.1f", -- PILOT HUD Video Brightness Control ( DEVICE_ID: 55 DCS_ID: 3124) -- IFF - [517] = "%.1f", -- PILOT IFF Master Switch ( DEVICE_ID: 17 DCS_ID: 3517) - [515] = "%.1f", -- PILOT IFF Mode Switch ( DEVICE_ID: 17 DCS_ID: 3515) + [517] = "%1d", -- PILOT IFF Master Switch ( DEVICE_ID: 17 DCS_ID: 3517) + [515] = "%1d", -- PILOT IFF Mode Switch ( DEVICE_ID: 17 DCS_ID: 3515) [516] = "%.1f", -- PILOT IFF Reply Switch ( DEVICE_ID: 17 DCS_ID: 3516) -- Internal Lights Panel [186] = "%.1f", -- PILOT Chart Spot Lamp ( DEVICE_ID: 23 DCS_ID: 3575) [572] = "%.1f", -- PILOT Charts Spot Light ( DEVICE_ID: 23 DCS_ID: 3572) - [570] = "%.1f", -- PILOT Compass Lights ( DEVICE_ID: 23 DCS_ID: 3570) + [570] = "%1d", -- PILOT Compass Lights ( DEVICE_ID: 23 DCS_ID: 3570) [566] = "%.1f", -- PILOT Console Lights ( DEVICE_ID: 23 DCS_ID: 3566) [571] = "%.1f", -- PILOT Day/Night Mode Selector ( DEVICE_ID: 23 DCS_ID: 3571) [568] = "%.1f", -- PILOT Gauges/UFC Backlights ( DEVICE_ID: 23 DCS_ID: 3568) @@ -531,7 +531,7 @@ ExportScript.ConfigArguments = -- arguments for export in low tick interval base [205] = "%.1f", -- PILOT Left MPD Push Button 20 ( DEVICE_ID: 34 DCS_ID: 3080) -- MICS [509] = "%.1f", -- PILOT MIC Switch ( DEVICE_ID: 13 DCS_ID: 3509) - [508] = "%.1f", -- PILOT MICS Crypto Switch ( DEVICE_ID: 13 DCS_ID: 3508) + [508] = "%1d", -- PILOT MICS Crypto Switch ( DEVICE_ID: 13 DCS_ID: 3508) [510] = "%.1f", -- PILOT MICS VW/Tone Silence Switch ( DEVICE_ID: 29 DCS_ID: 3510) -- Misc [537] = "%.1f", -- PILOT Anti Skid Switch ( DEVICE_ID: 21 DCS_ID: 3537) @@ -559,10 +559,10 @@ ExportScript.ConfigArguments = -- arguments for export in low tick interval base [551] = "%1d", -- PILOT Oxygen Emergency/Normal/Test Switch ( DEVICE_ID: 26 DCS_ID: 3551) [553] = "%.1f", -- PILOT Oxygen Supply/Mode Control Switch ( DEVICE_ID: 26 DCS_ID: 3553) -- Radio - [514] = "%.1f", -- PILOT Radio Cypher Text Switch ( DEVICE_ID: 17 DCS_ID: 3514) - [513] = "%.1f", -- PILOT Radio Tone Switch ( DEVICE_ID: 17 DCS_ID: 3513) - [511] = "%.1f", -- PILOT Radio UHF Antenna Switch ( DEVICE_ID: 17 DCS_ID: 3511) - [512] = "%.1f", -- PILOT Radio VHF Antenna Switch ( DEVICE_ID: 17 DCS_ID: 3512) + [514] = "%1d", -- PILOT Radio Cypher Text Switch ( DEVICE_ID: 17 DCS_ID: 3514) + [513] = "%1d", -- PILOT Radio Tone Switch ( DEVICE_ID: 17 DCS_ID: 3513) + [511] = "%1d", -- PILOT Radio UHF Antenna Switch ( DEVICE_ID: 17 DCS_ID: 3511) + [512] = "%1d", -- PILOT Radio VHF Antenna Switch ( DEVICE_ID: 17 DCS_ID: 3512 -- Right MPD [245] = "%.1f", -- PILOT Right MPD Brightness Control ( DEVICE_ID: 36 DCS_ID: 3082) [246] = "%.1f", -- PILOT Right MPD Contrast Control ( DEVICE_ID: 36 DCS_ID: 3083) @@ -644,12 +644,12 @@ ExportScript.ConfigArguments = -- arguments for export in low tick interval base [680] = "%.1f", -- PILOT Left UHF Preset Channel Switch ( DEVICE_ID: 56 DCS_ID: 3055) [681] = "%.1f", -- PILOT Right UHF Preset Channel Switch ( DEVICE_ID: 56 DCS_ID: 3056) -- Volume - [502] = "%.1f", -- PILOT Caution Volume ( DEVICE_ID: 59 DCS_ID: 3502) - [504] = "%.1f", -- PILOT ICS Volume ( DEVICE_ID: 13 DCS_ID: 3504) - [506] = "%.1f", -- PILOT ILS Volume ( DEVICE_ID: 11 DCS_ID: 3506) - [503] = "%.1f", -- PILOT Launch Volume ( DEVICE_ID: 59 DCS_ID: 3503) - [507] = "%.1f", -- PILOT TACAN Volume ( DEVICE_ID: 10 DCS_ID: 3507) + [502] = "%.1f", -- PILOT Caution Volume ( DEVICE_ID: 59 DCS_ID: 3501) + [504] = "%.1f", -- PILOT ICS Volume ( DEVICE_ID: 13 DCS_ID: 3503) + [506] = "%.1f", -- PILOT ILS Volume ( DEVICE_ID: 11 DCS_ID: 3505) + [503] = "%.1f", -- PILOT Launch Volume ( DEVICE_ID: 59 DCS_ID: 3502) [505] = "%.1f", -- PILOT WPN Volume ( DEVICE_ID: 44 DCS_ID: 3505) + [507] = "%.1f", -- PILOT TACAN Volume ( DEVICE_ID: 10 DCS_ID: 3506) ------------------------------------------------------------------- -- WSO COCKPIT ------------------------------------------------------------------- From 7540889c28047b7e16c9190da0e0814df27cdb6f Mon Sep 17 00:00:00 2001 From: Quasar Date: Fri, 20 Sep 2024 00:07:47 +0800 Subject: [PATCH 15/19] fix: set weapon flag int; ufc brightness to float, comm volume 4f -> 2f; interior lights 4f -> 2f; refine arm mode label. --- .../ExportsModules/AV8BNA.lua | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua b/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua index e86ebfee..94094e2c 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua @@ -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) @@ -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 @@ -505,10 +505,10 @@ ExportScript.ConfigArguments = [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 } ----------------------------- @@ -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 From f814c9f90a1a053e7f10e0fd659cfcab99e478d7 Mon Sep 17 00:00:00 2001 From: Quasar Date: Sun, 24 Nov 2024 11:36:44 +0800 Subject: [PATCH 16/19] chore: av-8b float 4->2 --- Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua b/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua index 94094e2c..8a4be018 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua @@ -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 @@ -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 @@ -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 @@ -497,8 +497,8 @@ 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 From ceaacb993829f0c162448e675960f5efeee73a76 Mon Sep 17 00:00:00 2001 From: Quasar Date: Sun, 24 Nov 2024 14:36:02 +0800 Subject: [PATCH 17/19] feat: a-10a: add ext tank indicator, chaff & flare remain indicator f-15c: refine atmosphere pressure unit su-33: add atmosphere pressure indicators su-25a&t: add ext tank indicator, chaff & flare remain indicator --- .../DCS-ExportScript/ExportsModules/A-10A.lua | 18 ++++++++------- .../DCS-ExportScript/ExportsModules/F-15C.lua | 22 +++++++++---------- .../ExportsModules/FC_AuxiliaryFuntions.lua | 13 +++++++++++ .../DCS-ExportScript/ExportsModules/Su-25.lua | 9 ++++++-- .../ExportsModules/Su-25T.lua | 5 +++++ .../DCS-ExportScript/ExportsModules/Su-33.lua | 5 +++-- 6 files changed, 49 insertions(+), 23 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/A-10A.lua b/Scripts/DCS-ExportScript/ExportsModules/A-10A.lua index 270d7e8e..f3c21319 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/A-10A.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/A-10A.lua @@ -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) @@ -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) @@ -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 @@ -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() @@ -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 @@ -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) @@ -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 @@ -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) diff --git a/Scripts/DCS-ExportScript/ExportsModules/F-15C.lua b/Scripts/DCS-ExportScript/ExportsModules/F-15C.lua index f19e481e..711ee021 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/F-15C.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/F-15C.lua @@ -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 @@ -109,19 +109,19 @@ function ExportScript.ProcessIkarusFCHighImportanceConfig() -- 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(AtmospherePressureFor_mmHg / 25.4, 2) - local AtmospherePressureFor_kPa = ExportScript.Tools.round(AtmospherePressureFor_mmHg * 0.133322, 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..'\ninHg') + ExportScript.Tools.SendData(1021, AtmospherePressureFor_mmHg..'\nmmHg') -- inHg ExportScript.Tools.SendData(1012, AtmospherePressureFor_inHg) - ExportScript.Tools.SendData(1022, AtmospherePressureFor_inHg..'\nmmHg') + ExportScript.Tools.SendData(1022, AtmospherePressureFor_inHg..'\ninHg') -- kPa ExportScript.Tools.SendData(1013, AtmospherePressureFor_kPa) - ExportScript.Tools.SendData(1023, AtmospherePressureFor_kPa..'\nkPa') + 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..' 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") @@ -1292,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) @@ -1353,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) diff --git a/Scripts/DCS-ExportScript/ExportsModules/FC_AuxiliaryFuntions.lua b/Scripts/DCS-ExportScript/ExportsModules/FC_AuxiliaryFuntions.lua index 818928ca..1d6b7e99 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/FC_AuxiliaryFuntions.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/FC_AuxiliaryFuntions.lua @@ -656,6 +656,19 @@ function ExportScript.AF.FC_Russian_BarometricAltimeter_late() -- BasicAtmospherePressure {947, 1080} hPa -- AltBar_kilometer {0, 99} km + -- Export atmosphere pressure indicator + -- Because the damn ED has hidden the inHg value in the altimeter! + local AtmospherePressureFor_hPa = ExportScript.Tools.round(lBasicAtmospherePressure, 2) + local AtmospherePressureFor_mmHg = ExportScript.Tools.round(lBasicAtmospherePressure * 0.7501, 2) + -- mmHg + ExportScript.Tools.SendData(1012, AtmospherePressureFor_hPa) + ExportScript.Tools.SendData(1022, AtmospherePressureFor_hPa..'\nhPa') + -- kPa + ExportScript.Tools.SendData(1013, AtmospherePressureFor_mmHg) + ExportScript.Tools.SendData(1023, AtmospherePressureFor_mmHg..'\nmmHg') + -- Combine mmHg, kPa + ExportScript.Tools.SendData(1025, AtmospherePressureFor_hPa..' mbar\n'..AtmospherePressureFor_mmHg..' mmHg') + ExportScript.Tools.SendData(30, string.format("%.4f", lAltBar_kilometer_needle)) ExportScript.Tools.SendData(31, string.format("%.4f", lAltBar_meter_needle)) ExportScript.Tools.SendData(32, string.format("%04d", ExportScript.Tools.round(lBasicAtmospherePressure, 0, "floor"))) diff --git a/Scripts/DCS-ExportScript/ExportsModules/Su-25.lua b/Scripts/DCS-ExportScript/ExportsModules/Su-25.lua index 0e692f7d..ec4a84c9 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/Su-25.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/Su-25.lua @@ -21,8 +21,8 @@ function ExportScript.ProcessIkarusFCHighImportanceConfig() local lMachNumber = LoGetMachNumber() -- MACH - 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 lBasicAtmospherePressure = LoGetBasicAtmospherePressure() -- BAROMETRIC PRESSURE local lAltBar = LoGetAltitudeAboveSeaLevel() -- ALTITUDE SEA LEVEL (Meter) @@ -164,6 +164,8 @@ function ExportScript.ProcessIkarusFCLowImportanceConfig() -- EKRAN Message ExportScript.AF.FC_EKRAN() + ExportScript.AF.FlareChaff() + -- Mechanical Configuration Indicator (GearWarningLight, NoseGear, LeftGear, RightGear, Airbreaks, Flaps1, Flaps2) ExportScript.AF.FC_Russian_MDI_SU25(lFunctionTyp) @@ -294,6 +296,8 @@ function ExportScript.AF.FlareChaff() --[chaff] = number: "128" --[flare] = number: "128" + ExportScript.Tools.SendData(2501, lSnares.chaff) + ExportScript.Tools.SendData(2502, lSnares.flare) end function ExportScript.AF.StatusLamp() @@ -469,6 +473,7 @@ function ExportScript.AF.FuelQuantityIndicator(FunctionTyp) if ExportScript.Config.IkarusExport and lFunctionTyp == "Ikarus" then ExportScript.Tools.SendData(300, string.format("%0.4f", lFuel_leftbar)) ExportScript.Tools.SendData(301, string.format("%0.4f", lFuel_rightbar)) + ExportScript.Tools.SendData(312, string.format("%d", lEngineInfo.fuel_external)) ExportScript.Tools.SendData(302, lExtTank1) -- external tanks ExportScript.Tools.SendData(303, lExtTank2) -- inner tanks ExportScript.Tools.SendData(304, (lEngineInfo.fuel_internal < 2790.0 and 1 or 0)) -- inner wing tank diff --git a/Scripts/DCS-ExportScript/ExportsModules/Su-25T.lua b/Scripts/DCS-ExportScript/ExportsModules/Su-25T.lua index 6fb8b505..dae607b3 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/Su-25T.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/Su-25T.lua @@ -130,6 +130,8 @@ function ExportScript.ProcessIkarusFCLowImportanceConfig() -- Fuel Quantity Indicator ExportScript.AF.FC_FuelQuantityIndicator(lFunctionTyp) + ExportScript.AF.FC_FlareChaff() + local lEngineInfo = LoGetEngineInfo() if lEngineInfo ~= nil then -- Hydraulic Pressure Left @@ -269,6 +271,8 @@ function ExportScript.AF.FC_FlareChaff() --[chaff] = number: "128" --[flare] = number: "128" + ExportScript.Tools.SendData(2501, lSnares.chaff) + ExportScript.Tools.SendData(2502, lSnares.flare) end function ExportScript.AF.FC_StatusLamp() @@ -419,6 +423,7 @@ function ExportScript.AF.FC_FuelQuantityIndicator(FunctionTyp) if ExportScript.Config.IkarusExport and lFunctionTyp == "Ikarus" then ExportScript.Tools.SendData(300, string.format("%0.2f", lFuelCounter[tonumber(string.sub(lTotalFuel, 1, 1))])) + ExportScript.Tools.SendData(312, string.format("%d", lEngineInfo.fuel_external)) ExportScript.Tools.SendData(301, string.format("%0.2f", lFuelCounter[tonumber(string.sub(lTotalFuel, 2, 2))])) ExportScript.Tools.SendData(302, string.format("%0.2f", lFuelCounter[tonumber(string.sub(lTotalFuel, 3, 3))])) ExportScript.Tools.SendData(303, lExtTank1) -- external tanks diff --git a/Scripts/DCS-ExportScript/ExportsModules/Su-33.lua b/Scripts/DCS-ExportScript/ExportsModules/Su-33.lua index 5b337653..91c96fa2 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/Su-33.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/Su-33.lua @@ -19,8 +19,8 @@ function ExportScript.ProcessIkarusFCHighImportanceConfig() local lLatitude = myData.LatLongAlt.Lat -- LATITUDE local lLongitude = myData.LatLongAlt.Long -- LONGITUDE - 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 lBasicAtmospherePressure = LoGetBasicAtmospherePressure() -- BAROMETRIC PRESSURE local lAltBar = LoGetAltitudeAboveSeaLevel() -- ALTITUDE SEA LEVEL (Meter) @@ -432,6 +432,7 @@ function ExportScript.AF.FuelQuantityIndicator(FunctionTyp) end ExportScript.Tools.SendData("301", string.format("%.4f", lTotalFuel_12_0) ) + ExportScript.Tools.SendData("311", string.format("%d", lTotalFuel) ) ExportScript.Tools.SendData("304", (lEngineInfo.fuel_internal < 6900.0 and 1 or 0) ) -- Tank warning 1 ExportScript.Tools.SendData("305", (lEngineInfo.fuel_internal < 5400.0 and 1 or 0) ) -- Tank warning 2 ExportScript.Tools.SendData("306", (lEngineInfo.fuel_internal < 4700.0 and 1 or 0) ) -- Tank warning 3 From 2c97a96c38d20864987b8c51dc459f2a3cbde51b Mon Sep 17 00:00:00 2001 From: Quasar Date: Thu, 5 Dec 2024 09:27:43 +0800 Subject: [PATCH 18/19] chore: av-8b video brt&cont float(4) -> float(2) --- Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua b/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua index 8a4be018..2e23323e 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua @@ -254,8 +254,8 @@ ExportScript.ConfigArguments = [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 From 1d4e37e353d08865c0ec010570b8b8b8f948ec52 Mon Sep 17 00:00:00 2001 From: Quasar Date: Tue, 10 Dec 2024 01:07:19 +0800 Subject: [PATCH 19/19] chore: av-8b edp brt float(4) -> float(2) --- Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua b/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua index 2e23323e..9bdcf02e 100644 --- a/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua +++ b/Scripts/DCS-ExportScript/ExportsModules/AV8BNA.lua @@ -248,7 +248,7 @@ 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