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 26 Packages Projects Releases Wiki Activity

fix path to var/aircrafts/<ac_name> in various tools

Browse Source 
especially path to flight_plan.xml and settings.xml files copied to var/aircrafts/<ac_name>
This commit is contained in:
Felix Ruess
2014-04-15 21:57:25 +02:00
parent af728fb92b
commit 2b24984f05
6 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ground_segment/joystick/input2ivy.ml
+3 -3
View File
@@ -139,7 +139,7 @@ let ac_id_of_name = fun ac_name ->
(** Fill the index_of_settings table from var/AC/settings.xml *)
let hash_index_of_settings = fun ac_name ->
let xml_file = Env.paparazzi_home // "var" // ac_name // "settings.xml" in
let xml_file = Env.paparazzi_home // "var" // "aircrafts" // ac_name // "settings.xml" in
let xml = Xml.parse_file xml_file in
let index = ref 0 in
let rec loop = fun xml ->
@@ -152,9 +152,9 @@ let hash_index_of_settings = fun ac_name ->
loop (ExtXml.child xml "dl_settings")
(** Fill the index_of_blocks table from var/AC/flight_plan.xml *)
(** Fill the index_of_blocks table from var/aircrafts/AC/flight_plan.xml *)
let hash_index_of_blocks = fun ac_name ->
let xml_file = Env.paparazzi_home // "var" // ac_name // "flight_plan.xml" in
let xml_file = Env.paparazzi_home // "var" // "aircrafts" // ac_name // "flight_plan.xml" in
let dump = Xml.parse_file xml_file in
let flight_plan = ExtXml.child dump "flight_plan" in
let blocks = ExtXml.child flight_plan "blocks" in
sw/ground_segment/tmtc/kml.ml
+16 -16
View File
@@ -212,9 +212,9 @@ let update_waypoints =
last_state := !l;
let url_flight_plan =
if !no_http then
sprintf "%s/var/%s/flight_plan.kml" Env.paparazzi_home ac.name
sprintf "%s/var/aircrafts/%s/flight_plan.kml" Env.paparazzi_home ac.name
else
sprintf "http://%s:%d/var/%s/flight_plan.kml" !hostname !port ac.name
sprintf "http://%s:%d/var/aircrafts/%s/flight_plan.kml" !hostname !port ac.name
in
let changes = List.map (fun (wp_id, wp) -> change_waypoint ac.name wp_id wp.wp_geo wp.altitude) !l in
let kml_update = link_update url_flight_plan changes in
@@ -227,12 +227,12 @@ let update_horiz_mode =
fun ac ->
if ac.horiz_mode <> !last_horiz_mode then begin
last_horiz_mode := ac.horiz_mode;
(*let url_flight_plan = sprintf "http://%s:%d/var/%s/flight_plan.kml" !hostname !port ac.name in*)
(*let url_flight_plan = sprintf "http://%s:%d/var/aircrafts/%s/flight_plan.kml" !hostname !port ac.name in*)
let url_flight_plan =
if !no_http then
sprintf "%s/var/%s/flight_plan.kml" Env.paparazzi_home ac.name
sprintf "%s/var/aircrafts/%s/flight_plan.kml" Env.paparazzi_home ac.name
else
sprintf "http://%s:%d/var/%s/flight_plan.kml" !hostname !port ac.name
sprintf "http://%s:%d/var/aircrafts/%s/flight_plan.kml" !hostname !port ac.name
in
let alt = ac.desired_altitude in
match ac.horiz_mode with
@@ -250,12 +250,12 @@ let update_horiz_mode =
let update_ac = fun ac ->
try
(*let url_flight_plan = sprintf "http://%s:%d/var/%s/flight_plan.kml" !hostname !port ac.name in*)
(*let url_flight_plan = sprintf "http://%s:%d/var/aircrafts/%s/flight_plan.kml" !hostname !port ac.name in*)
let url_flight_plan =
if !no_http then
sprintf "%s/var/%s/flight_plan.kml" Env.paparazzi_home ac.name
sprintf "%s/var/aircrafts/%s/flight_plan.kml" Env.paparazzi_home ac.name
else
sprintf "http://%s:%d/var/%s/flight_plan.kml" !hostname !port ac.name
sprintf "http://%s:%d/var/aircrafts/%s/flight_plan.kml" !hostname !port ac.name
in
let ap_mode = match ac.vehicle_type with
Rotorcraft -> rotorcraft_ap_modes.(ac.ap_mode)
@@ -279,17 +279,17 @@ let build_files = fun a ->
print_xml a.name "flight_plan.kml" kml_fp;
if !no_http then begin
let url_flight_plan = sprintf "%s/var/%s/flight_plan.kml" Env.paparazzi_home a.name in
let url_ac_changes = sprintf "%s/var/%s/ac_changes.kml" Env.paparazzi_home a.name in
let url_wp_changes = sprintf "%s/var/%s/wp_changes.kml" Env.paparazzi_home a.name in
let url_route_changes = sprintf "%s/var/%s/route_changes.kml" Env.paparazzi_home a.name in
let url_flight_plan = sprintf "%s/var/aircrafts/%s/flight_plan.kml" Env.paparazzi_home a.name in
let url_ac_changes = sprintf "%s/var/aircrafts/%s/ac_changes.kml" Env.paparazzi_home a.name in
let url_wp_changes = sprintf "%s/var/aircrafts/%s/wp_changes.kml" Env.paparazzi_home a.name in
let url_route_changes = sprintf "%s/var/aircrafts/%s/route_changes.kml" Env.paparazzi_home a.name in
let kml_ac = aircraft a.name url_flight_plan [url_ac_changes; url_wp_changes; url_route_changes] in
print_xml a.name "FollowMe.kml" kml_ac
end else begin
let url_flight_plan = sprintf "http://%s:%d/var/%s/flight_plan.kml" !hostname !port a.name in
let url_ac_changes = sprintf "http://%s:%d/var/%s/ac_changes.kml" !hostname !port a.name in
let url_wp_changes = sprintf "http://%s:%d/var/%s/wp_changes.kml" !hostname !port a.name in
let url_route_changes = sprintf "http://%s:%d/var/%s/route_changes.kml" !hostname !port a.name in
let url_flight_plan = sprintf "http://%s:%d/var/aircrafts/%s/flight_plan.kml" !hostname !port a.name in
let url_ac_changes = sprintf "http://%s:%d/var/aircrafts/%s/ac_changes.kml" !hostname !port a.name in
let url_wp_changes = sprintf "http://%s:%d/var/aircrafts/%s/wp_changes.kml" !hostname !port a.name in
let url_route_changes = sprintf "http://%s:%d/var/aircrafts/%s/route_changes.kml" !hostname !port a.name in
let kml_ac = aircraft a.name url_flight_plan [url_ac_changes; url_wp_changes; url_route_changes] in
print_xml a.name "FollowMe.kml" kml_ac
end;;
sw/ground_segment/tmtc/server.ml
+3 -3
View File
@@ -469,7 +469,7 @@ let new_aircraft = fun get_alive_md5sum real_id ->
let is_replayed, id, root_dir, conf_xml = replayed real_id in
let conf = get_conf real_id id conf_xml in
let ac_name = ExtXml.attrib conf "name" in
let var_aircraft_dir = Env.paparazzi_home // root_dir // "var" // ac_name in
let var_aircraft_dir = Env.paparazzi_home // root_dir // "var" // "aircrafts" // ac_name in
if not (Sys.file_exists var_aircraft_dir) then begin
(* Let's look for a backup configuration with the md5 signature *)
@@ -607,10 +607,10 @@ let send_config = fun http _asker args ->
let prefix = fun s -> sprintf "%s/%s%s" protocol root_dir s in
(** Expanded flight plan and settings have been compiled in var/ *)
let fp = prefix ("var" // ac_name // "flight_plan.xml")
let fp = prefix ("var" // "aircrafts" // ac_name // "flight_plan.xml")
and af = prefix ("conf" // ExtXml.attrib conf "airframe")
and rc = prefix ("conf" // ExtXml.attrib conf "radio")
and settings = if not _is_replayed then prefix ("var" // ac_name //
and settings = if not _is_replayed then prefix ("var" // "aircrafts" // ac_name //
"settings.xml") else "file://replay" in
let col = try Xml.attrib conf "gui_color" with _ -> new_color () in
let ac_name = try Xml.attrib conf "name" with _ -> "" in
sw/ground_segment/tmtc/settings.ml
+1 -1
View File
@@ -34,7 +34,7 @@ let conf_xml = Xml.parse_file (conf_dir // "conf.xml")
let one_ac = fun (notebook:GPack.notebook) ac_name ->
(* Get the setting file *)
let xml_file = Env.paparazzi_home // "var" // ac_name // "settings.xml" in
let xml_file = Env.paparazzi_home // "var" // "aircrafts" // ac_name // "settings.xml" in
if not (Sys.file_exists xml_file) then
Printf.fprintf stderr "A/C '%s' not compiled: %s not found\n%!" ac_name xml_file
else
sw/logalizer/play_core.ml
+1 -1
View File
@@ -47,7 +47,7 @@ let store_conf = fun conf acs ->
if ExtXml.tag_is x "aircraft" then
if List.mem (ExtXml.attrib x "ac_id") acs then
let ac_name = ExtXml.attrib x "name" in
let ac_dir = replay_dir // "var" // ac_name in
let ac_dir = replay_dir // "var" // "aircrafts" // ac_name in
let w = fun s ->
(* Histotical: still useful ? *)
sw/tools/generators/gen_aircraft.ml
+1
View File
@@ -321,6 +321,7 @@ let () =
let aircraft_conf_dir = aircraft_dir // "conf" in
mkdir (Env.paparazzi_home // "var");
mkdir (Env.paparazzi_home // "var" // "aircrafts");
mkdir aircraft_dir;
mkdir (aircraft_dir // "fbw");
mkdir (aircraft_dir // "autopilot");