[paparazzi-commits] [5284] Another try at fixing multiple defines -- Without breaking fixed wing

[Allen Ibara]

Revision: 5284
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5284
Author:   aibara
Date:     2010-08-09 20:04:47 +0000 (Mon, 09 Aug 2010)
Log Message:
-----------
Another try at fixing multiple defines -- Without breaking fixed wing
Originally 7c7d0ec0d81510da2e00e4b3859d62b588b1c0f1, r5238, recently reverted 
via r5262 and 2eb43fd6d8df6306c98b84c3bbfb9554edd4e4c4

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/ap_downlink.h
    paparazzi3/trunk/sw/tools/gen_periodic.ml

Modified: paparazzi3/trunk/sw/airborne/ap_downlink.h
===================================================================
--- paparazzi3/trunk/sw/airborne/ap_downlink.h  2010-08-09 19:36:48 UTC (rev 
5283)
+++ paparazzi3/trunk/sw/airborne/ap_downlink.h  2010-08-09 20:04:47 UTC (rev 
5284)
@@ -65,7 +65,7 @@
 
 #define PERIODIC_SEND_DOWNLINK(_chan) { \
   static uint16_t last; \
-  uint16_t rate = (downlink_nb_bytes - last) / 
PERIOD_DOWNLINK_DefaultChannel_0; \
+  uint16_t rate = (downlink_nb_bytes - last) / 
PERIOD_DOWNLINK_Ap_DefaultChannel_0; \
   last = downlink_nb_bytes; \
   DOWNLINK_SEND_DOWNLINK(_chan, &downlink_nb_ovrn, &rate, &downlink_nb_msgs); \
 }

Modified: paparazzi3/trunk/sw/tools/gen_periodic.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_periodic.ml   2010-08-09 19:36:48 UTC (rev 
5283)
+++ paparazzi3/trunk/sw/tools/gen_periodic.ml   2010-08-09 20:04:47 UTC (rev 
5284)
@@ -144,7 +144,7 @@
          (fun x -> 
            let p = ExtXml.attrib x "period"
            and n = ExtXml.attrib x "name" in
-           Xml2h.define (sprintf "PERIOD_%s_%s_%d" n channel_name !i) (sprintf 
"(%s)" p))
+           Xml2h.define (sprintf "PERIOD_%s_%s_%s_%d" n process_name 
channel_name !i) (sprintf "(%s)" p))
          (Xml.children mode);
        incr i)
        modes;