Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-01 21:07:40 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

strip_button: attribute -> element

Browse Source
This commit is contained in:
Pascal Brisset
2006-08-23 13:30:40 +00:00
parent 22f1cdf43d
commit 56058e574c
4 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/settings/basic.xml
+6 -2
View File
@@ -8,8 +8,12 @@
<dl_setting MAX="1000" MIN="-50" STEP="10" VAR="altitude_shift"/> <dl_setting MAX="1000" MIN="-50" STEP="10" VAR="altitude_shift"/>
</dl_settings> </dl_settings>
<dl_settings NAME="mode"> <dl_settings NAME="mode">
<dl_setting MAX="2" MIN="0" STEP="1" VAR="pprz_mode" strip_button="AUTO2" button_value="2"/> <dl_setting MAX="2" MIN="0" STEP="1" VAR="pprz_mode">
<dl_setting MAX="1" MIN="0" STEP="1" VAR="launch" strip_button="Launch" button_value="1"/> <strip_button name="AUTO2" value="2"/>
</dl_setting>
<dl_setting MAX="1" MIN="0" STEP="1" VAR="launch">
<strip_button name="Launch" value="1"/>
</dl_setting>
<dl_setting MAX="1" MIN="0" STEP="1" VAR="kill_throttle"/> <dl_setting MAX="1" MIN="0" STEP="1" VAR="kill_throttle"/>
</dl_settings> </dl_settings>
</dl_settings> </dl_settings>
conf/settings/settings.dtd
+8 -3
View File
@@ -14,7 +14,8 @@
<!ATTLIST rc_setting rc (gain_1_up|gain_2_up|gain_1_down|gain_2_down) #REQUIRED> <!ATTLIST rc_setting rc (gain_1_up|gain_2_up|gain_1_down|gain_2_down) #REQUIRED>
<!ELEMENT dl_settings (dl_setting|dl_settings)*> <!ELEMENT dl_settings (dl_setting|dl_settings)*>
<!ELEMENT dl_setting EMPTY> <!ELEMENT dl_setting (strip_button)*>
<!ELEMENT strip_button EMPTY>
<!ATTLIST dl_settings <!ATTLIST dl_settings
name CDATA #IMPLIED name CDATA #IMPLIED
@@ -25,6 +26,10 @@ var CDATA #REQUIRED
min CDATA #REQUIRED min CDATA #REQUIRED
max CDATA #REQUIRED max CDATA #REQUIRED
step CDATA #IMPLIED step CDATA #IMPLIED
strip_button CDATA #IMPLIED
button_value CDATA #IMPLIED
> >
<!ATTLIST strip_button
name CDATA #REQUIRED
value CDATA #REQUIRED
>
sw/ground_segment/cockpit/pages.ml
+9 -11
View File
@@ -44,7 +44,7 @@ class alert (widget: GBin.frame) =
method add text = method add text =
if text <> last then begin if text <> last then begin
let l = Unix.localtime (Unix.gettimeofday ()) in let l = Unix.localtime (Unix.gettimeofday ()) in
view#buffer#insert (sprintf "%2d:%2d:%2d " l.Unix.tm_hour l.Unix.tm_min l.Unix.tm_sec); view#buffer#insert (sprintf "%02d:%02d:%02d " l.Unix.tm_hour l.Unix.tm_min l.Unix.tm_sec);
view#buffer#insert text; view#buffer#insert text;
view#buffer#insert "\n"; view#buffer#insert "\n";
last <- text last <- text
@@ -234,16 +234,14 @@ let one_setting = fun i do_change packing s (tooltips:GData.tooltips) strip ->
| Some v -> do_change i v in | Some v -> do_change i v in
ignore (undo_but#connect#clicked ~callback); ignore (undo_but#connect#clicked ~callback);
tooltips#set_tip undo_but#coerce ~text:"Undo"; tooltips#set_tip undo_but#coerce ~text:"Undo";
begin List.iter (fun x ->
try assert(ExtXml.tag_is x "strip_button");
let label = ExtXml.attrib s "strip_button" let label = ExtXml.attrib x "name"
and sp_value = f "button_value" in and sp_value = ExtXml.float_attrib x "value" in
let b = GButton.button ~label () in let b = GButton.button ~label () in
Strip.add_widget strip b#coerce; Strip.add_widget strip b#coerce;
ignore (b#connect#clicked (fun _ -> do_change i sp_value)) ignore (b#connect#clicked (fun _ -> do_change i sp_value)))
with (Xml.children s);
ExtXml.Error _ -> ()
end;
_v _v
sw/tools/gen_settings.ml
+1
View File
@@ -164,3 +164,4 @@ let _ =
with with
Xml.Error e -> prerr_endline (Xml.error e) Xml.Error e -> prerr_endline (Xml.error e)
| Dtd.Prove_error e -> prerr_endline (Dtd.prove_error e); exit 1 | Dtd.Prove_error e -> prerr_endline (Dtd.prove_error e); exit 1
| Dtd.Parse_error e -> prerr_endline (Dtd.parse_error e); exit 1