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

[messages] replace brackets by pipe as array delimiter

Browse Source 
brackets can be used in settings' name, missed that :(
This commit is contained in:
Gautier Hattenberger
2014-03-26 16:53:26 +01:00
parent 8faa23d074
commit 7d0a1a7724
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/arch/sim/ivy_transport.h
+2 -2
View File
@@ -18,8 +18,8 @@ extern int ivy_dl_enabled;
#define Space() ivy_p += sprintf(ivy_p, " "); #define Space() ivy_p += sprintf(ivy_p, " ");
#define Comma() ivy_p += sprintf(ivy_p, ","); #define Comma() ivy_p += sprintf(ivy_p, ",");
#define DelimStart() ivy_p += sprintf(ivy_p, "["); #define DelimStart() ivy_p += sprintf(ivy_p, "|");
#define DelimEnd() ivy_p += sprintf(ivy_p, "]"); #define DelimEnd() ivy_p += sprintf(ivy_p, "|");
#define IvyTransportPutcByAddr(_dev,x) ivy_p += sprintf(ivy_p, "%c", *x); #define IvyTransportPutcByAddr(_dev,x) ivy_p += sprintf(ivy_p, "%c", *x);
#define IvyTransportPutCharByAddr(_dev,x) IvyTransportPutcByAddr(_dev,x) Space() #define IvyTransportPutCharByAddr(_dev,x) IvyTransportPutcByAddr(_dev,x) Space()
sw/ground_segment/tmtc/server.ml
+2 -2
View File
@@ -201,7 +201,7 @@ let send_dl_values = fun a ->
for i = 0 to a.nb_dl_setting_values - 1 do for i = 0 to a.nb_dl_setting_values - 1 do
csv := sprintf "%s%f," !csv a.dl_setting_values.(i) csv := sprintf "%s%f," !csv a.dl_setting_values.(i)
done; done;
let vs = ["ac_id", Pprz.String a.id; "values", Pprz.String ("["^ !csv ^"]")] in let vs = ["ac_id", Pprz.String a.id; "values", Pprz.String ("|"^ !csv ^"|")] in
Ground_Pprz.message_send my_id "DL_VALUES" vs Ground_Pprz.message_send my_id "DL_VALUES" vs
let send_svsinfo = fun a -> let send_svsinfo = fun a ->
@@ -223,7 +223,7 @@ let send_svsinfo = fun a ->
concat azim a.svinfo.(i).azim; concat azim a.svinfo.(i).azim;
concat age a.svinfo.(i).age concat age a.svinfo.(i).age
done; done;
let f = fun s r -> (s, Pprz.String ("["^ !r ^"]")) in let f = fun s r -> (s, Pprz.String ("|"^ !r ^"|")) in
let vs = ["ac_id", Pprz.String a.id; let vs = ["ac_id", Pprz.String a.id;
"pacc", Pprz.Int a.gps_Pacc; "pacc", Pprz.Int a.gps_Pacc;
f "svid" svid; f "flags" flags; f "qi" qi; f "msg_age" age; f "svid" svid; f "flags" flags; f "qi" qi; f "msg_age" age;
sw/lib/ocaml/pprz.ml
+4 -4
View File
@@ -160,7 +160,7 @@ let rec string_of_value = function
| Int64 x -> Int64.to_string x | Int64 x -> Int64.to_string x
| Char c -> String.make 1 c | Char c -> String.make 1 c
| String s -> s | String s -> s
| Array a -> "["^(String.concat separator (Array.to_list (Array.map string_of_value a)))^"]" | Array a -> "|"^(String.concat separator (Array.to_list (Array.map string_of_value a)))^"|"
let magic = fun x -> (Obj.magic x:('a,'b,'c) Pervasives.format) let magic = fun x -> (Obj.magic x:('a,'b,'c) Pervasives.format)
@@ -661,15 +661,15 @@ module MessagesOfXml(Class:CLASS_Xml) = struct
let space = Str.regexp "[ \t]+" let space = Str.regexp "[ \t]+"
let array_sep = Str.regexp "\\[\\|\\]" let array_sep = Str.regexp "|"
let values_of_string = fun s -> let values_of_string = fun s ->
(* split arguments and arrays *) (* split arguments and arrays *)
let array_split = Str.full_split array_sep s in let array_split = Str.full_split array_sep s in
let rec loop = fun fields -> let rec loop = fun fields ->
match fields with match fields with
| [] -> [] | [] -> []
| (Str.Delim "[")::((Str.Text l)::[Str.Delim "]"]) -> [l] | (Str.Delim "|")::((Str.Text l)::[Str.Delim "|"]) -> [l]
| (Str.Delim "[")::((Str.Text l)::((Str.Delim "]")::xs)) -> [l] @ (loop xs) | (Str.Delim "|")::((Str.Text l)::((Str.Delim "|")::xs)) -> [l] @ (loop xs)
| [Str.Text x] -> Str.split space x | [Str.Text x] -> Str.split space x
| (Str.Text x)::xs -> (Str.split space x) @ (loop xs) | (Str.Text x)::xs -> (Str.split space x) @ (loop xs)
| (Str.Delim _)::_ -> failwith "Pprz.values_of_string: incorrect array delimiter" | (Str.Delim _)::_ -> failwith "Pprz.values_of_string: incorrect array delimiter"