deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

minor polish to the phidget sensor driver

Browse source
This commit is contained in:
joxe 2010-08-27 12:58:57 +00:00
parent 3d22887e9f
commit f02cdc7c8f
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
platform/z1/dev/z1-phidgets.c
View file

@ -28,23 +28,22 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: z1-phidgets.c,v 1.1 2010/08/27 12:17:40 joxe Exp $ * $Id: z1-phidgets.c,v 1.2 2010/08/27 12:58:57 joxe Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
* Author : Joakim Eriksson * Author : Joakim Eriksson
* Created : 2010-02-02 * Created : 2010-02-02
* Updated : $Date: 2010/08/27 12:17:40 $ * Updated : $Date: 2010/08/27 12:58:57 $
* $Revision: 1.1 $ * $Revision: 1.2 $
*/ */
#include <stdlib.h>
#include <io.h> #include <io.h>
#include "lib/sensors.h"
#include "contiki.h" #include "contiki.h"
#include "lib/sensors.h"
#include "dev/z1-phidgets.h" #include "dev/z1-phidgets.h"
static uint8_t adc_on; static uint8_t adc_on;
static uint8_t active;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
sensors_activate(uint8_t type) sensors_activate(uint8_t type)
@ -95,10 +94,6 @@ sensors_deactivate(uint8_t type)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
const struct sensors_sensor ext_sensor;
static uint8_t active;
/*---------------------------------------------------------------------------*/
static int static int
value(int type) value(int type)
{ {

11
platform/z1/dev/z1-phidgets.h
View file

@ -28,16 +28,17 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: z1-phidgets.h,v 1.1 2010/08/27 12:17:40 joxe Exp $ * $Id: z1-phidgets.h,v 1.2 2010/08/27 12:58:57 joxe Exp $
* *
* ----------------------------------------------------------------- * -----------------------------------------------------------------
* *
* Author : Joakim Eriksson * Author : Joakim Eriksson
* Created : 2010-08-26 * Created : 2010-08-26
* Updated : $Date: 2010/08/27 12:17:40 $ * Updated : $Date: 2010/08/27 12:58:57 $
* $Revision: 1.1 $ * $Revision: 1.2 $
*/ */
#ifndef __Z1_PHIDGETS_H__
#define __Z1_PHIDGETS_H__
#define PHIDGET5V_1 0 #define PHIDGET5V_1 0
#define PHIDGET5V_2 1 #define PHIDGET5V_2 1
@ -45,3 +46,5 @@
#define PHIDGET3V_2 3 #define PHIDGET3V_2 3
extern const struct sensors_sensor phidgets; extern const struct sensors_sensor phidgets;
#endif /* __Z1_PHIDGETS_H__ */