riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: adapt driver_tmp006 to rework

Browse Source
This commit is contained in:
smlng 2017-06-09 22:30:27 +02:00
parent 42a09128aa
commit c17d64eaff
2 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/driver_tmp006/Makefile
View File

@ -6,14 +6,4 @@ FEATURES_REQUIRED = periph_i2c
USEMODULE += tmp006 USEMODULE += tmp006
USEMODULE += xtimer USEMODULE += xtimer
# set default device parameters in case they are undefined
TEST_TMP006_I2C ?= I2C_DEV\(0\)
TEST_TMP006_ADDR ?= 0x41
TEST_TMP006_CONFIG_CR ?= TMP006_CONFIG_CR_DEF
# export parameters
CFLAGS += -DTEST_TMP006_I2C=$(TEST_TMP006_I2C)
CFLAGS += -DTEST_TMP006_ADDR=$(TEST_TMP006_ADDR)
CFLAGS += -DTEST_TMP006_CONFIG_CR=$(TEST_TMP006_CONFIG_CR)
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

36
tests/driver_tmp006/main.c
View File

@ -1,6 +1,7 @@
/* /*
* Copyright (C) 2014 Freie Universität Berlin * Copyright (C) 2014 Freie Universität Berlin
* Copyright (C) 2014 PHYTEC Messtechnik GmbH * Copyright (C) 2014 PHYTEC Messtechnik GmbH
* 2017 HAW Hamburg
* *
* This file is subject to the terms and conditions of the GNU Lesser * This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level * General Public License v2.1. See the file LICENSE in the top level
@ -16,24 +17,16 @@
* *
* @author Hauke Petersen <hauke.petersen@fu-berlin.de> * @author Hauke Petersen <hauke.petersen@fu-berlin.de>
* @author Johann Fischer <j.fischer@phytec.de> * @author Johann Fischer <j.fischer@phytec.de>
* @author Sebastian Meiling <s@mlng.net>
* *
* @} * @}
*/ */
#ifndef TEST_TMP006_I2C
#error "TEST_TMP006_I2C not defined"
#endif
#ifndef TEST_TMP006_ADDR
#error "TEST_TMP006_ADDR not defined"
#endif
#ifndef TEST_TMP006_CONFIG_CR
#error "TEST_TMP006_ADDR not defined"
#endif
#include <stdio.h> #include <stdio.h>
#include "xtimer.h" #include "xtimer.h"
#include "tmp006.h" #include "tmp006.h"
#include "tmp006_params.h"
int main(void) int main(void)
{ {
@ -43,33 +36,30 @@ int main(void)
uint8_t drdy; uint8_t drdy;
puts("TMP006 infrared thermopile sensor driver test application\n"); puts("TMP006 infrared thermopile sensor driver test application\n");
printf("Initializing TMP006 sensor at I2C_%i... ", TEST_TMP006_I2C); printf("Initializing TMP006 sensor at I2C_%i ... ", tmp006_params[0].i2c);
if (tmp006_init(&dev, TEST_TMP006_I2C, TEST_TMP006_ADDR, TEST_TMP006_CONFIG_CR) == 0) { if (tmp006_init(&dev, &tmp006_params[0]) != TMP006_OK) {
puts("[OK]\n"); puts("init device [ERROR]");
}
else {
puts("[Failed]");
return -1; return -1;
} }
if (tmp006_set_active(&dev)) { if (tmp006_set_active(&dev)) {
puts("Measurement start failed."); puts("start measurement [ERROR]");
return -1; return -1;
} }
xtimer_usleep(TMP006_CONVERSION_TIME);
puts("[SUCCESS]\n");
while (1) { while (1) {
tmp006_read(&dev, &rawvolt, &rawtemp, &drdy); tmp006_read(&dev, &rawvolt, &rawtemp, &drdy);
if (drdy) { if (drdy) {
printf("Raw data T: %5d V: %5d\n", rawtemp, rawvolt); printf("Raw data T: %5d V: %5d\n", rawtemp, rawvolt);
}
else {
printf("conversion in progress\n");
}
tmp006_convert(rawvolt, rawtemp, &tamb, &tobj); tmp006_convert(rawvolt, rawtemp, &tamb, &tobj);
printf("Data Tabm: %d Tobj: %d\n", (int)(tamb*100), (int)(tobj*100)); printf("Data Tabm: %d Tobj: %d\n", (int)(tamb*100), (int)(tobj*100));
}
else {
puts("conversion in progress ... ");
}
xtimer_usleep(TMP006_CONVERSION_TIME); xtimer_usleep(TMP006_CONVERSION_TIME);
} }