Added SHT25 sensor
This commit is contained in:
Antonio Lignan
parent
2734c97234
commit
1af29a5beb
|
|
@ -5,7 +5,8 @@ endif
|
||||||
# Enable to pull-in Z1SP specific test/source files
|
# Enable to pull-in Z1SP specific test/source files
|
||||||
ZOLERTIA_Z1SP=0
|
ZOLERTIA_Z1SP=0
|
||||||
|
|
||||||
CONTIKI_PROJECT = test-phidgets blink test-adxl345 test-tmp102 test-light-ziglet test-battery test-sht11 test-relay-phidget test-tlc59116
|
CONTIKI_PROJECT = test-phidgets blink test-adxl345 test-tmp102 test-light-ziglet
|
||||||
|
CONTIKI_PROJECT += test-battery test-relay-phidget test-tlc59116 test-sht25
|
||||||
CONTIKI_SOURCEFILES += sht11.c
|
CONTIKI_SOURCEFILES += sht11.c
|
||||||
APPS=serial-shell
|
APPS=serial-shell
|
||||||
|
|
||||||
|
|
|
||||||
63
examples/z1/test-sht25.c
Normal file
63
examples/z1/test-sht25.c
Normal file
|
|
@ -0,0 +1,63 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2015, Zolertia <http://www.zolertia.com>
|
||||||
|
* 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
|
||||||
|
* A quick program for testing the SHT25 temperature and humidity sensor
|
||||||
|
* \author
|
||||||
|
* Antonio Lignan <alinan@zolertia.com>
|
||||||
|
*/
|
||||||
|
#include <stdio.h>
|
||||||
|
#include "contiki.h"
|
||||||
|
#include "dev/sht25.h"
|
||||||
|
|
||||||
|
PROCESS(test_sht25_process, "SHT25 test");
|
||||||
|
AUTOSTART_PROCESSES(&test_sht25_process);
|
||||||
|
|
||||||
|
static struct etimer et;
|
||||||
|
|
||||||
|
PROCESS_THREAD(test_sht25_process, ev, data)
|
||||||
|
{
|
||||||
|
int16_t temperature, humidity;
|
||||||
|
|
||||||
|
PROCESS_BEGIN();
|
||||||
|
SENSORS_ACTIVATE(sht25);
|
||||||
|
|
||||||
|
while(1) {
|
||||||
|
etimer_set(&et, CLOCK_SECOND);
|
||||||
|
PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
|
||||||
|
temperature = sht25.value(SHT25_VAL_TEMP);
|
||||||
|
printf("Temperature %d.%d ºC\n", temperature / 100, temperature % 100);
|
||||||
|
humidity = sht25.value(SHT25_VAL_HUM);
|
||||||
|
printf("Humidity %d.%d %RH\n", humidity / 100, humidity % 100);
|
||||||
|
}
|
||||||
|
PROCESS_END();
|
||||||
|
}
|
||||||
|
|
@ -19,7 +19,7 @@ ARCH=msp430.c leds.c watchdog.c xmem.c \
|
||||||
slip.c slip_uart0.c \
|
slip.c slip_uart0.c \
|
||||||
z1-phidgets.c sht11.c sht11-sensor.c light-sensor.c \
|
z1-phidgets.c sht11.c sht11-sensor.c light-sensor.c \
|
||||||
battery-sensor.c sky-sensors.c tmp102.c temperature-sensor.c light-ziglet.c \
|
battery-sensor.c sky-sensors.c tmp102.c temperature-sensor.c light-ziglet.c \
|
||||||
relay-phidget.c tlc59116.c
|
relay-phidget.c tlc59116.c sht25.c
|
||||||
|
|
||||||
CONTIKI_TARGET_DIRS = . dev apps net
|
CONTIKI_TARGET_DIRS = . dev apps net
|
||||||
ifndef CONTIKI_TARGET_MAIN
|
ifndef CONTIKI_TARGET_MAIN
|
||||||
|
|
|
||||||
134
platform/z1/dev/sht25.c
Normal file
134
platform/z1/dev/sht25.c
Normal file
|
|
@ -0,0 +1,134 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2015, Zolertia <http://www.zolertia.com>
|
||||||
|
* 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
|
||||||
|
* SHT25 temperature and humidity sensor driver
|
||||||
|
* \author
|
||||||
|
* Antonio Lignan <alinan@zolertia.com>
|
||||||
|
*/
|
||||||
|
#include <stdio.h>
|
||||||
|
#include "contiki.h"
|
||||||
|
#include "i2cmaster.h"
|
||||||
|
#include "dev/sht25.h"
|
||||||
|
#include "lib/sensors.h"
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
static uint8_t enabled;
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
static int
|
||||||
|
configure(int type, int value)
|
||||||
|
{
|
||||||
|
if((type != SENSORS_ACTIVE) && (type != SENSORS_ACTIVE)) {
|
||||||
|
return SHT25_ERROR;
|
||||||
|
}
|
||||||
|
if(value) {
|
||||||
|
i2c_enable();
|
||||||
|
} else {
|
||||||
|
i2c_disable();
|
||||||
|
}
|
||||||
|
enabled = value;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
static int
|
||||||
|
status(int type)
|
||||||
|
{
|
||||||
|
switch(type) {
|
||||||
|
case SENSORS_ACTIVE:
|
||||||
|
case SENSORS_READY:
|
||||||
|
return enabled;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
static uint16_t
|
||||||
|
sht25_read_reg(uint8_t reg)
|
||||||
|
{
|
||||||
|
uint8_t buf[] = { 0x00, 0x00 };
|
||||||
|
uint16_t retval;
|
||||||
|
uint8_t rtx = reg;
|
||||||
|
|
||||||
|
/* transmit the register to read */
|
||||||
|
i2c_transmitinit(SHT25_ADDR);
|
||||||
|
while(i2c_busy());
|
||||||
|
i2c_transmit_n(1, &rtx);
|
||||||
|
while(i2c_busy());
|
||||||
|
/* receive the data */
|
||||||
|
i2c_receiveinit(SHT25_ADDR);
|
||||||
|
while(i2c_busy());
|
||||||
|
i2c_receive_n(2, &buf[0]);
|
||||||
|
while(i2c_busy());
|
||||||
|
|
||||||
|
retval = (uint16_t)(buf[0] << 8 | (buf[1]));
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
static int16_t
|
||||||
|
sht25_convert(uint8_t variable, uint16_t value)
|
||||||
|
{
|
||||||
|
int16_t rd;
|
||||||
|
uint32_t buff;
|
||||||
|
buff = (uint32_t)value;
|
||||||
|
if(variable == SHT25_VAL_TEMP) {
|
||||||
|
buff *= 17572;
|
||||||
|
buff = buff >> 16;
|
||||||
|
rd = (int16_t)buff - 4685;
|
||||||
|
} else {
|
||||||
|
buff *= 12500;
|
||||||
|
buff = buff >> 16;
|
||||||
|
rd = (int16_t)buff - 600;
|
||||||
|
rd = (rd > 10000) ? 10000 : rd;
|
||||||
|
}
|
||||||
|
return rd;
|
||||||
|
}
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
static int16_t
|
||||||
|
sht25_read(uint8_t variable)
|
||||||
|
{
|
||||||
|
int16_t rd;
|
||||||
|
uint16_t raw;
|
||||||
|
|
||||||
|
if((variable != SHT25_VAL_TEMP) && (variable != SHT25_VAL_HUM)) {
|
||||||
|
return SHT25_ERROR;
|
||||||
|
}
|
||||||
|
raw = sht25_read_reg(variable);
|
||||||
|
rd = sht25_convert(variable, raw);
|
||||||
|
return rd;
|
||||||
|
}
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
static int16_t
|
||||||
|
value(uint8_t type)
|
||||||
|
{
|
||||||
|
return sht25_read(type);
|
||||||
|
}
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
|
SENSORS_SENSOR(sht25, "SHT25", value, configure, status);
|
||||||
|
/*---------------------------------------------------------------------------*/
|
||||||
69
platform/z1/dev/sht25.h
Normal file
69
platform/z1/dev/sht25.h
Normal file
|
|
@ -0,0 +1,69 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2015, Zolertia <http://www.zolertia.com>
|
||||||
|
* 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
|
||||||
|
* SHT25 temperature and humidity sensor driver
|
||||||
|
* \author
|
||||||
|
* Antonio Lignan <alinan@zolertia.com>
|
||||||
|
*/
|
||||||
|
#include "lib/sensors.h"
|
||||||
|
|
||||||
|
#ifndef SHT25_H_
|
||||||
|
#define SHT25_H_
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
#define SHT25_ADDR 0x40
|
||||||
|
#define SHT25_TEMP_HOLD 0xE3
|
||||||
|
#define SHT25_HUM_HOLD 0xE5
|
||||||
|
#define SHT25_TEMP_NO_HOLD 0xF3
|
||||||
|
#define SHT25_HUM_NO_HOLD 0xF5
|
||||||
|
#define SHT2X_UREG_WRITE 0xE6
|
||||||
|
#define SHT2X_UREG_READ 0xE7
|
||||||
|
#define SHT2X_SOFT_RESET 0XFE
|
||||||
|
#define SHT2X_NULL 0x00
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
#define SHT2X_RES_14T_12RH 0x00
|
||||||
|
#define SHT2X_RES_12T_08RH 0x01
|
||||||
|
#define SHT2X_RES_13T_10RH 0x80
|
||||||
|
#define SHT2X_RES_11T_11RH 0x81
|
||||||
|
#define SHT2X_HEATER_ON 0x04
|
||||||
|
#define SHT2X_HEATER_OFF 0x00
|
||||||
|
#define SHT2X_OTP_RELOAD_EN 0x00
|
||||||
|
#define SHT2X_OTP_RELOAD_DIS 0x02
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
#define SHT25_VAL_TEMP SHT25_TEMP_HOLD
|
||||||
|
#define SHT25_VAL_HUM SHT25_HUM_HOLD
|
||||||
|
#define SHT25_ERROR -1
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
extern const struct sensors_sensor sht25;
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
#endif /* ifndef SHT25_H_ */
|
||||||
Loading…
Reference in a new issue