Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Mi-24P: Fix ALT_SHUTTER controls out of range #803

Merged
merged 1 commit into from
Jul 6, 2024
Merged

Mi-24P: Fix ALT_SHUTTER controls out of range #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions Scripts/DCS-BIOS/lib/modules/Module.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,8 +1292,25 @@ end
function Module.valueConvert(argument_value, input_range, output_range)
assert_min_max(input_range, "input_range")
assert_min_max(output_range, "output_range")
local slope = 1.0 * (output_range[2] - output_range[1]) / (input_range[2] - input_range[1])
return output_range[1] + slope * (argument_value - input_range[1])

-- if we're close enough to our input range, snap to that value
-- this helps avoid out of range issues mapping from small input ranges to large output ranges
local epsilon = 0.000072 -- for the smallest known range in dcs {0.822, 0.75} -> 0.072, this is about 0.1%

local input_min = input_range[1]
local input_max = input_range[2]
local output_min = output_range[1]
local output_max = output_range[2]

if math.abs(argument_value - input_min) < epsilon then
return output_min
end
if math.abs(argument_value - input_max) < epsilon then
return output_max
end

local slope = 1.0 * (output_max - output_min) / (input_max - input_min)
return output_min + slope * (argument_value - input_min)
end

--- Returns an integer from individual arguments ordered from least to most significant digit
Expand Down
22 changes: 22 additions & 0 deletions Scripts/DCS-BIOS/test/controls/FloatTest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,25 @@ function TestFloat:testFloatDecimalValue()
export_hook(MockDevice:new(0.5))
lu.assertEquals(alloc.value, 65535)
end

function TestFloat:testFloatSmallRangeValue()
local limits = { 0.822, 0.75 }

self.module:defineFloat(id, arg_number, limits, category, description)

local export_hook = self.module.exportHooks[1]

local alloc = self.module.memoryMap.entries[moduleAddress].allocations[1]

export_hook(MockDevice:new(0.82205))
lu.assertEquals(alloc.value, 0)

export_hook(MockDevice:new(0.74995))
lu.assertEquals(alloc.value, 65535)

export_hook(MockDevice:new(0.822))
lu.assertEquals(alloc.value, 0)

export_hook(MockDevice:new(0.75))
lu.assertEquals(alloc.value, 65535)
end
Loading