Merge pull request #138 from DeadMeatDCS/master

F18 Standby Altimeter fix+A10 cleanup

Scripts/DCS-BIOS/lib/A-10C.lua

@@ -1266,13 +1266,6 @@ defineString("ILS_FREQUENCY_S", getILSFrequency, 6, "ILS Panel", "ILS Frequency
 defineString("VHF_AM_FREQUENCY_S", getVhfAmFreqency, 7, "VHF AM Radio", "VHF AM Frequency (String)")
 defineString("VHF_FM_FREQUENCY_S", getVhfFmFreqency, 7, "VHF FM Radio", "VHF FM Frequency (String)")
 
-defineFloat("INT_CONSOLE_L_BRIGHT", 800, {0, 1}, "Light System Control Panel", "Console Light Brightness")
-defineFloat("INT_ENG_INST_L_BRIGHT", 801, {0, 1}, "Light System Control Panel", "Engine Instrument Light Brightness")
-defineFloat("INT_FLT_INST_L_BRIGHT", 802, {0, 1}, "Light System Control Panel", "Flight Instruments Light Brightness")
-defineFloat("INT_AUX_INST_L_BRIGHT", 803, {0, 1}, "Light System Control Panel", "Auxiliary Instruments Light Brightness")
-defineFloat("INT_FLOOD_L_BRIGHT", 806, {0, 1}, "Light System Control Panel", "Flood Light Brightness")
-defineFloat("INT_CAUTION_L_BRIGHT", 905, {0, 1}, "Light System Control Panel", "Caution Lights Brightness")
-
 defineToggleSwitch("MIRROR_TOGGLE", 0, 3001, 719, "Misc", "Toggle Mirrors")
 defineFloat("OXY_FLOW_G", 600, {0, 1}, "Oxygen Regulator Panel", "Flow Indicator (on/off) (as Gauge)")
 
@@ -1292,6 +1285,7 @@ defineFloat("INTERNAL_ENG_INST_LIGHTS", 801, {0, 1}, "Light System Control Panel
 defineFloat("INTERNAL_FLT_INST_LIGHTS", 802, {0, 1}, "Light System Control Panel", "Flight Instruments Lights (as Gauge)")
 defineFloat("INTERNAL_AUX_INST_LIGHTS", 803, {0, 1}, "Light System Control Panel", "Auxiliary Instruments Lights (as Gauge)")
 defineFloat("INTERNAL_FLOOD_LIGHTS", 806, {0, 1}, "Light System Control Panel", "Flood Lights (as Gauge)")
+defineFloat("INT_CAUTION_L_BRIGHT", 905, {0, 1}, "Light System Control Panel", "Caution Lights (as Gauge)")
 
 defineMultipositionSwitch("ARC210_MODE_L", 76, 3043, 551, 7, 0.1, "ARC-210", "ARC-210 Left Mode Dial")
 definePotentiometer("UHF02", 76, 3021, 552, {0, 1}, "ARC-210", "UHF-02")
@@ -1331,4 +1325,4 @@ defineIntegerFromGetter("EXT_R_RUDDER_LIGHT", function()
 	if LoGetAircraftDrawArgumentValue(205) > 0 then return 1 else return 0 end
 end, 1, "External Aircraft Model", "Right Rudder Light (white)")
 
-BIOS.protocol.endModule()
+BIOS.protocol.endModule()

Scripts/DCS-BIOS/lib/FA-18C_hornet.lua

@@ -888,10 +888,10 @@ defineFloat("STBY_ASI_AIRSPEED", 217, {0, 1}, "Standby Airspeed Indicator", "Air
 defineRotary("STBY_PRESS_ALT", 26, 3001, 224, "Standby Altimeter", "Pressure Setting Knob")
 defineFloat("STBY_ALT_100_FT_PTR", 218, {0, 1}, "Standby Altimeter", "100 ft pointer")
 defineFloat("STBY_ALT_10000_FT_CNT", 220, {0, 1}, "Standby Altimeter", "10000 ft count")
-defineFloatWithValueConversion("STBY_ALT_1000_FT_CNT", 219, {0, 1}, {-1.0, 0.0, 0.0, 10.0}, {0.9, 1.0, 0.0, 1.0}, "Standby Altimeter", "1000 ft count")
+defineFloat("STBY_ALT_1000_FT_CNT", 219, {0, 1}, "Standby Altimeter", "1000 ft count")
 defineFloat("STBY_PRESS_SET_0", 221, {0, 1}, "Standby Altimeter", "Pressure Setting 1")
 defineFloat("STBY_PRESS_SET_1", 222, {0, 1}, "Standby Altimeter", "Pressure Setting 2")
-defineFloatWithValueConversion("STBY_PRESS_SET_2", 223, {0, 1}, {26, 31}, {0, 1}, "Standby Altimeter", "Pressure Setting 3")
+defineFloat("STBY_PRESS_SET_2", 223, {0, 1}, "Standby Altimeter", "Pressure Setting 3")
 
 -- 29. Standby Rate of Climb Indicator
 defineFloat("VSI", 225, {-1, 1}, "Standby Rate of Climb Indicator", "Vertical Speed")
@@ -1247,4 +1247,4 @@ defineFloat("AOA_INDEXER_HIGH_F", 4, {0, 1}, "Angle of Attack Indexer Lights", "
 defineFloat("AOA_INDEXER_NORMAL_F", 5, {0, 1}, "Angle of Attack Indexer Lights", "AOA Indexer Normal as Float (yellow)")
 defineFloat("AOA_INDEXER_LOW_F", 6, {0, 1}, "Angle of Attack Indexer Lights", "AOA Indexer Low as Float (red)")
 
-BIOS.protocol.endModule()
+BIOS.protocol.endModule()