mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-05-23 21:36:28 +08:00
indentation
This commit is contained in:
@@ -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
|
||||
if classify_float value = FP_normal || classify_float value =FP_zero then
|
||||
let vs' = ("value", Pprz.Float value) :: vs in
|
||||
Ground_Pprz.message_send "dl" "DL_SETTING" vs'
|
||||
let vs' = ("value", Pprz.Float value) :: vs in
|
||||
Ground_Pprz.message_send "dl" "DL_SETTING" vs'
|
||||
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 *)
|
||||
let xml = Xml.parse_file xml_file in
|
||||
|
||||
@@ -82,17 +82,17 @@ let define_integer name v n =
|
||||
|
||||
let parse_element = fun prefix s ->
|
||||
match Xml.tag s with
|
||||
"define" -> begin
|
||||
try
|
||||
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");
|
||||
with _ -> ();
|
||||
end
|
||||
| "linear" ->
|
||||
"define" -> begin
|
||||
try
|
||||
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");
|
||||
with _ -> ();
|
||||
end
|
||||
| "linear" ->
|
||||
let name = ExtXml.attrib s "name"
|
||||
and n = int_of_string (ExtXml.attrib s "arity") in
|
||||
define_macro (prefix^name) n s
|
||||
| _ -> xml_error "define|linear"
|
||||
| _ -> xml_error "define|linear"
|
||||
|
||||
|
||||
|
||||
|
||||
+20
-20
@@ -59,7 +59,7 @@ let print_dl_settings = fun settings ->
|
||||
List.iter
|
||||
(fun s ->
|
||||
try
|
||||
modules := StringSet.add (ExtXml.attrib s "module") !modules
|
||||
modules := StringSet.add (ExtXml.attrib s "module") !modules
|
||||
with ExtXml.Error e -> ()
|
||||
)
|
||||
settings;
|
||||
@@ -78,15 +78,15 @@ let print_dl_settings = fun settings ->
|
||||
List.iter
|
||||
(fun s ->
|
||||
let v = ExtXml.attrib s "var" in
|
||||
begin
|
||||
try
|
||||
let h = ExtXml.attrib s "handler" and
|
||||
m = ExtXml.attrib s "module" in
|
||||
lprintf "case %d: %s_%s( _value ); _value = %s; break;\\\n" !idx (Filename.basename m) h v
|
||||
with
|
||||
ExtXml.Error e -> lprintf "case %d: %s = _value; break;\\\n" !idx v
|
||||
end;
|
||||
incr idx
|
||||
begin
|
||||
try
|
||||
let h = ExtXml.attrib s "handler" and
|
||||
m = ExtXml.attrib s "module" in
|
||||
lprintf "case %d: %s_%s( _value ); _value = %s; break;\\\n" !idx (Filename.basename m) h v
|
||||
with
|
||||
ExtXml.Error e -> lprintf "case %d: %s = _value; break;\\\n" !idx v
|
||||
end;
|
||||
incr idx
|
||||
)
|
||||
settings;
|
||||
lprintf "default: break;\\\n";
|
||||
@@ -108,8 +108,8 @@ let print_dl_settings = fun settings ->
|
||||
right ();
|
||||
List.iter
|
||||
(fun s ->
|
||||
let v = ExtXml.attrib s "var" in
|
||||
lprintf "case %d: var = %s; break;\\\n" !idx v; incr idx)
|
||||
let v = ExtXml.attrib s "var" in
|
||||
lprintf "case %d: var = %s; break;\\\n" !idx v; incr idx)
|
||||
settings;
|
||||
lprintf "default: var = 0.; break;\\\n";
|
||||
left ();
|
||||
@@ -177,13 +177,13 @@ let print_persistent_settings = fun settings ->
|
||||
(fun s ->
|
||||
let v = ExtXml.attrib s "var" in
|
||||
begin
|
||||
try
|
||||
let h = ExtXml.attrib s "handler" and
|
||||
m = ExtXml.attrib s "module" in
|
||||
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 ? *)
|
||||
with
|
||||
ExtXml.Error e -> lprintf "%s = pers_settings.s_%d;\n" v !idx
|
||||
try
|
||||
let h = ExtXml.attrib s "handler" and
|
||||
m = ExtXml.attrib s "module" in
|
||||
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 ? *)
|
||||
with
|
||||
ExtXml.Error e -> lprintf "%s = pers_settings.s_%d;\n" v !idx
|
||||
end;
|
||||
incr idx)
|
||||
pers_settings;
|
||||
@@ -252,7 +252,7 @@ let join_xml_files = fun xml_files ->
|
||||
let xml = Xml.parse_file xml_file in
|
||||
let these_rc_settings =
|
||||
try Xml.children (ExtXml.child xml "rc_settings") with
|
||||
Not_found -> [] in
|
||||
Not_found -> [] in
|
||||
let these_dl_settings =
|
||||
try Xml.children (ExtXml.child xml "dl_settings") with
|
||||
Not_found -> [] in
|
||||
|
||||
Reference in New Issue
Block a user