[ms5611] module

paparazzi · Feb 8, 2013 · 3a0e36c · 3a0e36c
1 parent 6fddc8c
commit 3a0e36c
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 3 deletions.
diff --git a/sw/airborne/modules/sensors/baro_ms5611_i2c.c b/sw/airborne/modules/sensors/baro_ms5611_i2c.c
@@ -43,7 +43,9 @@
 #endif
 
 /* address can be 0xEC or 0xEE (CSB\ high = 0xEC) */
+#ifndef MS5611_SLAVE_ADDR
 #define MS5611_SLAVE_ADDR 0xEC
+#endif
 
 #if PERIODIC_FREQUENCY > 60
 #error baro_ms5611_i2c assumes a PERIODIC_FREQUENCY of 60Hz
@@ -54,8 +56,11 @@ uint8_t ms5611_status;
 uint16_t ms5611_c[PROM_NB];
 uint32_t ms5611_d1, ms5611_d2;
 int32_t prom_cnt;
-float fbaroms, ftempms;
-
+float fbaroms, ftempms, tmp_float,baro_alt,baro_offset,baro_altitude,baro_temp;
+bool_t baro_offset_init;
+bool_t baro_ms5611_enabled;
+float baro_ms5611_r;
+float baro_ms5611_sigma2;
 
 static int8_t baro_ms5611_crc(uint16_t* prom) {
   int32_t i, j;
@@ -76,7 +81,11 @@ static int8_t baro_ms5611_crc(uint16_t* prom) {
 }
 
 void baro_ms5611_init(void) {
+  baro_offset_init = FALSE;
+  baro_ms5611_enabled = TRUE;
   ms5611_status = MS5611_UNINIT;
+  baro_ms5611_r = BARO_MS5611_R;
+  baro_ms5611_sigma2 = BARO_MS5611_SIGMA2;
   prom_cnt = 0;
 }
 
@@ -215,12 +224,36 @@ void baro_ms5611_event( void ) {
       }
       /* temperature compensated pressure */
       baroms = (((int64_t)ms5611_d1 * sens) / (1<<21) - off) / (1<<15);
+
+      tmp_float = baroms/101325.0; //pressao nivel mar
+      tmp_float = pow(tmp_float,0.190295); //eleva pressao ao expoente
+      baro_alt = 44330*(1.0-tmp_float); //altitude relativa nivel do mar
+
+      if (!baro_offset_init) {
+        baro_offset = baro_alt;
+        baro_offset_init = TRUE;
+      } //baro offset init
+
+      baro_temp = (baro_alt - baro_offset);
+
+      if (baro_offset_init) {        // New value available
+        baro_altitude = ground_alt + baro_temp;
+
+#if USE_BARO_MS5611
+#pragma message "USING BARO MS5611"
+        EstimatorSetAlt(baro_altitude);
+#endif
+
+      } else {
+        baro_altitude = 0.0;
+      }
 #ifdef SENSOR_SYNC_SEND
       ftempms = tempms / 100.;
       fbaroms = baroms / 100.;
       DOWNLINK_SEND_BARO_MS5611(DefaultChannel, DefaultDevice,
                                 &ms5611_d1, &ms5611_d2, &fbaroms, &ftempms);
 #endif
+
       break;
     }
 
@@ -230,4 +263,3 @@ void baro_ms5611_event( void ) {
     }
   }
 }
-
diff --git a/sw/airborne/modules/sensors/baro_ms5611_i2c.h b/sw/airborne/modules/sensors/baro_ms5611_i2c.h
@@ -12,6 +12,13 @@
 
 #define PROM_NB                 8
 
+#define BARO_MS5611_DT 0.05
+#define BARO_MS5611_R 20
+#define BARO_MS5611_SIGMA2 1
+extern bool_t baro_ms5611_enabled;
+extern float baro_ms5611_r;
+extern float baro_ms5611_sigma2;
+
 enum ms5611_stat{
   MS5611_UNINIT,
   MS5611_RESET,

diff --git a/sw/airborne/subsystems/ins/ins_alt_float.c b/sw/airborne/subsystems/ins/ins_alt_float.c
@@ -177,6 +177,12 @@ void alt_kalman(float z_meas) {
     R = baro_ets_r;
     SIGMA2 = baro_ets_sigma2;
   } else
+#elif USE_BARO_MS5611
+  if (baro_ms5611_enabled) {
+    DT = BARO_MS5611_DT;
+    R = baro_ms5611_r;
+    SIGMA2 = baro_ms5611_sigma2;
+  } else
 #elif USE_BARO_BMP
   if (baro_bmp_enabled) {
     DT = BARO_BMP_DT;