diff --git a/sw/ground_segment/cockpit/compass.ml b/sw/ground_segment/cockpit/compass.ml index 7dc2686c46..415bcd6b4e 100644 --- a/sw/ground_segment/cockpit/compass.ml +++ b/sw/ground_segment/cockpit/compass.ml @@ -115,7 +115,7 @@ let draw = fun (da_object:Gtk_tools.pixmap_in_drawin_area) desired_course course let _ = let ivy_bus = Defivybus.default_ivy_bus in Arg.parse - [ "-b", Arg.String (fun x -> ivy_bus := x), "Bus\tDefault is 127.255.255.255:2010"] + [ "-b", Arg.String (fun x -> ivy_bus := x), (sprintf " Default is %s" !ivy_bus)] (fun x -> prerr_endline ("WARNING: don't do anything with "^x)) "Usage: "; diff --git a/sw/ground_segment/cockpit/gcs.ml b/sw/ground_segment/cockpit/gcs.ml index aabd0e8a4f..22a147a0f4 100644 --- a/sw/ground_segment/cockpit/gcs.ml +++ b/sw/ground_segment/cockpit/gcs.ml @@ -320,7 +320,7 @@ let keys_help = fun () -> (***************** MAIN ******************************************************) -let ivy_bus = Defivybus.default_ivy_bus +let ivy_bus = ref Defivybus.default_ivy_bus and geo_ref = ref "" and map_files = ref [] and center = ref "" @@ -340,7 +340,7 @@ and srtm = ref false let options = [ "-auto_ortho", Arg.Set auto_ortho, "IGN tiles path"; - "-b", Arg.String (fun x -> ivy_bus := x), "Bus\tDefault is 127.255.255.25:2010"; + "-b", Arg.String (fun x -> ivy_bus := x),(sprintf " Default is %s" !ivy_bus); "-center", Arg.Set_string center, "Initial map center (e.g. 'WGS84 43.605 1.443')"; "-center_ac", Arg.Set auto_center_new_ac, "Centers the map on any new A/C"; "-edit", Arg.Unit (fun () -> edit := true; layout_file := "editor.xml"), "Flight plan editor"; diff --git a/sw/ground_segment/joystick/input2ivy.ml b/sw/ground_segment/joystick/input2ivy.ml index f09926670d..926a5dc729 100644 --- a/sw/ground_segment/joystick/input2ivy.ml +++ b/sw/ground_segment/joystick/input2ivy.ml @@ -321,7 +321,7 @@ let ivy_bus = Defivybus.default_ivy_bus in let anon_fun = (fun x -> xml_descr := x) in let speclist = - [ "-b", Arg.String (fun x -> ivy_bus := x), "Bus\tDefault is 127.255.255.255:2010"; + [ "-b", Arg.String (fun x -> ivy_bus := x),(sprintf " Default is %s" !ivy_bus); "-ac", Arg.Set_string ac_name, ""; "-d", Arg.Set_string device_name, ""; "-v", Arg.Set verbose, "Verbose mode (useful to identify the channels of an input device)"; diff --git a/sw/ground_segment/tmtc/broadcaster.ml b/sw/ground_segment/tmtc/broadcaster.ml index 52a0f9bb35..720c1f636c 100644 --- a/sw/ground_segment/tmtc/broadcaster.ml +++ b/sw/ground_segment/tmtc/broadcaster.ml @@ -1,7 +1,7 @@ open Printf let () = - let ivy_bus = Defivybus.default_ivy_bus in + let ivy_bus = ref Defivybus.default_ivy_bus in let port = ref 4242 and ivy_from = ref "DL" diff --git a/sw/ground_segment/tmtc/dia.ml b/sw/ground_segment/tmtc/dia.ml index 9935f2843b..691e7dd189 100644 --- a/sw/ground_segment/tmtc/dia.ml +++ b/sw/ground_segment/tmtc/dia.ml @@ -89,7 +89,7 @@ let fp_msg = fun _sender vs -> let _ = - let ivy_bus = Defivybus.default_ivy_bus + let ivy_bus = ref Defivybus.default_ivy_bus and port = ref "/dev/dsp" in let options = [ "-b", Arg.Set_string ivy_bus, (sprintf " Default is %s" !ivy_bus); diff --git a/sw/ground_segment/tmtc/ivy2udp.ml b/sw/ground_segment/tmtc/ivy2udp.ml index 18827d2dc0..e54b41a663 100644 --- a/sw/ground_segment/tmtc/ivy2udp.ml +++ b/sw/ground_segment/tmtc/ivy2udp.ml @@ -33,7 +33,7 @@ module PprzTransport = Serial.Transport(Pprz.Transport) open Printf let () = - let ivy_bus = Defivybus.default_ivy_bus in + let ivy_bus = ref Defivybus.default_ivy_bus in let host = ref "85.214.48.162" and port = ref 4242 and datalink_port = ref 4243 diff --git a/sw/ground_segment/tmtc/ivy_tcp_aircraft.ml b/sw/ground_segment/tmtc/ivy_tcp_aircraft.ml index bdd36b7d66..083902273b 100644 --- a/sw/ground_segment/tmtc/ivy_tcp_aircraft.ml +++ b/sw/ground_segment/tmtc/ivy_tcp_aircraft.ml @@ -5,7 +5,7 @@ module PprzTransport = Serial.Transport(Pprz.Transport) open Printf let () = - let ivy_bus = Defivybus.default_ivy_bus in + let ivy_bus = ref Defivybus.default_ivy_bus in let host = ref "10.31.1.98" and port = ref 4242 and id = ref "6" in diff --git a/sw/ground_segment/tmtc/ivy_tcp_controller.ml b/sw/ground_segment/tmtc/ivy_tcp_controller.ml index dec80f078c..9b346beaea 100644 --- a/sw/ground_segment/tmtc/ivy_tcp_controller.ml +++ b/sw/ground_segment/tmtc/ivy_tcp_controller.ml @@ -6,7 +6,7 @@ module PprzTransport = Serial.Transport(Pprz.Transport) let () = let host = ref "10.31.1.98" - and ivy_bus = Defivybus.default_ivy_bus in + and ivy_bus = ref Defivybus.default_ivy_bus in let port = ref 4243 in let options = [ diff --git a/sw/ground_segment/tmtc/messages.ml b/sw/ground_segment/tmtc/messages.ml index e691955cea..8d657693db 100644 --- a/sw/ground_segment/tmtc/messages.ml +++ b/sw/ground_segment/tmtc/messages.ml @@ -187,10 +187,10 @@ let rec one_class = fun (notebook:GPack.notebook) (ident, xml_class, sender) -> (*********************** Main ************************************************) let _ = - let ivy_bus = Defivybus.default_ivy_bus in + let ivy_bus = ref Defivybus.default_ivy_bus in let classes = ref ["telemetry:*"] in Arg.parse - [ "-b", Arg.String (fun x -> ivy_bus := x), "Bus\tDefault is 127.255.255.255:2010"; + [ "-b", Arg.String (fun x -> ivy_bus := x), (sprintf " Default is %s" !ivy_bus); "-c", Arg.String (fun x -> classes := x :: !classes), "class name"] (fun x -> prerr_endline ("WARNING: don't do anything with "^x)) "Usage: "; diff --git a/sw/ground_segment/tmtc/server.ml b/sw/ground_segment/tmtc/server.ml index b05b090018..072af69d2a 100644 --- a/sw/ground_segment/tmtc/server.ml +++ b/sw/ground_segment/tmtc/server.ml @@ -666,7 +666,7 @@ let ground_to_uplink = fun logging -> (* main loop *) let () = - let ivy_bus = Defivybus.default_ivy_bus + let ivy_bus = ref Defivybus.default_ivy_bus and logging = ref true and http = ref false in diff --git a/sw/ground_segment/tmtc/settings.ml b/sw/ground_segment/tmtc/settings.ml index 6fc1c22db3..f7725daa01 100644 --- a/sw/ground_segment/tmtc/settings.ml +++ b/sw/ground_segment/tmtc/settings.ml @@ -23,6 +23,7 @@ * Boston, MA 02111-1307, USA. * *) +open Printf module Ground_Pprz = Pprz.Messages(struct let name = "ground" end) module Tele_Pprz = Pprz.Messages(struct let name = "telemetry" end) @@ -79,10 +80,10 @@ let one_ac = fun (notebook:GPack.notebook) ac_name -> let _ = - let ivy_bus = Defivybus.default_ivy_bus in + let ivy_bus = ref Defivybus.default_ivy_bus in let acs = ref [] in Arg.parse - [ "-b", Arg.String (fun x -> ivy_bus := x), "Bus\tDefault is 127.255.255.255:2010"; + [ "-b", Arg.String (fun x -> ivy_bus := x), (sprintf " Default is %s" !ivy_bus); "-ac", Arg.String (fun x -> acs := x :: !acs), "A/C name"] (fun x -> prerr_endline ("WARNING: don't do anything with "^x)) "Usage: "; diff --git a/sw/ground_segment/visu3d/mapGL.ml b/sw/ground_segment/visu3d/mapGL.ml index 903202131f..4ecfd04286 100644 --- a/sw/ground_segment/visu3d/mapGL.ml +++ b/sw/ground_segment/visu3d/mapGL.ml @@ -515,7 +515,7 @@ let _ = map_file = ref "" and mission_file = ref "" in let options = - [ "-b", Arg.String (fun x -> ivy_bus := x), "Bus\tDefault is 127.255.255.25:2010"; + [ "-b", Arg.String (fun x -> ivy_bus := x), (sprintf " Default is %s" !ivy_bus); "-m", Arg.String (fun x -> map_file := x), "Map description file"; "-f", Arg.String (fun x -> mission_file := x), "Mission description file"] in Arg.parse (options) diff --git a/sw/lib/ocaml/defivybus.ml b/sw/lib/ocaml/defivybus.ml index 451d90425d..214bc3c3c5 100644 --- a/sw/lib/ocaml/defivybus.ml +++ b/sw/lib/ocaml/defivybus.ml @@ -18,8 +18,8 @@ let contains s substring = with Not_found -> false let default_ivy_bus = - try ref (Sys.getenv "IVY_BUS" ) - with Not_found -> ref + try (Sys.getenv "IVY_BUS" ) + with Not_found -> (if contains (read_process_output "uname") "Darwin" then "224.255.255.255:2010" else diff --git a/sw/lib/ocaml/defivybus.mli b/sw/lib/ocaml/defivybus.mli new file mode 100644 index 0000000000..36578f90c5 --- /dev/null +++ b/sw/lib/ocaml/defivybus.mli @@ -0,0 +1 @@ +val default_ivy_bus : string \ No newline at end of file diff --git a/sw/logalizer/play_core.ml b/sw/logalizer/play_core.ml index 7ff6f99e9a..132e42c1ae 100644 --- a/sw/logalizer/play_core.ml +++ b/sw/logalizer/play_core.ml @@ -119,7 +119,7 @@ let load_log = fun xml_file -> let timer = ref None let was_running = ref false -let bus = Defivybus.default_ivy_bus +let bus = ref Defivybus.default_ivy_bus let port = ref "/dev/ttyUSB0" let baudrate = ref "9600" let file_to_load = ref "" @@ -174,7 +174,7 @@ let play = fun ?(no_gui=false) serial_port adj speed -> let init = fun () -> Arg.parse - [ "-b", Arg.String (fun x -> bus := x), "Bus\tDefault is 127.255.255.25:2010"; + [ "-b", Arg.String (fun x -> bus := x), (sprintf " Default is %s" !bus); "-d", Arg.Set_string port, (sprintf " Default is %s" !port); "-o", Arg.Set output_on_serial, "Output binary messages on serial port"; "-s", Arg.Set_string baudrate, (sprintf " Default is %s" !baudrate)] diff --git a/sw/logalizer/plotter.ml b/sw/logalizer/plotter.ml index e85065ccc0..ab796a1405 100644 --- a/sw/logalizer/plotter.ml +++ b/sw/logalizer/plotter.ml @@ -522,7 +522,7 @@ let rec plot_window = fun window -> let _ = - let ivy_bus = Defivybus.default_ivy_bus + let ivy_bus = ref Defivybus.default_ivy_bus and init = ref [default_window] in let add_init = fun s -> @@ -541,7 +541,7 @@ let _ = | x::xs -> init := {x with geometry = s} :: xs in Arg.parse - [ "-b", Arg.String (fun x -> ivy_bus := x), " Bus\tDefault is 127.255.255.255:2010"; + [ "-b", Arg.String (fun x -> ivy_bus := x), (sprintf " Default is %s" !ivy_bus); "-c", Arg.String (fun x -> add_init x), " Add a curve (e.g. '*:telemetry:BAT:voltage'). The curve is inserted into the last open window (cf -n option)"; (* no code yet *) diff --git a/sw/simulator/.DS_Store b/sw/simulator/.DS_Store new file mode 100644 index 0000000000..5760698f68 Binary files /dev/null and b/sw/simulator/.DS_Store differ diff --git a/sw/simulator/gaia.ml b/sw/simulator/gaia.ml index d63f2798ba..6ccc2b99a8 100644 --- a/sw/simulator/gaia.ml +++ b/sw/simulator/gaia.ml @@ -32,7 +32,7 @@ let sending_period = 5000 (* ms *) module Ground_Pprz = Pprz.Messages(struct let name = "ground" end) -let ivy_bus = Defivybus.default_ivy_bus +let ivy_bus = ref Defivybus.default_ivy_bus let parse_args = fun () -> let options = diff --git a/sw/simulator/sim.ml b/sw/simulator/sim.ml index b82338d164..06fb54418f 100644 --- a/sw/simulator/sim.ml +++ b/sw/simulator/sim.ml @@ -77,7 +77,7 @@ external fg_msg : string -> float -> float -> float -> float -> float -> float - let ac_name = ref "A/C not set" -let ivy_bus = Defivybus.default_ivy_bus +let ivy_bus = ref Defivybus.default_ivy_bus let fg_client = ref "" @@ -86,7 +86,7 @@ let autolaunch = ref false let noground = ref false let common_options = [ - "-b", Arg.Set_string ivy_bus, "Bus\tDefault is 127.255.255.25:2010"; + "-b", Arg.Set_string ivy_bus, (sprintf " Default is %s" !ivy_bus); "-boot", Arg.Set autoboot, "Boot the A/C on start"; "-launch", Arg.Set autolaunch, "Launch the A/C on start"; "-noground", Arg.Set noground, "Disable ground detection";