[paparazzi-commits] [4110] fix i2c flags

[Pascal Brisset]

Revision: 4110
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4110
Author:   hecto
Date:     2009-09-08 20:06:05 +0000 (Tue, 08 Sep 2009)
Log Message:
-----------
 fix i2c flags
 signed current

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/main_ap.c

Modified: paparazzi3/trunk/sw/airborne/main_ap.c
===================================================================
--- paparazzi3/trunk/sw/airborne/main_ap.c      2009-09-08 20:04:07 UTC (rev 
4109)
+++ paparazzi3/trunk/sw/airborne/main_ap.c      2009-09-08 20:06:05 UTC (rev 
4110)
@@ -82,7 +82,7 @@
 #include "enose.h"
 #endif
 
-#ifdef USE_I2C
+#if defined USE_I2C0 || USE_I2C1
 #include "i2c.h"
 #endif
 
@@ -174,7 +174,7 @@
 bool_t launch = FALSE;
 
 uint8_t vsupply;       // deciVolt
-uint16_t current;      // milliAmpere
+static int16_t current;        // milliAmpere
 
 float energy;          // Fuel consumption (mAh)
 
@@ -660,10 +660,14 @@
   GpioInit();
 #endif
 
-#ifdef USE_I2C
-  i2c_init();
+#ifdef USE_I2C0
+  i2c0_init();
 #endif
 
+#ifdef USE_I2C1
+  i2c1_init();
+#endif
+
 #ifdef USE_ADC_GENERIC
   adc_generic_init();
 #endif
@@ -682,7 +686,7 @@
 #endif
 
 #ifdef DPICCO
-  i2c_init();
+  i2c0_init();
   dpicco_init();
 #endif