[paparazzi-commits] [5558] replaced by sw/airborne/boards/lisa_l/baro_board.c

[antoine drouin]

Revision: 5558
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5558
Author:   poine
Date:     2010-08-22 01:16:57 +0000 (Sun, 22 Aug 2010)
Log Message:
-----------
replaced by sw/airborne/boards/lisa_l/baro_board.c

Removed Paths:
-------------
    paparazzi3/trunk/sw/airborne/lisa/lisa_baro.c
    paparazzi3/trunk/sw/airborne/lisa/lisa_baro.h

Deleted: paparazzi3/trunk/sw/airborne/lisa/lisa_baro.c
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/lisa_baro.c       2010-08-22 01:15:31 UTC 
(rev 5557)
+++ paparazzi3/trunk/sw/airborne/lisa/lisa_baro.c       2010-08-22 01:16:57 UTC 
(rev 5558)
@@ -1,91 +0,0 @@
-#include "lisa_baro.h"
-
-#include "i2c.h"
-
-static inline void baro_write_to_register(uint8_t baro_addr, uint8_t reg_addr, 
uint8_t val_msb, uint8_t val_lsb);
-static inline void baro_read_from_register(uint8_t baro_addr, uint8_t 
reg_addr);
-static inline void baro_set_current_register(uint8_t baro_addr, uint8_t 
reg_addr);
-static inline void baro_read_from_current_register(uint8_t baro_addr);
-
-struct LisaBaro baro;
-// absolute
-#define BARO_ABS_ADDR  0x90   
-// differential
-#define BARO_DIFF_ADDR 0x92
-
-void baro_init(void) {
-  baro.status = LBS_UNINITIALIZED;
-}
-
-void baro_periodic(void) {
-  // check i2c_done
-  switch (baro.status) {
-  case LBS_UNINITIALIZED:
-    baro_send_reset();
-    baro.status = LBS_RESETED;
-    break;
-  case LBS_RESETED:
-    baro_send_config_abs();
-    baro.status = LBS_INITIALIZING_ABS;
-    break;
-  case LBS_INITIALIZING_ABS:
-    baro_set_current_register(BARO_ABS_ADDR, 0x00);
-    baro.status = LBS_INITIALIZING_ABS_1;
-    break;
-  case LBS_INITIALIZING_ABS_1:
-    baro_send_config_diff();
-    baro.status = LBS_INITIALIZING_DIFF;
-    break;
-  case LBS_INITIALIZING_DIFF:
-    baro_set_current_register(BARO_DIFF_ADDR, 0x00);
-    baro.status = LBS_INITIALIZING_DIFF_1;
-    //    baro.status = LBS_UNINITIALIZED;
-    break;
-  case LBS_INITIALIZING_DIFF_1:
-  case LBS_READ_DIFF:
-    baro_read_from_current_register(BARO_ABS_ADDR);
-    baro.status = LBS_READING_ABS;
-    break;
-  case LBS_READ_ABS:
-    baro_read_from_current_register(BARO_DIFF_ADDR);
-    baro.status = LBS_READING_DIFF;
-    break;
-  default:
-    break;
-  }
-
-}
-
-void baro_send_reset(void) {
-  i2c2.buf[0] = 0x06;
-  i2c2_transmit(0x00, 1, &baro.i2c_done);
-}
-
-void baro_send_config_abs(void) {
-  baro_write_to_register(BARO_ABS_ADDR, 0x01, 0x86, 0x83);
-}
-
-void baro_send_config_diff(void) {
-  baro_write_to_register(BARO_DIFF_ADDR, 0x01, 0x84, 0x83);
-}
-
-static inline void baro_write_to_register(uint8_t baro_addr, uint8_t reg_addr, 
uint8_t val_msb, uint8_t val_lsb) {
-  i2c2.buf[0] = reg_addr;
-  i2c2.buf[1] = val_msb;
-  i2c2.buf[2] = val_lsb;
-  i2c2_transmit(baro_addr, 3, &baro.i2c_done);
-}
-
-static inline void baro_read_from_register(uint8_t baro_addr, uint8_t 
reg_addr) {
-  i2c2.buf[0] = reg_addr;
-  i2c2_transceive(baro_addr, 1, 2, &baro.i2c_done);
-}
-
-static inline void baro_set_current_register(uint8_t baro_addr, uint8_t 
reg_addr) {
-  i2c2.buf[0] = reg_addr;
-  i2c2_transmit(baro_addr, 1, &baro.i2c_done);
-}
-
-static inline void baro_read_from_current_register(uint8_t baro_addr) {
-  i2c2_receive(baro_addr, 2, &baro.i2c_done);
-}

Deleted: paparazzi3/trunk/sw/airborne/lisa/lisa_baro.h
===================================================================
--- paparazzi3/trunk/sw/airborne/lisa/lisa_baro.h       2010-08-22 01:15:31 UTC 
(rev 5557)
+++ paparazzi3/trunk/sw/airborne/lisa/lisa_baro.h       2010-08-22 01:16:57 UTC 
(rev 5558)
@@ -1,53 +0,0 @@
-#ifndef LISA_BARO_H
-#define LISA_BARO_H
-
-#include <inttypes.h>
-
-enum LisaBaroStatus {
-  LBS_UNINITIALIZED, 
-  LBS_RESETED, 
-  LBS_INITIALIZING_ABS, 
-  LBS_INITIALIZING_ABS_1, 
-  LBS_INITIALIZING_DIFF, 
-  LBS_INITIALIZING_DIFF_1, 
-  LBS_IDLE,
-  LBS_READING_ABS,
-  LBS_READ_ABS,
-  LBS_READING_DIFF,
-  LBS_READ_DIFF
-};
-
-struct LisaBaro {
-  int16_t abs_raw;
-  int16_t diff_raw;
-  enum LisaBaroStatus status;
-  uint8_t i2c_done;
-};
-
-extern struct LisaBaro baro;
-
-extern void baro_init(void);
-extern void baro_periodic(void);
-
-extern void baro_send_reset(void);
-extern void baro_send_config_abs(void);
-extern void baro_send_config_diff(void);
-
-
-#define BaroEvent(_b_abs_handler, _b_diff_handler) {                   \
-    if (baro.status == LBS_READING_ABS && baro.i2c_done) {             \
-      baro.abs_raw = i2c2.buf[0]<<8 | i2c2.buf[1];                     \
-      baro.status = LBS_READ_ABS;                                      \
-      _b_abs_handler();                                                        
\
-    }                                                                  \
-    else  if (baro.status == LBS_READING_DIFF && baro.i2c_done) {      \
-      baro.diff_raw = i2c2.buf[0]<<8 | i2c2.buf[1];                    \
-      baro.status = LBS_READ_DIFF;                                     \
-      _b_diff_handler();                                               \
-    }                                                                  \
-  }
-
-
-#endif /* LISA_BARO_H */
-
-