[paparazzi-commits] [5763] update enose module

[Gautier Hattenberger]

Revision: 5763
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5763
Author:   gautier
Date:     2010-08-31 13:26:22 +0000 (Tue, 31 Aug 2010)
Log Message:
-----------
update enose module

Modified Paths:
--------------
    paparazzi3/trunk/conf/modules/enose.xml
    paparazzi3/trunk/sw/airborne/modules/enose/enose.c

Added Paths:
-----------
    paparazzi3/trunk/sw/airborne/arch/sim/
    paparazzi3/trunk/sw/airborne/arch/sim/modules/
    paparazzi3/trunk/sw/airborne/arch/sim/modules/enose/
    paparazzi3/trunk/sw/airborne/arch/sim/modules/enose/sim_enose.c

Removed Paths:
-------------
    paparazzi3/trunk/sw/airborne/modules/enose/sim/

Modified: paparazzi3/trunk/conf/modules/enose.xml
===================================================================
--- paparazzi3/trunk/conf/modules/enose.xml     2010-08-31 13:23:01 UTC (rev 
5762)
+++ paparazzi3/trunk/conf/modules/enose.xml     2010-08-31 13:26:22 UTC (rev 
5763)
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="enose">
+<module name="enose" dir="enose">
   <header>
     <file name="enose.h"/>
     <file name="chemo_detect.h"/>
@@ -14,7 +14,8 @@
     <file name="chemo_detect.c"/>
   </makefile>
   <makefile target="sim">
-    <file name="$(SRC_ARCH)/sim_enose.c"/>
+    <!--file name="$(SRC_ARCH)/sim_enose.c"/-->
+    <file_hw name="sim_enose.c"/>
     <file name="chemo_detect.c"/>
   </makefile>
 </module>

Added: paparazzi3/trunk/sw/airborne/arch/sim/modules/enose/sim_enose.c
===================================================================
--- paparazzi3/trunk/sw/airborne/arch/sim/modules/enose/sim_enose.c             
                (rev 0)
+++ paparazzi3/trunk/sw/airborne/arch/sim/modules/enose/sim_enose.c     
2010-08-31 13:26:22 UTC (rev 5763)
@@ -0,0 +1,25 @@
+#include "enose/enose.h"
+
+uint8_t enose_status;
+uint8_t  enose_heat[ENOSE_NB_SENSOR];
+uint16_t enose_val[ENOSE_NB_SENSOR];
+uint16_t enose_PID_val;
+
+uint16_t nominal_val[ENOSE_NB_SENSOR] = {1500, 1500, 4000};
+uint16_t min_val[ENOSE_NB_SENSOR] = {1100, 1200, 2500};
+
+void enose_init( void ) {
+  int i;
+  for(i = 0; i < ENOSE_NB_SENSOR; i++) 
+    enose_val[i] = nominal_val[i];
+}
+void enose_set_heat(uint8_t no_sensor, uint8_t value) { }
+void enose_periodic( void ) { 
+  int i;
+  for(i = 0; i < ENOSE_NB_SENSOR; i++) {
+    if (enose_val[i] < min_val[i])
+      enose_val[i] = min_val[i];
+    int d = nominal_val[i]- enose_val[i];
+    enose_val[i] += d / 10.;
+  }
+}

Modified: paparazzi3/trunk/sw/airborne/modules/enose/enose.c
===================================================================
--- paparazzi3/trunk/sw/airborne/modules/enose/enose.c  2010-08-31 13:23:01 UTC 
(rev 5762)
+++ paparazzi3/trunk/sw/airborne/modules/enose/enose.c  2010-08-31 13:26:22 UTC 
(rev 5763)
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include "enose.h"
+#include "enose/enose.h"
 
 #include "i2c.h"
 #include "adc.h"