Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-23 16:25:26 +03:00
Code Issues Wiki Activity

Merge pull request #3608 from iNavFlight/agh_settings_validate_minmax

Browse source 
When encoding settings, validate that min <= max for all settings
This commit is contained in:
Alberto García Hierro 2018-07-16 17:06:45 +01:00 • committed by GitHub
commit 21e79e5d93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/utils/settings.rb
View file

@ -240,8 +240,7 @@ class ValueEncoder
return buf.to_carr
end
private
def encode_value(buf, val)
def resolve_value(val)
v = val || 0
if !v.is_number_kind?
v = @constants[val]
@ -249,6 +248,12 @@ class ValueEncoder
raise "Could not resolve constant #{val}"
end
end
return v
end
private
def encode_value(buf, val)
v = resolve_value(val)
pos = @values.find_index(v)
if pos < 0
raise "Could not encode value not in array #{v}"
@ -501,14 +506,20 @@ class Generator
buf << "\t// #{group["name"]}\n"
end
buf << "\t{ #{@name_encoder.format_encoded_name(member["name"])}, "
name = member["name"]
buf << "\t{ #{@name_encoder.format_encoded_name(name)}, "
buf << "#{var_type(member["type"])} | #{value_type(group)}"
tbl = member["table"]
if tbl
buf << " | MODE_LOOKUP"
buf << ", .config.lookup = { #{table_constant_name(tbl)} }"
else
enc = @value_encoder.encode_values(member["min"], member["max"])
min = @value_encoder.resolve_value(member["min"])
max = @value_encoder.resolve_value(member["max"])
if min > max
raise "Error encoding #{name}: min (#{min}) > max (#{max})"
end
enc = @value_encoder.encode_values(min, max)
buf << ", .config.minmax.indexes = #{enc}"
end
buf << ", offsetof(#{group["type"]}, #{member["field"]}) },\n"