Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-31 03:57:45 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

indentation

Browse Source
This commit is contained in:
Felix Ruess
2011-11-29 14:43:29 +01:00
parent dc81b4bdf6
commit 257bb4b4e8
3 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ground_segment/tmtc/settings.ml
+3 -3
View File
@@ -49,10 +49,10 @@ let one_ac = fun (notebook:GPack.notebook) ac_name ->
let vs = ["ac_id", Pprz.String ac_id; "index", Pprz.Int idx] in let vs = ["ac_id", Pprz.String ac_id; "index", Pprz.Int idx] in
if classify_float value = FP_normal || classify_float value =FP_zero then if classify_float value = FP_normal || classify_float value =FP_zero then
let vs' = ("value", Pprz.Float value) :: vs in let vs' = ("value", Pprz.Float value) :: vs in
Ground_Pprz.message_send "dl" "DL_SETTING" vs' Ground_Pprz.message_send "dl" "DL_SETTING" vs'
else else
Ground_Pprz.message_send "dl" "GET_DL_SETTING" vs in Ground_Pprz.message_send "dl" "GET_DL_SETTING" vs in
(* Build the buttons and sliders *) (* Build the buttons and sliders *)
let xml = Xml.parse_file xml_file in let xml = Xml.parse_file xml_file in
sw/tools/gen_airframe.ml
+8 -8
View File
@@ -82,17 +82,17 @@ let define_integer name v n =
let parse_element = fun prefix s -> let parse_element = fun prefix s ->
match Xml.tag s with match Xml.tag s with
"define" -> begin "define" -> begin
try try
define (prefix^ExtXml.attrib s "name") (ExtXml.display_entities (ExtXml.attrib s "value")); define (prefix^ExtXml.attrib s "name") (ExtXml.display_entities (ExtXml.attrib s "value"));
define_integer (prefix^(ExtXml.attrib s "name")) (ExtXml.float_attrib s "value") (ExtXml.int_attrib s "integer"); define_integer (prefix^(ExtXml.attrib s "name")) (ExtXml.float_attrib s "value") (ExtXml.int_attrib s "integer");
with _ -> (); with _ -> ();
end end
| "linear" -> | "linear" ->
let name = ExtXml.attrib s "name" let name = ExtXml.attrib s "name"
and n = int_of_string (ExtXml.attrib s "arity") in and n = int_of_string (ExtXml.attrib s "arity") in
define_macro (prefix^name) n s define_macro (prefix^name) n s
| _ -> xml_error "define|linear" | _ -> xml_error "define|linear"
sw/tools/gen_settings.ml
+20 -20
View File
@@ -59,7 +59,7 @@ let print_dl_settings = fun settings ->
List.iter List.iter
(fun s -> (fun s ->
try try
modules := StringSet.add (ExtXml.attrib s "module") !modules modules := StringSet.add (ExtXml.attrib s "module") !modules
with ExtXml.Error e -> () with ExtXml.Error e -> ()
) )
settings; settings;
@@ -78,15 +78,15 @@ let print_dl_settings = fun settings ->
List.iter List.iter
(fun s -> (fun s ->
let v = ExtXml.attrib s "var" in let v = ExtXml.attrib s "var" in
begin begin
try try
let h = ExtXml.attrib s "handler" and let h = ExtXml.attrib s "handler" and
m = ExtXml.attrib s "module" in m = ExtXml.attrib s "module" in
lprintf "case %d: %s_%s( _value ); _value = %s; break;\\\n" !idx (Filename.basename m) h v lprintf "case %d: %s_%s( _value ); _value = %s; break;\\\n" !idx (Filename.basename m) h v
with with
ExtXml.Error e -> lprintf "case %d: %s = _value; break;\\\n" !idx v ExtXml.Error e -> lprintf "case %d: %s = _value; break;\\\n" !idx v
end; end;
incr idx incr idx
) )
settings; settings;
lprintf "default: break;\\\n"; lprintf "default: break;\\\n";
@@ -108,8 +108,8 @@ let print_dl_settings = fun settings ->
right (); right ();
List.iter List.iter
(fun s -> (fun s ->
let v = ExtXml.attrib s "var" in let v = ExtXml.attrib s "var" in
lprintf "case %d: var = %s; break;\\\n" !idx v; incr idx) lprintf "case %d: var = %s; break;\\\n" !idx v; incr idx)
settings; settings;
lprintf "default: var = 0.; break;\\\n"; lprintf "default: var = 0.; break;\\\n";
left (); left ();
@@ -177,13 +177,13 @@ let print_persistent_settings = fun settings ->
(fun s -> (fun s ->
let v = ExtXml.attrib s "var" in let v = ExtXml.attrib s "var" in
begin begin
try try
let h = ExtXml.attrib s "handler" and let h = ExtXml.attrib s "handler" and
m = ExtXml.attrib s "module" in m = ExtXml.attrib s "module" in
lprintf "%s_%s( pers_settings.s_%d );\n" (Filename.basename m) h !idx ; lprintf "%s_%s( pers_settings.s_%d );\n" (Filename.basename m) h !idx ;
(* lprintf "%s = pers_settings.s_%d;\n" v !idx *) (* do we want to set the value too or just call the handler ? *) (* lprintf "%s = pers_settings.s_%d;\n" v !idx *) (* do we want to set the value too or just call the handler ? *)
with with
ExtXml.Error e -> lprintf "%s = pers_settings.s_%d;\n" v !idx ExtXml.Error e -> lprintf "%s = pers_settings.s_%d;\n" v !idx
end; end;
incr idx) incr idx)
pers_settings; pers_settings;
@@ -252,7 +252,7 @@ let join_xml_files = fun xml_files ->
let xml = Xml.parse_file xml_file in let xml = Xml.parse_file xml_file in
let these_rc_settings = let these_rc_settings =
try Xml.children (ExtXml.child xml "rc_settings") with try Xml.children (ExtXml.child xml "rc_settings") with
Not_found -> [] in Not_found -> [] in
let these_dl_settings = let these_dl_settings =
try Xml.children (ExtXml.child xml "dl_settings") with try Xml.children (ExtXml.child xml "dl_settings") with
Not_found -> [] in Not_found -> [] in