diff --git a/platform/sky/dev/acc-sensor.c b/platform/sky/dev/acc-sensor.c deleted file mode 100644 index 1fa69eaec..000000000 --- a/platform/sky/dev/acc-sensor.c +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright (c) 2010, Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $Id: acc-sensor.c,v 1.7 2010/03/15 23:37:01 nifi Exp $ - * - * ----------------------------------------------------------------- - * - * Author : Adam Dunkels, Joakim Eriksson, Niclas Finne - * Created : 2005-11-01 - * Updated : $Date: 2010/03/15 23:37:01 $ - * $Revision: 1.7 $ - */ - -#include "dev/acc-sensor.h" -#include "dev/sky-sensors.h" -#include - -const struct sensors_sensor acc_sensor; -static uint8_t active; - -/*---------------------------------------------------------------------------*/ -static void -activate(void) -{ - P2DIR |= 0x48; - P2OUT |= 0x48; - - /* stop converting immediately */ - ADC12CTL0 &= ~ENC; - ADC12CTL1 &= ~CONSEQ_3; - - while(ADC12CTL1 & ADC12BUSY); - - /* Configure ADC12_2 to sample channel 4, 5, 6 and use */ - /* the Vref+ as reference (SREF_1) since it is a stable reference */ - ADC12MCTL2 = (INCH_4 + SREF_1); - ADC12MCTL3 = (INCH_5 + SREF_1); - ADC12MCTL4 = (INCH_6 + SREF_1); - /* internal temperature can be read as value(3) */ - ADC12MCTL5 = (INCH_10 + SREF_1); - - active = 1; - sky_sensors_activate(0x70); -} -/*---------------------------------------------------------------------------*/ -static void -deactivate(void) -{ - sky_sensors_deactivate(0x70); - active = 0; -} -/*---------------------------------------------------------------------------*/ -static int -value(int type) -{ - switch(type) { - case 0: - return ADC12MEM2; - case 1: - return ADC12MEM3; - case 2: - return ADC12MEM4; - case 3: - return ADC12MEM5; - } - return 0; -} -/*---------------------------------------------------------------------------*/ -static int -configure(int type, int c) -{ - switch(type) { - case SENSORS_ACTIVE: - if (c) { - if(!active) { - activate(); - } - } else if(active) { - deactivate(); - } - } - return 0; -} -/*---------------------------------------------------------------------------*/ -static int -status(int type) -{ - switch (type) { - case SENSORS_ACTIVE: - case SENSORS_READY: - return active; - } - return 0; -} -/*---------------------------------------------------------------------------*/ -SENSORS_SENSOR(acc_sensor, ACC_SENSOR, - value, configure, status); diff --git a/platform/sky/dev/acc-sensor.h b/platform/sky/dev/acc-sensor.h deleted file mode 100644 index b10ae214a..000000000 --- a/platform/sky/dev/acc-sensor.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2006, Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $Id: acc-sensor.h,v 1.1 2009/01/15 21:06:02 adamdunkels Exp $ - * - * ----------------------------------------------------------------- - * - * Author : Adam Dunkels, Joakim Eriksson, Niclas Finne - * Created : 2005-11-01 - * Updated : $Date: 2009/01/15 21:06:02 $ - * $Revision: 1.1 $ - */ - -#ifndef __ACC_SENSOR_H__ -#define __ACC_SENSOR_H__ - -#include "lib/sensors.h" - -extern const struct sensors_sensor acc_sensor; - -#define ACC_SENSOR "Acc" - -#endif /* __ACC_SENSOR_H__ */ diff --git a/platform/sky/dev/ext-sensor.c b/platform/sky/dev/ext-sensor.c deleted file mode 100644 index 6267520b3..000000000 --- a/platform/sky/dev/ext-sensor.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (c) 2006, Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $Id: ext-sensor.c,v 1.3 2010/02/13 11:20:48 joxe Exp $ - * - * ----------------------------------------------------------------- - * - * Author : Adam Dunkels, Joakim Eriksson, Niclas Finne, Marcus Lundén, - * Jesper Karlsson - * Created : 2005-11-01 - * Updated : $Date: 2010/02/13 11:20:48 $ - * $Revision: 1.3 $ - */ - -#include -#include - -#include "contiki.h" -#include "dev/ext-sensor.h" -#include "lib/sensors.h" -#include "sky-sensors.h" - -const struct sensors_sensor ext_sensor; -static uint8_t active; -/*---------------------------------------------------------------------------*/ -static int -value(int type) -{ - /* ADC0 corresponds to the port under the logo, ADC1 to the port over the logo, - ADC2 and ADC3 corresponds to port on the JCreate bottom expansion port) */ - switch(type) { - case ADC0: - return ADC12MEM6; - case ADC1: - return ADC12MEM7; - case ADC2: - return ADC12MEM8; - case ADC3: - return ADC12MEM9; - } - return 0; -} -/*---------------------------------------------------------------------------*/ -static int -status(int type) -{ - switch(type) { - case SENSORS_ACTIVE: - case SENSORS_READY: - return active; - } - return 0; -} -/*---------------------------------------------------------------------------*/ -static int -configure(int type, int c) -{ - switch(type) { - case SENSORS_ACTIVE: - if(c) { - if(!status(SENSORS_ACTIVE)) { - /* SREF_1 is Vref+ */ - /* MemReg6 == P6.0/A0 == port "under" logo */ - ADC12MCTL6 = (INCH_0 + SREF_0); - /* MemReg7 == P6.1/A1 == port "over" logo */ - ADC12MCTL7 = (INCH_1 + SREF_0); - /* MemReg8 == P6.2/A2, bottom expansion port */ - ADC12MCTL8 = (INCH_2 + SREF_0); - /* MemReg9 == P6.1/A3, bottom expansion port, End Of (ADC-)Sequence */ - ADC12MCTL9 = (INCH_3 + SREF_0); - - sky_sensors_activate(0x0F); - active = 1; - } - } else { - sky_sensors_deactivate(0x0F); - active = 0; - } - } - return 0; -} -/*---------------------------------------------------------------------------*/ -SENSORS_SENSOR(ext_sensor, "Ext", - value, configure, status); diff --git a/platform/sky/dev/ext-sensor.h b/platform/sky/dev/ext-sensor.h deleted file mode 100644 index 8fed8b59f..000000000 --- a/platform/sky/dev/ext-sensor.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2006, Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $Id: ext-sensor.h,v 1.2 2010/02/13 11:20:48 joxe Exp $ - * - * ----------------------------------------------------------------- - * - * Author : Marcus Lundén - * Created : 2005-11-01 - * Updated : $Date: 2010/02/13 11:20:48 $ - * $Revision: 1.2 $ - */ - -#ifndef __EXT_SENSOR_H__ -#define __EXT_SENSOR_H__ - -#include "lib/sensors.h" - -#define ADC0 0 -#define ADC1 1 -#define ADC2 2 -#define ADC3 3 - -extern const struct sensors_sensor ext_sensor; - -#define EXT_SENSOR "Ext" - -#endif /* __EXT_SENSOR_H__ */