[paparazzi-commits] [4640] generate defines for ppm channels to make nps work with all RCs

[Felix Ruess]

Revision: 4640
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4640
Author:   flixr
Date:     2010-03-06 01:08:50 +0000 (Sat, 06 Mar 2010)
Log Message:
-----------
generate defines for ppm channels to make nps work with all RCs

Modified Paths:
--------------
    
paparazzi3/trunk/sw/airborne/booz/arch/sim/radio_control/booz_radio_control_ppm_arch.c
    paparazzi3/trunk/sw/tools/gen_conf_radio_control_ppm.ml

Modified: 
paparazzi3/trunk/sw/airborne/booz/arch/sim/radio_control/booz_radio_control_ppm_arch.c
===================================================================
--- 
paparazzi3/trunk/sw/airborne/booz/arch/sim/radio_control/booz_radio_control_ppm_arch.c
      2010-03-05 23:22:18 UTC (rev 4639)
+++ 
paparazzi3/trunk/sw/airborne/booz/arch/sim/radio_control/booz_radio_control_ppm_arch.c
      2010-03-06 01:08:50 UTC (rev 4640)
@@ -33,11 +33,26 @@
   ((_nps) >= 0 ? (_neutral) + (_nps) * ((_max)-(_neutral)) : (_neutral) + 
(_nps) * ((_neutral)- (_min)))
 
 void booz_radio_control_feed(void) {
-  booz_radio_control_ppm_pulses[RADIO_CONTROL_ROLL]     = 
PPM_OF_NPS(nps_radio_control.roll,     1500, 950,  2050);
-  booz_radio_control_ppm_pulses[RADIO_CONTROL_PITCH]    = 
PPM_OF_NPS(nps_radio_control.pitch,    1500, 2050,  950);
-  booz_radio_control_ppm_pulses[RADIO_CONTROL_YAW]      = 
PPM_OF_NPS(nps_radio_control.yaw,      1500, 2050,  950);
-  booz_radio_control_ppm_pulses[RADIO_CONTROL_THROTTLE] = 
PPM_OF_NPS(nps_radio_control.throttle, 1223, 1223, 2050);
-  booz_radio_control_ppm_pulses[RADIO_CONTROL_MODE]     = 
PPM_OF_NPS(nps_radio_control.mode,     1500, 2050,  940);
+  booz_radio_control_ppm_pulses[RADIO_CONTROL_ROLL]     = 
PPM_OF_NPS(nps_radio_control.roll, \
+                                                                     
RADIO_CONTROL_ROLL_NEUTRAL, \
+                                                                     
RADIO_CONTROL_ROLL_MIN, \
+                                                                     
RADIO_CONTROL_ROLL_MAX);
+  booz_radio_control_ppm_pulses[RADIO_CONTROL_PITCH]    = 
PPM_OF_NPS(nps_radio_control.pitch, \
+                                                                     
RADIO_CONTROL_PITCH_NEUTRAL, \
+                                                                     
RADIO_CONTROL_PITCH_MIN, \
+                                                                     
RADIO_CONTROL_PITCH_MAX);
+  booz_radio_control_ppm_pulses[RADIO_CONTROL_YAW]      = 
PPM_OF_NPS(nps_radio_control.yaw, \
+                                                                     
RADIO_CONTROL_YAW_NEUTRAL, \
+                                                                     
RADIO_CONTROL_YAW_MIN, \
+                                                                     
RADIO_CONTROL_YAW_MAX);
+  booz_radio_control_ppm_pulses[RADIO_CONTROL_THROTTLE] = 
PPM_OF_NPS(nps_radio_control.throttle, \
+                                                                     
RADIO_CONTROL_THROTTLE_NEUTRAL, \
+                                                                     
RADIO_CONTROL_THROTTLE_MIN, \
+                                                                     
RADIO_CONTROL_THROTTLE_MAX);
+  booz_radio_control_ppm_pulses[RADIO_CONTROL_MODE]     = 
PPM_OF_NPS(nps_radio_control.mode, \
+                                                                     
RADIO_CONTROL_MODE_NEUTRAL, \
+                                                                     
RADIO_CONTROL_MODE_MIN, \
+                                                                     
RADIO_CONTROL_MODE_MAX);
   booz_radio_control_ppm_frame_available = TRUE;
 }
 

Modified: paparazzi3/trunk/sw/tools/gen_conf_radio_control_ppm.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_conf_radio_control_ppm.ml     2010-03-05 
23:22:18 UTC (rev 4639)
+++ paparazzi3/trunk/sw/tools/gen_conf_radio_control_ppm.ml     2010-03-06 
01:08:50 UTC (rev 4640)
@@ -131,7 +131,18 @@
   
   let channels_params = List.map parse_channel channels in 
   nl ();
-  
+
+  List.iter
+    (fun c ->
+      begin
+        printf "#define RADIO_CONTROL_%s_NEUTRAL %d\n" c.name c.neutral;
+        printf "#define RADIO_CONTROL_%s_MIN %d\n" c.name c.min;
+        printf "#define RADIO_CONTROL_%s_MAX %d\n" c.name c.max;
+      end
+    )
+    channels_params;
+  nl();
+
   let ppm_pulse_type = ExtXml.attrib xml "pulse_type" in
   let ppm_data_min = ExtXml.attrib xml "data_min" in
   let ppm_data_max = ExtXml.attrib xml "data_max" in