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

[tmtc] fix rx_lost_time in link

Browse Source 
still has some weird delay of ~2s until it starts counting rx_lost_time up..
This commit is contained in:
Felix Ruess
2014-12-19 15:31:58 +01:00
parent 4a39629a63
commit e47ce391fe
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ground_segment/tmtc/link.ml
+7 -2
View File
@@ -161,11 +161,10 @@ let send_status_msg =
and msg_rate = float (status.rx_msg - status.last_rx_msg) /. dt in and msg_rate = float (status.rx_msg - status.last_rx_msg) /. dt in
status.last_rx_msg <- status.rx_msg; status.last_rx_msg <- status.rx_msg;
status.last_rx_byte <- status.rx_byte; status.last_rx_byte <- status.rx_byte;
status.ms_since_last_msg <- status.ms_since_last_msg + status_msg_period;
let vs = ["ac_id", Pprz.Int ac_id; let vs = ["ac_id", Pprz.Int ac_id;
"link_id", Pprz.Int !link_id; "link_id", Pprz.Int !link_id;
"run_time", Pprz.Int t; "run_time", Pprz.Int t;
"rx_lost_time", Pprz.Int (1000 * status.ms_since_last_msg); "rx_lost_time", Pprz.Int (status.ms_since_last_msg / 1000);
"rx_bytes", Pprz.Int status.rx_byte; "rx_bytes", Pprz.Int status.rx_byte;
"rx_msgs", Pprz.Int status.rx_msg; "rx_msgs", Pprz.Int status.rx_msg;
"rx_err", Pprz.Int status.rx_err; "rx_err", Pprz.Int status.rx_err;
@@ -177,6 +176,11 @@ let send_status_msg =
send_ground_over_ivy "link" "LINK_REPORT" vs) send_ground_over_ivy "link" "LINK_REPORT" vs)
statuss statuss
let update_ms_since_last_msg =
fun () ->
Hashtbl.iter (fun ac_id status ->
status.ms_since_last_msg <- status.ms_since_last_msg + status_msg_period / 3)
statuss
let use_tele_message = fun ?udp_peername ?raw_data_size payload -> let use_tele_message = fun ?udp_peername ?raw_data_size payload ->
let raw_data_size = match raw_data_size with None -> String.length (Serial.string_of_payload payload) | Some d -> d in let raw_data_size = match raw_data_size with None -> String.length (Serial.string_of_payload payload) | Some d -> d in
@@ -546,6 +550,7 @@ let () =
(** Init and Periodic tasks *) (** Init and Periodic tasks *)
begin begin
ignore (Glib.Timeout.add status_msg_period (fun () -> send_status_msg (); true)); ignore (Glib.Timeout.add status_msg_period (fun () -> send_status_msg (); true));
ignore (Glib.Timeout.add (status_msg_period / 3) (fun () -> update_ms_since_last_msg (); true));
let start_ping = fun () -> let start_ping = fun () ->
ignore (Glib.Timeout.add ping_msg_period (fun () -> send_ping_msg device; true)); ignore (Glib.Timeout.add ping_msg_period (fun () -> send_ping_msg device; true));
false in false in