Release v0.8.5

* Re-add the controls that were removed in release v0.8.4 in a way that retains compatibility with v0.7.1-based hardware cockpits and v0.7.30-based DCSFlightpanels configurations
* F-14B: weapon store gauges are now exported as indicator lights
* F-16: add UHF and CMDS display outputs
* F-16: add OBOGS and GPS switches

appveyor.yml

@@ -1,4 +1,4 @@
-version: v0.8.4+{build}
+version: v0.8.5+{build}
 pull_requests:
   do_not_increment_build_number: true
 image: Visual Studio 2017

src/dcs-lua/lib/A10C.lua

@@ -332,8 +332,6 @@ defineFloat("FUEL_QTY_10000", 90, {0, 1}, "Fuel Panel", "Fuel Quantity Counter 1
 defineFloat("FUEL_QTY_1000", 91, {0, 1}, "Fuel Panel", "Fuel Quantity Counter 1000")
 defineFloat("FUEL_QTY_100", 92, {0, 1}, "Fuel Panel", "Fuel Quantity Counter 100")
 
---defineFloat("CANOPY_VALUE", 7, {0.0, 1.0}, "Misc", "Canopy Position")
-
 defineIndicatorLight("MASTER_CAUTION", 404, "UFC", "Master Caution Light")
 
 -- The order in this file roughly follows clickabledata.lua
@@ -820,13 +818,6 @@ defineTumb("TISL_CODE4", 57, 3008, 642, 0.05, {0, 1}, {"0", "0.5", "1", "1.5", "
 defineTumb("TISL_AUX", 57, 3009, 644, 1, {-1, 1}, nil, false, "TISL Panel", "TISL AUX Switch")
 definePushButton("TISL_ENTER", 57, 3010, 628, "TISL Panel", "TISL ENTER")
 definePushButton("TISL_BITE", 57, 3011, 632, "TISL Panel", "TISL BITE")
---definePushButton("TISL_OVERTEMP", 57, 3012, 630, "TISL Panel", "TISL OVER TEMP")
---definePushButton("TISL_TRACK", 57, 3013, 634, "TISL Panel", "TISL TRACK")
--- defineIndicatorLight("TISL_ENTER_L", 629, "TISL Panel", "TISL ENTER Light")
--- defineIndicatorLight("TISL_OVERTEMP_L", 631, "TISL Panel", "TISL OVER TEMP Light")
--- defineIndicatorLight("TISL_BITE_L", 633, "TISL Panel", "TISL BITE Light")
--- defineIndicatorLight("TISL_TRACK_L", 635, "TISL Panel", "TISL TRACK Light")
-
 
 definePushButton("EXT_STORES_JETTISON", 12, 3001, 101, "Glare Shield", "External Stores Jettison Button")
 
@@ -1351,5 +1342,15 @@ defineIntegerFromGetter("EXT_STROBE_RIGHT", function()
 	if LoGetAircraftDrawArgumentValue(196) > 0 then return 1 else return 0 end
 end, 1, "External Aircraft Model", "Right Strobe Light")
 
+defineFloat("CANOPY_VALUE", 7, {0.0, 1.0}, "Misc", "Canopy Position")
+
+definePushButton("TISL_OVERTEMP", 57, 3012, 630, "TISL Panel", "TISL OVER TEMP")
+definePushButton("TISL_TRACK", 57, 3013, 634, "TISL Panel", "TISL TRACK")
+defineIndicatorLight("TISL_ENTER_L", 629, "TISL Panel", "TISL ENTER Light")
+defineIndicatorLight("TISL_OVERTEMP_L", 631, "TISL Panel", "TISL OVER TEMP Light")
+defineIndicatorLight("TISL_BITE_L", 633, "TISL Panel", "TISL BITE Light")
+defineIndicatorLight("TISL_TRACK_L", 635, "TISL Panel", "TISL TRACK Light")
+
+
 
 BIOS.protocol.endModule()

src/dcs-lua/lib/AircraftList.lua

@@ -101,6 +101,7 @@ a("VSN_F16CBL50", false)
 a("VSN_F16CBL52D", false)
 a("VSN_F16CMBL50", false)
 a("VSN_F22", false)
+a("VSN_F35A", false)
 a("VSN_F35B", false)
 a("VSN_F35B_AG", false)
 a("VSN_F4E", false)

src/dcs-lua/lib/F-14B.lua

@@ -985,6 +985,22 @@ defineIndicatorLight("PLT_SLATS_IND_LIGHT", 8310, "Gauges", "PILOT Slats Indicat
 defineIndicatorLight("PLT_FLAPS_IND_LIGHT", 8311, "Gauges", "PILOT Flaps Indicator as Light")
 defineIndicatorLight("PLT_SPDBRK_IND_LIGHT", 8307, "Gauges", "PILOT Speedbrake Indicator as Light")
 defineIndicatorLight("PLT_SPDBRK_FULL_LIGHT", 8308, "Gauges", "PILOT Speedbrake Full Indicator as Light")
+defineIndicatorLightMulti1("PLT_WEAPON_STORE_1A_STORE_L", 9221, "Gauges", "PILOT Weapon Store 1A as Light (STORE)")
+defineIndicatorLightMulti1("PLT_WEAPON_STORE_1B_STORE_L", 9222, "Gauges", "PILOT Weapon Store 1B as Light (STORE)")
+defineIndicatorLightMulti1("PLT_WEAPON_STORE_3_STORE_L", 9223, "Gauges", "PILOT Weapon Store 3 as Light (STORE)")
+defineIndicatorLightMulti1("PLT_WEAPON_STORE_4_STORE_L", 9224, "Gauges", "PILOT Weapon Store 4 as Light (STORE)")
+defineIndicatorLightMulti1("PLT_WEAPON_STORE_5_STORE_L", 9225, "Gauges", "PILOT Weapon Store 5 as Light (STORE)")
+defineIndicatorLightMulti1("PLT_WEAPON_STORE_6_STORE_L", 9226, "Gauges", "PILOT Weapon Store 6 as Light (STORE)")
+defineIndicatorLightMulti1("PLT_WEAPON_STORE_8B_STORE_L", 9227, "Gauges", "PILOT Weapon Store 8B as Light (STORE)")
+defineIndicatorLightMulti1("PLT_WEAPON_STORE_8A_STORE_L", 9228, "Gauges", "PILOT Weapon Store 8A as Light (STORE)")
+defineIndicatorLightMulti2("PLT_WEAPON_STORE_1A_READY_L", 9221, "Gauges", "PILOT Weapon Store 1A as Light (READY)")
+defineIndicatorLightMulti2("PLT_WEAPON_STORE_1B_READY_L", 9222, "Gauges", "PILOT Weapon Store 1B as Light (READY)")
+defineIndicatorLightMulti2("PLT_WEAPON_STORE_3_READY_L", 9223, "Gauges", "PILOT Weapon Store 3 as Light (READY)")
+defineIndicatorLightMulti2("PLT_WEAPON_STORE_4_READY_L", 9224, "Gauges", "PILOT Weapon Store 4 as Light (READY)")
+defineIndicatorLightMulti2("PLT_WEAPON_STORE_5_READY_L", 9225, "Gauges", "PILOT Weapon Store 5 as Light (READY)")
+defineIndicatorLightMulti2("PLT_WEAPON_STORE_6_READY_L", 9226, "Gauges", "PILOT Weapon Store 6 as Light (READY)")
+defineIndicatorLightMulti2("PLT_WEAPON_STORE_8B_READY_L", 9227, "Gauges", "PILOT Weapon Store 8B as Light (READY)")
+defineIndicatorLightMulti2("PLT_WEAPON_STORE_8A_READY_L", 9228, "Gauges", "PILOT Weapon Store 8A as Light (READY)")
 
 -- Warning, Caution and IndicatorLights RIO
 defineIndicatorLight("RIO_SCP_RECORD_STBY_L", 92, "Warning, Caution and IndicatorLights","RIO SCP Record Standby Light (red)")

src/dcs-lua/lib/F-16C_50.lua

@@ -1,5 +1,5 @@
--- V1.0f by Warlord (aka BlackLibrary)
--- DED Display & Initial version of outputs from mainpanel_init.lua by Matchstick
+-- V1.1 by Warlord (aka BlackLibrary)
+-- DED Display, UHF, CMDS & Initial version of outputs from mainpanel_init.lua by Matchstick
 -- Tested and fixes by BuzzKillington
 
 BIOS.protocol.beginModule("F-16C_50", 0x4400)
@@ -210,6 +210,7 @@ definePushButton("FIRE_OHEAT_DETECT_BTN", 6, 3012, 575, "Engine", "FIRE & OHEAT
 defineTumb("OXY_SUPPLY_LVR", 8, 3001, 728, 0.5, {0.0, 1.0}, nil, true,"Oxygen System", "Supply Lever, PBG/ON/OFF")
 defineToggleSwitch("OXY_DILUTER_LVR", 8, 3002, 727, "Oxygen System", "Diluter Lever, 100 percent/NORM")
 defineSpringloaded_3_pos_tumb("OXY_EMERG_LVR", 8, 3004, 3003, 726, "Oxygen System", "Emergency Lever, EMERGENCY/NORMAL/TEST MASK")
+defineToggleSwitch("OBOGS_SW", 8, 3005, 576, "Oxygen System", "OBOGS BIT Switch, BIT/OFF")
 
 --Sensor Power Control Panel
 defineToggleSwitch("HDPT_SW_L", 22, 3002, 670, "Sensor Panel", "LEFT HDPT Switch, ON/OFF")
@@ -222,12 +223,12 @@ defineToggleSwitch("MMC_PWR_SW", 19, 3001, 715, "Avionic Panel", "MMC Switch, MM
 defineToggleSwitch("ST_STA_SW", 22, 3001, 716, "Avionic Panel", "ST STA Switch, ST STA/OFF")
 defineToggleSwitch("MFD_SW", 19, 3014, 717, "Avionic Panel", "MFD Switch, MFD/OFF")
 defineToggleSwitch("UFC_SW", 17, 3001, 718, "Avionic Panel", "UFC Switch, UFC/OFF")
+defineToggleSwitch("GPS_SW", 59, 3001, 720, "Avionic Panel", "GPS Switch, GPS/OFF")
 defineTumb("MIDS_LVT_KNB", 41, 3001, 723, 0.1, {0.0,0.2}, nil, true, "Avionic Panel", "MIDS LVT Knob, ZERO/OFF/ON")
 defineTumb("INS_KNB", 14, 3001, 719, 0.1, {0.0,0.6}, nil, true, "Avionic Panel", "INS Knob, OFF/STOR HDG/NORM/NAV/CAL/INFLT ALIGN/ATT")
 
 --WIP:
 defineToggleSwitch("MAP_SW", 3, 3101, 722, "WIP", "MAP Switch, MAP/OFF")
-defineToggleSwitch("GPS_SW", 3, 3102, 720, "WIP", "GPS Switch, GPS/OFF")
 defineToggleSwitch("DL_SW", 3, 3103, 721, "WIP", "DL Switch, DL/OFF")
 
 --Modular Mission Computer (MMC)
@@ -910,7 +911,7 @@ DEDLayout_l3["CARA ALOW Asterisks_both"] = {14,1,22,"","I"}
 --STPT
 DEDLayout_l3["STEERPOINT Longitude"] = {3,3}
 DEDLayout_l3["STEERPOINT Longitude Value"] = {8,12,0,"_inv","I"}
-DEDLayout_l3["STEERPOINT Latitude Asteriscs_both"] = {7,1,20,"","I"}
+DEDLayout_l3["STEERPOINT Longitude Asteriscs_both"] = {7,1,20,"","I"}
 --BINGO
 DEDLayout_l3["SET label"] = {6,3}
 DEDLayout_l3["BINGO Asterisks_both"] = {10,1,19,"","I"}
@@ -1248,6 +1249,58 @@ defineString("DED_LINE_3", function() return DEDLine3 end, 25, "DED Output Data"
 defineString("DED_LINE_4", function() return DEDLine4 end, 25, "DED Output Data", "DED Display Line 4")
 defineString("DED_LINE_5", function() return DEDLine5 end, 25, "DED Output Data", "DED Display Line 5")
 
+------------------------------------------------------------------CMDS Display--------------------------------------------------------------------------------------
+local CMDS_O1_Amount
+local CMDS_O1_Amount
+local CMDS_O2_Amount
+local CMDS_CH_Amount
+local CMDS_FL_Amount
+
+moduleBeingDefined.exportHooks[#moduleBeingDefined.exportHooks+1] = function()
+	local cmds = parse_indication(17)
+	CMDS_O1_Amount = "    "
+	CMDS_O2_Amount = "    "
+	CMDS_CH_Amount = "    "
+	CMDS_FL_Amount = "    "
+	if not cmds then
+		return
+	end
+	CMDS_O1_Amount 				= coerce_nil_to_string(cmds.CMDS_O1_Amount)
+	CMDS_O2_Amount 				= coerce_nil_to_string(cmds.CMDS_O2_Amount)
+	CMDS_CH_Amount 				= coerce_nil_to_string(cmds.CMDS_CH_Amount)
+	CMDS_FL_Amount 				= coerce_nil_to_string(cmds.CMDS_FL_Amount)
+end
+
+defineString("CMDS_O1_Amount", function() return CMDS_O1_Amount end, 4, "CMDS", "CMDS O1 Amount Display")
+defineString("CMDS_O2_Amount", function() return CMDS_O2_Amount end, 4, "CMDS", "CMDS O2 Amount Display")
+defineString("CMDS_CH_Amount", function() return CMDS_CH_Amount end, 4, "CMDS", "CMDS CH Amount Display")
+defineString("CMDS_FL_Amount", function() return CMDS_FL_Amount end, 4, "CMDS", "CMDS FL Amount Display")
+
+------------------------------------------------------------------UHF Display---------------------------------------------------------------------------------------
+local function get_UHF_CHAN()
+    local UHF = parse_indication(11)
+	if UHF and UHF.txtPresetChannel then
+		return coerce_nil_to_string(UHF.txtPresetChannel)
+	else
+		return "  "
+	end
+end
+
+defineString("UHF_CHAN_DISP", get_UHF_CHAN, 2, "UHF", "UHF CHAN Display")
+
+local function get_UHF_FREQUENCY()
+    local UHF = parse_indication(12)
+    if UHF and UHF.txtFreqStatus then
+        local UHF_Freq = UHF.txtFreqStatus
+        local UHF_dot =  UHF.txtDot
+        return UHF_Freq:sub(1,3)..UHF_dot..UHF_Freq:sub(4,6)
+    else
+        return "       "
+    end
+end
+
+defineString("UHF_FREQ_DISP", get_UHF_FREQUENCY, 7, "UHF", "UHF Manual Frequency Display")  
+
 ------------------------------------------------------------------Externals-----------------------------------------------------------------------------------------
 defineIntegerFromGetter("EXT_SPEED_BRAKE_RIGHT", function()
 	return math.floor(LoGetAircraftDrawArgumentValue(182)*65535)

src/dcs-lua/lib/UH1H.lua

@@ -187,7 +187,7 @@ local function getRadarAlt()
     if digit4 == "10" then digit4 = " " end
     return digit1 .. digit2 .. digit3 .. digit4
 end
-defineString("RALT_DISPLAY", getRadarAlt, 4, "Radar Altimeter", "Display")
+defineString("RALT_DISPLAY_STR", getRadarAlt, 4, "Radar Altimeter", "Display (String)")
 -- clickabledata.lua:
 
 
@@ -475,7 +475,7 @@ defineToggleSwitch("CM_ARM_SW", 50, 3005, 456, "Countermeasures", "SAFE / ARMED
 defineToggleSwitch("CM_MAN_PGRM_SW", 50, 3009, 459, "Countermeasures", "MAN / PGRM Switch")
 definePushButton("CM_FLARE_BTN", 50, 3006, 464, "Countermeasures", "Flare Button")
 definePushButton("CM_ARMED_TEST", 50, 3010, 457, "Countermeasures", "Armed Lamp Test")
-defineString("CM_FLARECNT_DISPLAY", getFlareCount, 2, "Countermeasures", "Flare Counter")
+defineString("CM_FLARECNT_DISPLAY_STR", getFlareCount, 2, "Countermeasures", "Flare Counter (String)")
 definePushButton("CM_FLARECNT_RESET", 50, 3003, 453, "Countermeasures", "Flare Counter Reset Button")
 local function getFlareCount()
     local function a(n) return GetDevice(0):get_argument_value(n) end
@@ -489,7 +489,7 @@ local function getChaffCount()
     local function a(n) return GetDevice(0):get_argument_value(n) end
     return string.format("%.0f%.0f", a(462)*10, a(463)*10)
 end
-defineString("CM_CHAFFCNT_DISPLAY", getChaffCount, 2, "Countermeasures", "Chaff Counter")
+defineString("CM_CHAFFCNT_DISPLAY_STR", getChaffCount, 2, "Countermeasures", "Chaff Counter (String)")
 defineFixedStepInput("CM_CHAFFCNT", 50, 3008, {-1, 1}, "Countermeasures", "Chaff Counter Decrease/Increase")
 
 defineToggleSwitch("RADAR_ALT_PWR", 13, 3007, 449, "Overhead Panel", "Radar Altimeter Power")
@@ -516,4 +516,38 @@ defineIntegerFromGetter("EXT_STROBE", function()
 	if LoGetAircraftDrawArgumentValue(193) > 0 then return 1 else return 0 end
 end, 1, "External Aircraft Model", "Strobe Light")
 
+
+-- Radar Altimeter Display, Chaff and Flare counters as numeric values
+local function getRadarAltAsNumber()
+    local digit1 = string.format("%.0f", GetDevice(0):get_argument_value(468)*10)
+    if digit1 == "10" then digit1 = " " end
+    local digit2 = string.format("%.0f", GetDevice(0):get_argument_value(469)*10)
+    if digit2 == "10" then digit2 = " " end
+    local digit3 = string.format("%.0f", GetDevice(0):get_argument_value(470)*10)
+    if digit3 == "10" then digit3 = " " end
+    local digit4 = string.format("%.0f", GetDevice(0):get_argument_value(471)*10)
+    if digit4 == "10" then digit4 = " " end
+    return tonumber(digit1 .. digit2 .. digit3 .. digit4)
+end
+defineIntegerFromGetter("RALT_DISPLAY", getRadarAltAsNumber, 65000, "Radar Altimeter", "Radar Altitude Display (Number)")
+
+defineFloat("RALT_DIGIT_1", 468, {0, 1}, "Radar Altimeter", "Radar Altimeter 1.Digit")
+defineFloat("RALT_DIGIT_2", 469, {0, 1}, "Radar Altimeter", "Radar Altimeter 2.Digit")
+defineFloat("RALT_DIGIT_3", 470, {0, 1}, "Radar Altimeter", "Radar Altimeter 3.Digit")
+defineFloat("RALT_DIGIT_4", 471, {0, 1}, "Radar Altimeter", "Radar Altimeter 4.Digit")
+
+local function getFlareCountAsNumber()
+    local digit1 = string.format("%.0f", GetDevice(0):get_argument_value(460)*10)
+    local digit2 = string.format("%.0f", GetDevice(0):get_argument_value(461)*10)
+    return tonumber(digit1 .. digit2)
+end
+defineIntegerFromGetter("CM_FLARECNT_DISPLAY", getFlareCountAsNumber, 60, "Countermeasures", "Flare Counter Display (Number)")
+
+local function getChaffCountAsNumber()
+    local digit1 = string.format("%.0f", GetDevice(0):get_argument_value(462)*10)
+    local digit2 = string.format("%.0f", GetDevice(0):get_argument_value(463)*10)
+    return tonumber(digit1 .. digit2)
+end
+defineIntegerFromGetter("CM_CHAFFCNT_DISPLAY", getChaffCountAsNumber, 60, "Countermeasures", "Chaff Counter Display (Number)")
+
 BIOS.protocol.endModule()