Skip to content

Commit

Permalink
Merge pull request #182 from dcs-bios/develop
Browse files Browse the repository at this point in the history 
Release v0.8.4

* fix bingo fuel selector in AV8BNA
* revert some changes to A-10C and UH-1H profiles to make the output addresses compatible with v0.7.1 again
* A-10C: remove Canopy Position, TISL ENTER Light, TISL OVER TEMP Light, TISL BITE Light, TISL TRACK Light
* UH-1H: change radar altimeter display, chaff and flare counts back to a string exports
  • Loading branch information
@jboecker
jboecker committed Oct 31, 2019
2 parents 2819b40 + 4d3e137 commit da8d337
Show file tree
Hide file tree
Showing 7 changed files with 1,179 additions and 1,345 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v0.8.3+{build}
version: v0.8.4+{build}
pull_requests:
do_not_increment_build_number: true
image: Visual Studio 2017
Expand Down
1,886 changes: 903 additions & 983 deletions src/control-reference-json/A-10C.json
View file

Large diffs are not rendered by default.

14 changes: 4 additions & 10 deletions src/control-reference-json/AV8BNA.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2154,22 +2154,16 @@
"Fuel Panel": {
"BINGO_SET": {
"category": "Fuel Panel",
"control_type": "limited_dial",
"control_type": "fixed_step_dial",
"description": "Bingo Fuel Set Knob",
"identifier": "BINGO_SET",
"inputs": [ {
"description": "set the position of the dial",
"interface": "set_state",
"max_value": 65535
}, {
"description": "turn the dial left or right",
"interface": "variable_step",
"max_value": 65535,
"suggested_step": 3200
"description": "rotate the knob left or right",
"interface": "fixed_step"
} ],
"outputs": [ {
"address": 30760,
"description": "position of the potentiometer",
"description": "rotation of the knob",
"mask": 65535,
"max_value": 65535,
"shift_by": 0,
Expand Down
578 changes: 254 additions & 324 deletions src/control-reference-json/UH-1H.json
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/dcs-lua/lib/A10C.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ 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")
--defineFloat("CANOPY_VALUE", 7, {0.0, 1.0}, "Misc", "Canopy Position")

defineIndicatorLight("MASTER_CAUTION", 404, "UFC", "Master Caution Light")

Expand Down Expand Up @@ -822,10 +822,10 @@ 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")
-- 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")
Expand Down
2 changes: 1 addition & 1 deletion src/dcs-lua/lib/AV8BNA.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ definePushButton("M_Warning", 35, 3199, 199,"Master Warning Panel" , "Master War

-- Fuel Quantity Indicator
defineMultipositionSwitch("FUEL_SEL", 21, 3379, 379, 7, 0.33,"Fuel Panel" ,"Fuel Totalizer Selector OUTBD/INBD/WING/INT/TOT/FEED/BIT")
definePotentiometer("BINGO_SET", 21, 3380, 380, {0, 1},"Fuel Panel" , "Bingo Fuel Set Knob")
defineAV8BCommSelector("BINGO_SET", 21, 3380, 0.01, 380, "Fuel Panel" , "Bingo Fuel Set Knob")

-- MPCD left
definePushButton("MPCD_L_1", 26, 3200, 200,"MPCD Left" , "MPCD Left Button 1")
Expand Down
32 changes: 11 additions & 21 deletions src/dcs-lua/lib/UH1H.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,23 +177,17 @@ defineFloat("RALT_HI_IDX", 466, {0, 1}, "Radar Altimeter", "HI Index")

local function getRadarAlt()
local function a(n) return GetDevice(0):get_argument_value(n) end
local digit1 = string.format("%.0f", GetDevice(0):get_argument_value(468)*10)
local digit1 = string.format("%.0f", a(468)*10)
if digit1 == "10" then digit1 = " " end
local digit2 = string.format("%.0f", GetDevice(0):get_argument_value(469)*10)
local digit2 = string.format("%.0f", a(469)*10)
if digit2 == "10" then digit2 = " " end
local digit3 = string.format("%.0f", GetDevice(0):get_argument_value(470)*10)
local digit3 = string.format("%.0f", a(470)*10)
if digit3 == "10" then digit3 = " " end
local digit4 = string.format("%.0f", GetDevice(0):get_argument_value(471)*10)
local digit4 = string.format("%.0f", a(471)*10)
if digit4 == "10" then digit4 = " " end
return tonumber(digit1 .. digit2 .. digit3 .. digit4)
return digit1 .. digit2 .. digit3 .. digit4
end
defineIntegerFromGetter("RALT_DISPLAY", getRadarAlt, 65000, "Radar Altimeter", "Radar Altitude Display")

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")

defineString("RALT_DISPLAY", getRadarAlt, 4, "Radar Altimeter", "Display")
-- clickabledata.lua:


Expand Down Expand Up @@ -481,25 +475,21 @@ 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")
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
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)
return string.format("%.0f%.0f", a(462)*10, a(463)*10)
end
defineIntegerFromGetter("CM_FLARECNT_DISPLAY", getFlareCount, 60, "Countermeasures", "Flare Counter Display")

defineFixedStepInput("CM_FLARECNT", 50, 3004, {-1, 1}, "Countermeasures", "Flare Counter Decrease/Increase")

definePushButton("CM_CHAFFCNT_RESET", 50, 3007, 455, "Countermeasures", "Chaff Counter Reset Button")
local function getChaffCount()
local function a(n) return GetDevice(0):get_argument_value(n) end
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)
return string.format("%.0f%.0f", a(462)*10, a(463)*10)
end
defineIntegerFromGetter("CM_CHAFFCNT_DISPLAY", getChaffCount, 60, "Countermeasures", "Chaff Counter Display")
defineString("CM_CHAFFCNT_DISPLAY", getChaffCount, 2, "Countermeasures", "Chaff Counter")
defineFixedStepInput("CM_CHAFFCNT", 50, 3008, {-1, 1}, "Countermeasures", "Chaff Counter Decrease/Increase")

defineToggleSwitch("RADAR_ALT_PWR", 13, 3007, 449, "Overhead Panel", "Radar Altimeter Power")
Expand Down

0 comments on commit da8d337

Please sign in to comment.