Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-21 03:43:26 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[fix] take the reverse into account in macro as well

Browse Source 
the reverse flag is directly applied by the parser, so correct values
are use for all macros
This commit is contained in:
Gautier Hattenberger
2021-05-12 11:27:45 +02:00
committed by Freek van Tienen
parent fdbd4679c7
commit 2490147fa0
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/lib/ocaml/radio.ml
+6 -3
View File
@@ -37,12 +37,15 @@ let parse_channel = function
let bget = fun attrib ->
try Xml.attrib xml attrib <> "0"
with Xml.No_attribute _ -> false in
let reverse = bget "reverse" in
let min = ExtXml.int_attrib xml "min"
and max = ExtXml.int_attrib xml "max" in
{ cname = Xml.attrib xml "function";
min = ExtXml.int_attrib xml "min";
max = ExtXml.int_attrib xml "max";
min = if reverse then max else min;
max = if reverse then min else max;
neutral = ExtXml.int_attrib xml "neutral";
average = bget "average";
reverse = bget "reverse";
reverse;
}
| _ -> failwith "Radio.parse_channel: unreachable"
sw/tools/generators/gen_radio.ml
+4 -4
View File
@@ -117,10 +117,10 @@ let generate = fun radio xml_file out_file ->
check_function_name c.cname;
fprintf out "#define RADIO_%s %d\n" c.cname i;
fprintf out "#define RADIO_%s_NEUTRAL %d\n" c.cname c.neutral;
let (mini, maxi) = if c.reverse then (c.max, c.min) else (c.min, c.max) in
fprintf out "#define RADIO_%s_MIN %d\n" c.cname mini;
fprintf out "#define RADIO_%s_MAX %d\n\n" c.cname maxi;
if c.max < c.min then failwith (sprintf "Error: \"%s\" radio channel: max must be superior to min! Use reverse=\"1\" to reverse the channel." c.cname)
fprintf out "#define RADIO_%s_MIN %d\n" c.cname c.min;
fprintf out "#define RADIO_%s_MAX %d\n\n" c.cname c.max;
if (not c.reverse && (c.max < c.min)) || (c.reverse && (c.min < c.max))
then failwith (sprintf "Error: \"%s\" radio channel: max must be superior to min! Use reverse=\"1\" to reverse the channel." c.cname)
) radio.channels;
let ppm_pulse_type = match radio.pulse_type with