From 9acdb98a56ca19073649f44c93c6ee896b8135fd Mon Sep 17 00:00:00 2001 From: "Enric M. Calvo" Date: Sat, 26 Feb 2011 12:41:56 +0100 Subject: [PATCH] Added a quick sht11 sensor driver support for Z1 Support for Sensirion SHT1x/SHT7x support is adapted from core for Z1 in the Ziglet port. XXX TODO: + Remove SHT11_PWR + Lines are shared with I2C, hence port reconfiguration must be added at the driver level. --- examples/z1/Makefile | 4 +-- examples/z1/TODO | 1 + examples/z1/test-sht11.c | 68 ++++++++++++++++++++++++++++++++++++ platform/z1/dev/sht11-arch.h | 60 +++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+), 2 deletions(-) create mode 100644 examples/z1/test-sht11.c create mode 100644 platform/z1/dev/sht11-arch.h diff --git a/examples/z1/Makefile b/examples/z1/Makefile index f94e510fc..27edd50ed 100644 --- a/examples/z1/Makefile +++ b/examples/z1/Makefile @@ -2,8 +2,8 @@ ifndef TARGET TARGET=z1 endif -CONTIKI_PROJECT = test-phidgets blink test-adxl345 tmp102-test test-battery #test-potent -CONTIKI_SOURCEFILES += cc2420-arch.c +CONTIKI_PROJECT = test-phidgets blink test-adxl345 tmp102-test test-battery test-sht11 #test-potent +CONTIKI_SOURCEFILES += cc2420-arch.c sensors.c sht11.c PROJECT_SOURCEFILES = i2cmaster.c tmp102.c adxl345.c battery-sensor.c sky-sensors.c #potentiometer-sensor.c APPS=serial-shell diff --git a/examples/z1/TODO b/examples/z1/TODO index a81a8b4a7..ef6a47d57 100644 --- a/examples/z1/TODO +++ b/examples/z1/TODO @@ -1 +1,2 @@ + clean-up test-battery.c ++ sht11 drier compat. with i2c diff --git a/examples/z1/test-sht11.c b/examples/z1/test-sht11.c new file mode 100644 index 000000000..326976873 --- /dev/null +++ b/examples/z1/test-sht11.c @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2011, Zolertia(TM) is a trademark of Advancare,SL + * 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. + * + * This file is part of the Contiki operating system. + * + * $Id: test-sht11.c,v 1.3 2011/02/27 07:39:55 enricmcalvo $ + */ + +/** + * \file + * Testing the SHT11 sensor on the Zolertia Z1 Platform. + * \author + * Nicolas Tsiftes + * Enric M. Calvo + */ + +#include "contiki.h" +#include "dev/sht11.h" + +#include + +PROCESS(test_sht11_process, "SHT11 test"); +AUTOSTART_PROCESSES(&test_sht11_process); + +PROCESS_THREAD(test_sht11_process, ev, data) +{ + static struct etimer et; + static unsigned rh; + + PROCESS_BEGIN(); + sht11_init(); + + for (etimer_set(&et, CLOCK_SECOND);; etimer_reset(&et)) { + PROCESS_YIELD(); + printf("Temperature: %u degrees Celsius\n", + (unsigned) (-39.60 + 0.01 * sht11_temp())); + rh = sht11_humidity(); + printf("Rel. humidity: %u%%\n", + (unsigned) (-4 + 0.0405*rh - 2.8e-6*(rh*rh))); + } + + PROCESS_END(); +} diff --git a/platform/z1/dev/sht11-arch.h b/platform/z1/dev/sht11-arch.h new file mode 100644 index 000000000..d1d833d29 --- /dev/null +++ b/platform/z1/dev/sht11-arch.h @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2011, Zolertia(TM) is a trademark of Advancare,SL + * 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. + * + * This file is part of the Contiki operating system. + * + */ + +/** + * \file + * Architecture-specific definitions for the SHT11 sensor on Zolertia Z1 + * when connected to the Ziglet port. + * \author + * Enric M. Calvo , adapted from work by + * Nicolas Tsiftes + */ + +#ifndef SHT11_ARCH_H +#define SHT11_ARCH_H + +// Architecture-specific definitions for the SHT11 sensor on Zolertia Z1 +// when connected to the Ziglet port. +// CAUTION: I2C needs to be disabled to use the bitbang protocol of SHT11 + +#define SHT11_ARCH_SDA 1 /* P5.1 */ +#define SHT11_ARCH_SCL 2 /* P5.2 */ +// SHT11_ARCH_PWR is not needed, but until and *-arch abstraction exists, this +// should fix it +#define SHT11_ARCH_PWR 3 /* P5.3 -- unused pin */ + +#define SHT11_PxDIR P5DIR +#define SHT11_PxIN P5IN +#define SHT11_PxOUT P5OUT +#define SHT11_PxSEL P5SEL + +#endif