[paparazzi-commits] [5560] replaced by sw/airborne/boards/booz/baro_board.ch

[antoine drouin]

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

Removed Paths:
-------------
    paparazzi3/trunk/sw/airborne/booz/booz2_analog_baro.c
    paparazzi3/trunk/sw/airborne/booz/booz2_analog_baro.h

Deleted: paparazzi3/trunk/sw/airborne/booz/booz2_analog_baro.c
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz2_analog_baro.c       2010-08-22 
01:19:29 UTC (rev 5559)
+++ paparazzi3/trunk/sw/airborne/booz/booz2_analog_baro.c       2010-08-22 
01:20:19 UTC (rev 5560)
@@ -1,83 +0,0 @@
-/*
- * $Id$
- *  
- * Copyright (C) 2008-2009 Antoine Drouin <address@hidden>
- *
- * This file is part of paparazzi.
- *
- * paparazzi is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * paparazzi is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with paparazzi; see the file COPYING.  If not, write to
- * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA. 
- */
-
-#include "booz2_analog_baro.h"
-
-#include "led.h"
-
-#include "airframe.h"
-
-/* threshold >0 && <1023 */
-#ifndef BOOZ_ANALOG_BARO_THRESHOLD
-#define BOOZ_ANALOG_BARO_THRESHOLD 850
-#endif
-
-// pressure on AD0.1 on P0.28
-// offset on DAC on P0.25
-
-uint16_t booz2_analog_baro_status;
-uint16_t booz2_analog_baro_offset;
-uint16_t booz2_analog_baro_value;
-uint16_t booz2_analog_baro_value_filtered;
-bool_t   booz2_analog_baro_data_available;
-
-
-void booz2_analog_baro_init( void ) {
-
-  booz2_analog_baro_status = BOOZ2_ANALOG_BARO_UNINIT;
-
-  booz2_analog_baro_offset = 1023;
-  Booz2AnalogSetDAC(booz2_analog_baro_offset);
-
-  booz2_analog_baro_value = 0;
-  booz2_analog_baro_value_filtered = 0;
-  booz2_analog_baro_data_available = FALSE;
-#ifdef BOOZ2_ANALOG_BARO_LED
-  LED_OFF(BOOZ2_ANALOG_BARO_LED);
-#endif
-}
-
-/* decrement offset until adc reading is over a threshold */
-void booz2_analog_baro_calibrate(void) {
-  if (booz2_analog_baro_value_filtered < BOOZ_ANALOG_BARO_THRESHOLD && 
booz2_analog_baro_offset >= 1) {
-    if (booz2_analog_baro_value_filtered == 0 && booz2_analog_baro_offset > 15)
-      booz2_analog_baro_offset -= 15;
-    else
-      booz2_analog_baro_offset--;
-    Booz2AnalogSetDAC(booz2_analog_baro_offset);
-#ifdef BOOZ2_ANALOG_BARO_LED
-    LED_TOGGLE(BOOZ2_ANALOG_BARO_LED);
-#endif
-  }
-  else {
-    booz2_analog_baro_status = BOOZ2_ANALOG_BARO_RUNNING;
-#ifdef BOOZ2_ANALOG_BARO_LED
-    LED_ON(BOOZ2_ANALOG_BARO_LED);
-#endif
-  }
-}
-
-
-
-
-

Deleted: paparazzi3/trunk/sw/airborne/booz/booz2_analog_baro.h
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz2_analog_baro.h       2010-08-22 
01:19:29 UTC (rev 5559)
+++ paparazzi3/trunk/sw/airborne/booz/booz2_analog_baro.h       2010-08-22 
01:20:19 UTC (rev 5560)
@@ -1,68 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2008-2009 Antoine Drouin <address@hidden>
- *
- * This file is part of paparazzi.
- *
- * paparazzi is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * paparazzi is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with paparazzi; see the file COPYING.  If not, write to
- * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef BOOZ2_ANALOG_BARO_H
-#define BOOZ2_ANALOG_BARO_H
-
-#include "std.h"
-
-#include "booz2_analog.h"
-
-extern void booz2_analog_baro_init( void );
-
-#define BOOZ2_ANALOG_BARO_UNINIT  0
-#define BOOZ2_ANALOG_BARO_RUNNING 1
-
-extern uint16_t booz2_analog_baro_status;
-
-extern uint16_t booz2_analog_baro_offset;
-extern uint16_t booz2_analog_baro_value;
-extern uint16_t booz2_analog_baro_value_filtered;
-extern bool_t   booz2_analog_baro_data_available;
-
-extern void booz2_analog_baro_calibrate(void);
-
-#define Booz2AnalogBaroEvent(_handler) {        \
-    if (booz2_analog_baro_data_available) {     \
-      _handler();                               \
-      booz2_analog_baro_data_available = FALSE;        \
-    }                                           \
-  }
-
-static inline void booz2_analog_baro_SetOffset(uint16_t _o) {
-  booz2_analog_baro_offset = _o;
-  Booz2AnalogSetDAC(_o);
-}
-
-static inline void Booz2BaroISRHandler(uint16_t _val) {
-  booz2_analog_baro_value = _val;
-  booz2_analog_baro_value_filtered = (3*booz2_analog_baro_value_filtered + 
booz2_analog_baro_value)/4;
-  if (booz2_analog_baro_status == BOOZ2_ANALOG_BARO_UNINIT) {
-    RunOnceEvery(10, { booz2_analog_baro_calibrate();});
-  }
-  /*  else */
-  booz2_analog_baro_data_available = TRUE;
-}
-
-
-#endif /* BOOZ2_ANALOG_BARO_H */