[paparazzi-commits] [6188] Move _hw.c to arch/modules/sensors

[Martin Mueller]

Revision: 6188
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6188
Author:   mmm
Date:     2010-10-20 19:04:11 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
Move _hw.c to arch/modules/sensors

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.c
    paparazzi3/trunk/sw/airborne/modules/sensors/trigger_ext.c

Added Paths:
-----------
    paparazzi3/trunk/sw/airborne/arch/lpc21/modules/
    paparazzi3/trunk/sw/airborne/arch/lpc21/modules/sensors/
    paparazzi3/trunk/sw/airborne/arch/lpc21/modules/sensors/trig_ext_hw.c
    paparazzi3/trunk/sw/airborne/arch/lpc21/modules/sensors/trig_ext_hw.h

Removed Paths:
-------------
    paparazzi3/trunk/sw/airborne/arch/lpc21/trig_ext_hw.c
    paparazzi3/trunk/sw/airborne/arch/lpc21/trig_ext_hw.h

Copied: paparazzi3/trunk/sw/airborne/arch/lpc21/modules/sensors/trig_ext_hw.c 
(from rev 6185, paparazzi3/trunk/sw/airborne/arch/lpc21/trig_ext_hw.c)
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/lpc21/modules/sensors/trig_ext_hw.c       
                        (rev 0)
+++ paparazzi3/trunk/sw/airborne/arch/lpc21/modules/sensors/trig_ext_hw.c       
2010-10-20 19:04:11 UTC (rev 6188)
@@ -0,0 +1,38 @@
+
+#include "std.h"
+#include "sys_time_hw.h"
+#include "LPC21xx.h"
+#include "trig_ext_hw.h"
+#include BOARD_CONFIG
+
+uint32_t trigger_t0;
+uint32_t delta_t0;
+volatile bool_t trig_ext_valid;
+
+
+void TRIG_ISR() {
+  static uint32_t last;
+  uint32_t delta_t0_temp;
+  trigger_t0 = PPM_CR;
+  delta_t0_temp = trigger_t0 - last;
+  if (MSEC_OF_SYS_TICS(delta_t0_temp) > 10) {
+    delta_t0 = delta_t0_temp;
+    last = trigger_t0;
+    trig_ext_valid = TRUE;
+  }
+}
+
+void trig_ext_init ( void ) {
+  /* select pin for capture */
+  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;
+#else
+#error "trig_ext_hw.h: Unknown PULSE_TYPE"
+#endif
+  trig_ext_valid = FALSE;
+}
+

Copied: paparazzi3/trunk/sw/airborne/arch/lpc21/modules/sensors/trig_ext_hw.h 
(from rev 6185, paparazzi3/trunk/sw/airborne/arch/lpc21/trig_ext_hw.h)
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/lpc21/modules/sensors/trig_ext_hw.h       
                        (rev 0)
+++ paparazzi3/trunk/sw/airborne/arch/lpc21/modules/sensors/trig_ext_hw.h       
2010-10-20 19:04:11 UTC (rev 6188)
@@ -0,0 +1,20 @@
+#ifndef TRIG_EXT_HW_H
+#define TRIG_EXT_HW_H
+
+#include "std.h"
+
+/**
+ *  falling/rising edge
+ */
+#define TRIG_EXT_EDGE_RISING 1
+#define TRIG_EXT_EDGE_FALLING 0
+
+extern uint32_t trigger_t0;
+extern uint32_t delta_t0;
+extern volatile bool_t trig_ext_valid;
+
+void TRIG_ISR(void);
+void trig_ext_init( void );
+
+#endif /* TRIG_EXT_HW_H */
+

Modified: paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.c
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.c       2010-10-20 
11:48:18 UTC (rev 6187)
+++ paparazzi3/trunk/sw/airborne/arch/lpc21/sys_time_hw.c       2010-10-20 
19:04:11 UTC (rev 6188)
@@ -53,7 +53,7 @@
 #endif
 
 #ifdef TRIGGER_EXT
-#include "trig_ext_hw.h"
+#include "modules/sensors/trig_ext_hw.h"
 #endif
 
 #define TIMER0_IT_MASK (ACTUATORS_IT         |\

Deleted: paparazzi3/trunk/sw/airborne/arch/lpc21/trig_ext_hw.c
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/lpc21/trig_ext_hw.c       2010-10-20 
11:48:18 UTC (rev 6187)
+++ paparazzi3/trunk/sw/airborne/arch/lpc21/trig_ext_hw.c       2010-10-20 
19:04:11 UTC (rev 6188)
@@ -1,33 +0,0 @@
-
-#include "std.h"
-#include "LPC21xx.h"
-#include "trig_ext_hw.h"
-#include BOARD_CONFIG
-
-uint32_t trigger_t0;
-uint32_t delta_t0;
-volatile bool_t trig_ext_valid;
-
-
-void TRIG_ISR() {
-  static uint32_t last;
-  trigger_t0 = PPM_CR;
-  delta_t0 = trigger_t0 - last;
-  last = trigger_t0;
-  trig_ext_valid = TRUE;
-}
-
-void trig_ext_init ( void ) {
-  /* select pin for capture */
-  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;
-#else
-#error "trig_ext_hw.h: Unknown PULSE_TYPE"
-#endif
-  trig_ext_valid = FALSE;
-}
-

Deleted: paparazzi3/trunk/sw/airborne/arch/lpc21/trig_ext_hw.h
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/lpc21/trig_ext_hw.h       2010-10-20 
11:48:18 UTC (rev 6187)
+++ paparazzi3/trunk/sw/airborne/arch/lpc21/trig_ext_hw.h       2010-10-20 
19:04:11 UTC (rev 6188)
@@ -1,20 +0,0 @@
-#ifndef TRIG_EXT_HW_H
-#define TRIG_EXT_HW_H
-
-#include "std.h"
-
-/**
- *  falling/rising edge
- */
-#define TRIG_EXT_EDGE_RISING 1
-#define TRIG_EXT_EDGE_FALLING 0
-
-extern uint32_t trigger_t0;
-extern uint32_t delta_t0;
-extern volatile bool_t trig_ext_valid;
-
-void TRIG_ISR(void);
-void trig_ext_init( void );
-
-#endif /* TRIG_EXT_HW_H */
-

Modified: paparazzi3/trunk/sw/airborne/modules/sensors/trigger_ext.c
===================================================================
--- paparazzi3/trunk/sw/airborne/modules/sensors/trigger_ext.c  2010-10-20 
11:48:18 UTC (rev 6187)
+++ paparazzi3/trunk/sw/airborne/modules/sensors/trigger_ext.c  2010-10-20 
19:04:11 UTC (rev 6188)
@@ -31,7 +31,7 @@
 
 
 #include "trigger_ext.h"
-#include "trig_ext_hw.h"
+#include "modules/sensors/trig_ext_hw.h"
 #include "gps.h"
 #include "sys_time.h"
 #include "uart.h"