Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 31 Packages Projects Releases Wiki Activity

[settings] add optional target attribute to settings

Browse Source
This commit is contained in:
Felix Ruess
2015-04-02 14:02:58 +02:00
parent 8756d2e839
commit 5c325f1c69
11 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/settings/control/rotorcraft_guidance.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<!DOCTYPE settings SYSTEM "../settings.dtd">
<settings>
<settings target="ap|nps">
<dl_settings>
<dl_settings NAME="Vert Loop">
conf/settings/control/stabilization_att_float_euler.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<!DOCTYPE settings SYSTEM "../settings.dtd">
<settings>
<settings target="ap|nps">
<dl_settings>
<dl_settings NAME="Att Loop">
conf/settings/control/stabilization_att_float_quat.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<!DOCTYPE settings SYSTEM "../settings.dtd">
<settings>
<settings target="ap|nps">
<dl_settings>
<dl_settings NAME="Att Loop">
conf/settings/control/stabilization_att_int.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<!DOCTYPE settings SYSTEM "../settings.dtd">
<settings>
<settings target="ap|nps">
<dl_settings>
<dl_settings NAME="Att Loop">
conf/settings/control/stabilization_att_int_quat.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<!DOCTYPE settings SYSTEM "../settings.dtd">
<settings>
<settings target="ap|nps">
<dl_settings>
<dl_settings NAME="Att Loop">
conf/settings/control/stabilization_rate.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<!DOCTYPE settings SYSTEM "../settings.dtd">
<settings>
<settings target="ap|nps">
<dl_settings>
<dl_settings NAME="Rate Loop">
conf/settings/nps.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<!DOCTYPE settings SYSTEM "settings.dtd">
<settings>
<settings target="nps">
<dl_settings>
<dl_settings NAME="Sim">
conf/settings/rotorcraft_basic.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<!DOCTYPE settings SYSTEM "settings.dtd">
<settings>
<settings target="ap|nps">
<dl_settings>
<dl_settings NAME="System">
conf/settings/settings.dtd
+4
View File
@@ -18,6 +18,10 @@
<!ELEMENT strip_button EMPTY>
<!ELEMENT key_press EMPTY>
<!ATTLIST settings
target CDATA #IMPLIED
>
<!ATTLIST dl_settings
name CDATA #IMPLIED
>
conf/settings/test_settings.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<!DOCTYPE settings SYSTEM "settings.dtd">
<settings>
<settings target="test_settings">
<dl_settings>
<dl_settings NAME="Group1">
sw/tools/generators/gen_settings.ml
+12 -4
View File
@@ -144,7 +144,7 @@ let print_dl_settings = fun settings ->
lprintf "static inline float settings_get_value(uint8_t i) {\n";
right ();
let idx = ref 0 in
lprintf "switch (i) { \\\n";
lprintf "switch (i) {\n";
right ();
List.iter
(fun s ->
@@ -152,10 +152,10 @@ let print_dl_settings = fun settings ->
lprintf "case %d: return %s;\n" !idx v; incr idx)
settings;
lprintf "default: return 0.;\n";
lprintf "}\n";
left ();
lprintf "}\n";
left()
left ();
lprintf "}\n"
let inttype = function
@@ -309,7 +309,15 @@ let join_xml_files = fun xml_files ->
then List.filter (fun t -> Xml.tag t = "settings") (Xml.children xml)
else []
end
else [xml]
else begin
(* if the top <settings> node has a target attribute,
only add if matches current target *)
let t = ExtXml.attrib_or_default xml "target" "" in
if t = "" || Str.string_match (Str.regexp (".*"^target^".*")) t 0 then
[xml]
else
[]
end
in
(* include settings if name is matching *)
List.fold_left (fun l x ->