From 8ffd3dfcaf26a4df6388700a42674c65058e5836 Mon Sep 17 00:00:00 2001 From: Fabien-B Date: Mon, 16 Aug 2021 18:18:05 +0200 Subject: [PATCH] Replay settings (#2754) * [replay] remove legacy code. * [replay] Generate settings file. --- sw/ground_segment/tmtc/server.ml | 3 +-- sw/logalizer/play_core.ml | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sw/ground_segment/tmtc/server.ml b/sw/ground_segment/tmtc/server.ml index e834bb65dd..eb344d33b7 100644 --- a/sw/ground_segment/tmtc/server.ml +++ b/sw/ground_segment/tmtc/server.ml @@ -772,8 +772,7 @@ let send_config = fun http _asker args -> 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" // "aircrafts" // ac_name // - "settings.xml") else "file://replay" in + and settings = prefix ("var" // "aircrafts" // ac_name // "settings.xml") in let col = try Xml.attrib conf "gui_color" with _ -> new_color () in let ac_name = try Xml.attrib conf "name" with _ -> "" in [ "ac_id", PprzLink.String real_id; diff --git a/sw/logalizer/play_core.ml b/sw/logalizer/play_core.ml index 8192236ea4..69b44dea53 100644 --- a/sw/logalizer/play_core.ml +++ b/sw/logalizer/play_core.ml @@ -49,15 +49,13 @@ let store_conf = fun conf acs -> let ac_dir = replay_dir // "var" // "aircrafts" // ac_name in let w = fun s -> - (* Histotical: still useful ? *) - let f = replay_dir // "conf" // ExtXml.attrib x s in - write_xml f (ExtXml.child x s); - (* Write in the conf/ directory of the A/C *) let f = ac_dir // "conf" // ExtXml.attrib x s in write_xml f (ExtXml.child x s); f in ignore (w "airframe"); ignore (w "radio"); + let f_settings = ac_dir // "settings.xml" in + write_xml f_settings (ExtXml.child x "generated_settings"); (* test if flight plan is an original one or the dumped version *) let orig_fp = List.exists (fun e -> compare (Xml.tag e) "flight_plan" = 0) (Xml.children x) in if orig_fp then begin