From 38e0c497ade98e9d5467304a302d2d2de5ec3ed7 Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Sun, 29 Mar 2015 19:09:57 +0200 Subject: [PATCH] [telemetry] make sure to initialize callbacks with NULL --- sw/airborne/subsystems/datalink/telemetry.c | 2 +- sw/tools/generators/gen_periodic.ml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sw/airborne/subsystems/datalink/telemetry.c b/sw/airborne/subsystems/datalink/telemetry.c index 7be0c96455..115ffa4ba6 100644 --- a/sw/airborne/subsystems/datalink/telemetry.c +++ b/sw/airborne/subsystems/datalink/telemetry.c @@ -33,7 +33,7 @@ /* Implement global structures from generated header */ telemetry_msg telemetry_msgs[TELEMETRY_NB_MSG] = TELEMETRY_MSG_NAMES; -telemetry_cb telemetry_cbs[TELEMETRY_NB_MSG]; +telemetry_cb telemetry_cbs[TELEMETRY_NB_MSG] = TELEMETRY_CBS_NULL; struct periodic_telemetry pprz_telemetry = { TELEMETRY_NB_MSG, telemetry_msgs, telemetry_cbs }; diff --git a/sw/tools/generators/gen_periodic.ml b/sw/tools/generators/gen_periodic.ml index f53bd229b8..74199daa8a 100644 --- a/sw/tools/generators/gen_periodic.ml +++ b/sw/tools/generators/gen_periodic.ml @@ -153,6 +153,9 @@ let print_message_table = fun out_h xml -> (* Structure initialization *) fprintf out_h "#define TELEMETRY_MSG_NAMES { \\\n"; Hashtbl.iter (fun n _ -> fprintf out_h " \"%s\", \\\n" n) messages; + fprintf out_h "};\n\n"; + fprintf out_h "#define TELEMETRY_CBS_NULL { \\\n"; + for i = 1 to (Hashtbl.length messages) do fprintf out_h " NULL, \\\n" done; fprintf out_h "};\n\n" let print_process_send = fun out_h xml freq modules ->