Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-29 02:38:07 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

Jeremy's words

Browse Source
This commit is contained in:
Pascal Brisset
2007-07-27 14:03:25 +00:00
parent 93f63e5223
commit cf5924a1bf
3 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/control_panel.xml.example
+29 -29
View File
@@ -12,48 +12,48 @@
</section>
<section name="programs">
<program name="server" command="sw/ground_segment/tmtc/server">
<program name="Server" command="sw/ground_segment/tmtc/server">
<arg flag="-b" variable="ivy_bus"/>
</program>
<program name="link" command="sw/ground_segment/tmtc/link">
<program name="Data Link" command="sw/ground_segment/tmtc/link">
<arg flag="-b" variable="ivy_bus"/>
</program>
<program name="gcs" command="sw/ground_segment/cockpit/gcs">
<program name="GCS" command="sw/ground_segment/cockpit/gcs">
<arg flag="-b" variable="ivy_bus"/>
</program>
<program name="messages" command="sw/ground_segment/tmtc/messages">
<program name="Messages" command="sw/ground_segment/tmtc/messages">
<arg flag="-b" variable="ivy_bus"/>
</program>
<program name="settings" command="sw/ground_segment/tmtc/settings">
<program name="Settings" command="sw/ground_segment/tmtc/settings">
<arg flag="-b" variable="ivy_bus"/>
</program>
<program name="Log plotter" command ="sw/logalizer/plot"/>
<program name="Log Plotter" command ="sw/logalizer/plot"/>
<program name="Real time plotter" command ="sw/logalizer/plotter"/>
<program name="Real-time Plotter" command ="sw/logalizer/plotter"/>
<program name="replay" command="sw/logalizer/play">
<program name="Log File Player" command="sw/logalizer/play">
<arg flag="-b" variable="ivy_bus"/>
</program>
<program name="sim" command="sw/simulator/launchsitl">
<program name="Simulator" command="sw/simulator/launchsitl">
<arg flag="-b" variable="ivy_bus"/>
</program>
<program name="hitl" command="sw/simulator/simhitl">
<program name="Hardware in the Loop" command="sw/simulator/simhitl">
<arg flag="-fbw" variable="fbw_serial_port"/>
<arg flag="-ap" variable="ap_serial_port"/>
</program>
<program name="gaia" command="sw/simulator/gaia">
<program name="Environment Simulator" command="sw/simulator/gaia">
<arg flag="-b" variable="ivy_bus"/>
</program>
<program name="http server" command="sw/ground_segment/tmtc/boa"/>
<program name="Http Server" command="sw/ground_segment/tmtc/boa"/>
</section>
@@ -62,9 +62,9 @@
<section name="sessions">
<session name="1 Simple Simulation">
<program name="server"></program>
<program name="sim"><arg flag="-a" constant="MJ5"/></program>
<program name="gcs">
<program name="Server"></program>
<program name="Simulator"><arg flag="-a" constant="MJ5"/></program>
<program name="GCS">
<arg flag="-ref" constant="WGS84 43.4623 1.2730"/>
<arg flag="-center" constant="WGS84 43.4623 1.2730"/>
<arg flag="-zoom" constant="0.75"/>
@@ -74,37 +74,37 @@
</session>
<session name="2 Versatile Simulation">
<program name="server"></program>
<program name="gcs">
<program name="Server"></program>
<program name="GCS">
<!-- <arg flag="-mplayer" constant="rtsp://localhost:7070/webcam"/> -->
</program>
<program name="sim"><arg flag="-a" constant="TJ1"/></program>
<program name="messages"><arg flag="-c" constant="ground:ground"/></program>
<program name="Simulator"><arg flag="-a" constant="TJ1"/></program>
<program name="Messages"><arg flag="-c" constant="ground:ground"/></program>
</session>
<session name="3 Multi-A/C Simulation">
<program name="sim"><arg flag="-a" constant="MJ5"/></program>
<program name="sim"><arg flag="-a" constant="TJ1"/></program>
<program name="server"/>
<program name="gcs">
<program name="Simulator"><arg flag="-a" constant="MJ5"/></program>
<program name="Simulator"><arg flag="-a" constant="TJ1"/></program>
<program name="Server"/>
<program name="GCS">
<arg flag="-track_size" constant="10"/>
</program>
</session>
<session name="4 Flight with XBee/Xtend modem">
<program name="link">
<program name="Data Link">
<arg flag="-d" constant="/dev/paparazzi/xbee"/>
<arg flag="-transport" constant="xbee"/>
<arg flag="-uplink" constant=""/>
</program>
<program name="server"/>
<program name="gcs"/>
<program name="Server"/>
<program name="GCS"/>
</session>
<session name="5 Log Replay">
<program name="server"><arg flag="-n"/></program>
<program name="gcs"/>
<program name="replay"/>
<program name="Server"><arg flag="-n"/></program>
<program name="GCS"/>
<program name="Log File Player"/>
</session>
</section>
sw/supervision/paparazzicenter.glade
+9 -8
View File
@@ -1628,7 +1628,7 @@
<child>
<widget class="GtkMenuItem" id="sim_menu_item">
<property name="visible">True</property>
<property name="label" translatable="yes">Sim</property>
<property name="label" translatable="yes">_Simulation</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_sim1_activate" last_modification_time="Sat, 30 Jun 2007 09:15:04 GMT"/>
</widget>
@@ -1637,7 +1637,7 @@
<child>
<widget class="GtkMenuItem" id="fly_menu_item">
<property name="visible">True</property>
<property name="label" translatable="yes">Fly with ...</property>
<property name="label" translatable="yes">_Flight</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_fly1_activate" last_modification_time="Sat, 30 Jun 2007 09:15:04 GMT"/>
</widget>
@@ -1646,7 +1646,7 @@
<child>
<widget class="GtkMenuItem" id="replay_menu_item">
<property name="visible">True</property>
<property name="label" translatable="yes">Replay</property>
<property name="label" translatable="yes">Log File _Replay</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_replay1_activate" last_modification_time="Sat, 30 Jun 2007 09:15:04 GMT"/>
</widget>
@@ -1661,7 +1661,7 @@
<child>
<widget class="GtkMenuItem" id="session_menu_item">
<property name="visible">True</property>
<property name="label" translatable="yes">User</property>
<property name="label" translatable="yes">Custom</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_session_menu_item_activate" last_modification_time="Sat, 07 Jul 2007 16:48:24 GMT"/>
</widget>
@@ -1674,7 +1674,7 @@
<child>
<widget class="GtkMenuItem" id="programs_menu_item">
<property name="visible">True</property>
<property name="label" translatable="yes">Single Program</property>
<property name="label" translatable="yes">_Tools</property>
<property name="use_underline">True</property>
</widget>
</child>
@@ -1717,7 +1717,7 @@
<child>
<widget class="GtkLabel" id="label82">
<property name="visible">True</property>
<property name="label" translatable="yes">Current:</property>
<property name="label" translatable="yes">Current Operation:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1804,7 +1804,7 @@
<child>
<widget class="GtkLabel" id="label83">
<property name="visible">True</property>
<property name="label" translatable="yes">Remove All Processes</property>
<property name="label" translatable="yes">Stop/Remove All Processes</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2019,7 +2019,8 @@
</widget>
<packing>
<property name="tab_expand">False</property>
<property name="tab_fill">True</property>
<property name="tab_fill">False</property>
<property name="tab_pack">GTK_PACK_END</property>
</packing>
</child>
sw/supervision/pc_control_panel.ml
+14 -11
View File
@@ -39,8 +39,11 @@ let programs =
(Xml.children s);
h
let program_command = fun x ->
let xml = Hashtbl.find programs x in
Env.paparazzi_src // ExtXml.attrib xml "command"
try
let xml = Hashtbl.find programs x in
Env.paparazzi_src // ExtXml.attrib xml "command"
with Not_found ->
failwith (sprintf "Fatal Error: Program '%s' not found in control_panel.xml" x)
let sessions =
let h = Hashtbl.create 7 in
@@ -186,20 +189,20 @@ let supervision = fun ?file gui log ->
let supervision_page = 1 in (* FIXME *)
let run_gcs = fun () ->
run_and_monitor ?file ~plugged:true gui log "gcs" ""
run_and_monitor ?file ~plugged:true gui log "GCS" ""
and run_server = fun args ->
run_and_monitor ?file gui log "server" args
run_and_monitor ?file gui log "Server" args
and run_link = fun args ->
run_and_monitor ?file gui log "link" args
run_and_monitor ?file gui log "Data Link" args
and run_sitl = fun ac_name ->
let args = sprintf "-a %s -boot -norc" ac_name in
run_and_monitor ?file gui log "sim" args
run_and_monitor ?file gui log "Simulator" args
in
(* Replay menu *)
let callback = fun () ->
gui#entry_session_name#set_text "Replay";
run_and_monitor ?file gui log "play" "";
run_and_monitor ?file gui log "Log File Player" "";
run_server "-n";
run_gcs ()
in
@@ -210,7 +213,7 @@ let supervision = fun ?file gui log ->
close_programs gui in
ignore (gui#button_remove_all_processes#connect#clicked ~callback);
(* Programs *)
(* Tools *)
let entries = ref [] in
Hashtbl.iter
(fun name prog ->
@@ -234,7 +237,7 @@ let supervision = fun ?file gui log ->
Hashtbl.iter
(fun ac_name ac ->
let cb = fun () ->
gui#entry_session_name#set_text (sprintf "Sim %s" ac_name);
gui#entry_session_name#set_text (sprintf "Simualator %s" ac_name);
run_gcs ();
run_server "-n";
run_sitl ac_name
@@ -302,13 +305,13 @@ let supervision = fun ?file gui log ->
(* Flights *)
let cb = fun name args () ->
gui#entry_session_name#set_text (sprintf "Fly with %s" name);
gui#entry_session_name#set_text (sprintf "Flight: %s" name);
run_gcs ();
run_server "";
run_link args
in
let entries =
[`I ("XBee", cb "XBee" "-transport xbee -uplink");
[`I ("Maxstream", cb "Maxstream" "-transport xbee -uplink");
`I ("Aerocomm", cb "Aerocomm" "-s 57600 -aerocomm -uplink");
`I ("Serial", cb "Serial" "-uplink")] in
let menu = GMenu.menu ()