diff --git a/sw/tools/gen_flight_plan.ml b/sw/tools/gen_flight_plan.ml
index cdcdad33ac..972704966b 100644
--- a/sw/tools/gen_flight_plan.ml
+++ b/sw/tools/gen_flight_plan.ml
@@ -794,6 +794,15 @@ let () =
       Xml2h.define "HOME_MODE_HEIGHT" (sof home_mode_height);
       Xml2h.define "MAX_DIST_FROM_HOME" (sof mdfh);
 
+      (** Print defines for blocks **)
+      lprintf "\n";
+      let idx = ref 0 in
+      List.iter
+        (fun s ->
+        let v = ExtXml.attrib s "name" in
+        lprintf "#define BLOCK_%s %d\n" (Str.global_replace (Str.regexp "[\\. ]") "_" v) !idx; incr idx) blocks;
+        lprintf "\n";
+
       let index_of_waypoints =
         let i = ref (-1) in
         List.map (fun w -> incr i; (name_of w, !i)) waypoints in
diff --git a/sw/tools/gen_settings.ml b/sw/tools/gen_settings.ml
index 32313bd37a..087d477f22 100644
--- a/sw/tools/gen_settings.ml
+++ b/sw/tools/gen_settings.ml
@@ -68,6 +68,16 @@ let print_dl_settings = fun settings ->
   lprintf "#include \"generated/periodic_telemetry.h\"\n";
   lprintf "\n";
 
+  (** Datalink knowing what settings mean **)
+  let idx = ref 0 in
+	lprintf "\n";
+  List.iter
+    (fun s ->
+      let v = ExtXml.attrib s "var" in
+      lprintf "#define SETTINGS_%s %d\n" (Str.global_replace (Str.regexp "\\.") "_" v) !idx; incr idx)
+    settings;
+  lprintf "\n";
+
   (** Macro to call to set one variable *)
   lprintf "#define DlSetting(_idx, _value) { \\\n";
   right ();