[paparazzi-commits] [4961] changed triggering for positive PPM signals to rising flank and to falling flank for negative pulse type .

[Felix Ruess]

Revision: 4961
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4961
Author:   flixr
Date:     2010-06-14 21:14:04 +0000 (Mon, 14 Jun 2010)
Log Message:
-----------
changed triggering for positive PPM signals to rising flank and to falling 
flank for negative pulse type. WARNING opposite as before.

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/arm7/ppm_hw.h
    paparazzi3/trunk/sw/airborne/arm7/trig_ext_hw.h
    
paparazzi3/trunk/sw/airborne/booz/arch/lpc21/radio_control/booz_radio_control_ppm_arch.c

Modified: paparazzi3/trunk/sw/airborne/arm7/ppm_hw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/arm7/ppm_hw.h  2010-06-14 17:07:06 UTC (rev 
4960)
+++ paparazzi3/trunk/sw/airborne/arm7/ppm_hw.h  2010-06-14 21:14:04 UTC (rev 
4961)
@@ -19,9 +19,9 @@
   PPM_PINSEL |= PPM_PINSEL_VAL << PPM_PINSEL_BIT;
   /* enable capture 0.2 on falling or rising edge + trigger interrupt */
 #if defined PPM_PULSE_TYPE && PPM_PULSE_TYPE == PPM_PULSE_TYPE_POSITIVE
+  T0CCR = PPM_CCR_CRR | PPM_CCR_CRI;
+#elif defined PPM_PULSE_TYPE && PPM_PULSE_TYPE == PPM_PULSE_TYPE_NEGATIVE
   T0CCR = PPM_CCR_CRF | PPM_CCR_CRI;
-#elif defined PPM_PULSE_TYPE && PPM_PULSE_TYPE == PPM_PULSE_TYPE_NEGATIVE
-  T0CCR = PPM_CCR_CRR | PPM_CCR_CRI;
 #else
 #error "ppm_hw.h: Unknown PM_PULSE_TYPE"
 #endif

Modified: paparazzi3/trunk/sw/airborne/arm7/trig_ext_hw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/arm7/trig_ext_hw.h     2010-06-14 17:07:06 UTC 
(rev 4960)
+++ paparazzi3/trunk/sw/airborne/arm7/trig_ext_hw.h     2010-06-14 21:14:04 UTC 
(rev 4961)
@@ -19,9 +19,9 @@
   PPM_PINSEL |= PPM_PINSEL_VAL << PPM_PINSEL_BIT;
   /* enable capture 0.2 on falling or rising edge + trigger interrupt */
 #if defined TRIG_EXT_PULSE_TYPE && TRIG_EXT_PULSE_TYPE == 
TRIG_EXT_PULSE_TYPE_RISING
+  T0CCR = PPM_CCR_CRR | PPM_CCR_CRI;
+#elif defined TRIG_EXT_PULSE_TYPE && TRIG_EXT_PULSE_TYPE == 
TRIG_EXT_PULSE_TYPE_FALLING
   T0CCR = PPM_CCR_CRF | PPM_CCR_CRI;
-#elif defined TRIG_EXT_PULSE_TYPE && TRIG_EXT_PULSE_TYPE == 
TRIG_EXT_PULSE_TYPE_FALLING
-  T0CCR = PPM_CCR_CRR | PPM_CCR_CRI;
 #else
 #error "trig_ext_hw.h: Unknown PULSE_TYPE"
 #endif

Modified: 
paparazzi3/trunk/sw/airborne/booz/arch/lpc21/radio_control/booz_radio_control_ppm_arch.c
===================================================================
--- 
paparazzi3/trunk/sw/airborne/booz/arch/lpc21/radio_control/booz_radio_control_ppm_arch.c
    2010-06-14 17:07:06 UTC (rev 4960)
+++ 
paparazzi3/trunk/sw/airborne/booz/arch/lpc21/radio_control/booz_radio_control_ppm_arch.c
    2010-06-14 21:14:04 UTC (rev 4961)
@@ -31,9 +31,9 @@
   PPM_PINSEL |= PPM_PINSEL_VAL << PPM_PINSEL_BIT;
   /* enable capture 0.2 on falling or rising edge + trigger interrupt */
 #if defined PPM_PULSE_TYPE && PPM_PULSE_TYPE == PPM_PULSE_TYPE_POSITIVE
+  T0CCR = PPM_CCR_CRR | PPM_CCR_CRI;
+#elif defined PPM_PULSE_TYPE && PPM_PULSE_TYPE == PPM_PULSE_TYPE_NEGATIVE
   T0CCR = PPM_CCR_CRF | PPM_CCR_CRI;
-#elif defined PPM_PULSE_TYPE && PPM_PULSE_TYPE == PPM_PULSE_TYPE_NEGATIVE
-  T0CCR = PPM_CCR_CRR | PPM_CCR_CRI;
 #else
 #error "ppm_hw.h: Unknown PM_PULSE_TYPE"
 #endif