Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-10-23 10:29:07 +00:00
Code Issues Projects Releases Wiki Activity

Updated to match the new sensors API

Browse Source
This commit is contained in:
nifi 2010-01-15 21:37:15 +00:00
parent ca7f69d480
commit c9a48aa752
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platform/sky/dev/battery-sensor.c
View File

@ -26,14 +26,14 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: battery-sensor.c,v 1.6 2010/01/14 20:01:18 nifi Exp $ * $Id: battery-sensor.c,v 1.7 2010/01/15 21:37:15 nifi Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
* Author : Adam Dunkels, Joakim Eriksson, Niclas Finne * Author : Adam Dunkels, Joakim Eriksson, Niclas Finne
* Created : 2005-11-01 * Created : 2005-11-01
* Updated : $Date: 2010/01/14 20:01:18 $ * Updated : $Date: 2010/01/15 21:37:15 $
* $Revision: 1.6 $ * $Revision: 1.7 $
*/ */
#include "dev/battery-sensor.h" #include "dev/battery-sensor.h"
@ -74,7 +74,7 @@ deactivate(void)
active = 0; active = 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static unsigned int static int
value(int type) value(int type)
{ {
return ADC12MEM2/*battery_value*/; return ADC12MEM2/*battery_value*/;
@ -102,7 +102,7 @@ status(int type)
case SENSORS_READY: case SENSORS_READY:
return active; return active;
} }
return NULL; return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
SENSORS_SENSOR(battery_sensor, BATTERY_SENSOR, SENSORS_SENSOR(battery_sensor, BATTERY_SENSOR,