From c17d64eaff25025e8c24a4417bc763ada44b3568 Mon Sep 17 00:00:00 2001
From: smlng <s@mlng.net>
Date: Fri, 9 Jun 2017 22:30:27 +0200
Subject: [PATCH] tests: adapt driver_tmp006 to rework

---
 tests/driver_tmp006/Makefile | 10 ----------
 tests/driver_tmp006/main.c   | 34 ++++++++++++----------------------
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/tests/driver_tmp006/Makefile b/tests/driver_tmp006/Makefile
index 77e7ae49dd..83e21145ad 100644
--- a/tests/driver_tmp006/Makefile
+++ b/tests/driver_tmp006/Makefile
@@ -6,14 +6,4 @@ FEATURES_REQUIRED = periph_i2c
 USEMODULE += tmp006
 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
diff --git a/tests/driver_tmp006/main.c b/tests/driver_tmp006/main.c
index fd093460a6..7b2ed5096a 100644
--- a/tests/driver_tmp006/main.c
+++ b/tests/driver_tmp006/main.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2014 Freie Universität Berlin
  * Copyright (C) 2014 PHYTEC Messtechnik GmbH
+ *               2017 HAW Hamburg
  *
  * 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
@@ -16,24 +17,16 @@
  *
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.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 "xtimer.h"
 #include "tmp006.h"
+#include "tmp006_params.h"
 
 int main(void)
 {
@@ -43,33 +36,30 @@ int main(void)
     uint8_t drdy;
 
     puts("TMP006 infrared thermopile sensor driver test application\n");
-    printf("Initializing TMP006 sensor at I2C_%i... ", TEST_TMP006_I2C);
-    if (tmp006_init(&dev, TEST_TMP006_I2C, TEST_TMP006_ADDR, TEST_TMP006_CONFIG_CR) == 0) {
-        puts("[OK]\n");
-    }
-    else {
-        puts("[Failed]");
+    printf("Initializing TMP006 sensor at I2C_%i ... ", tmp006_params[0].i2c);
+    if (tmp006_init(&dev,  &tmp006_params[0]) != TMP006_OK) {
+        puts("init device [ERROR]");
         return -1;
     }
 
     if (tmp006_set_active(&dev)) {
-        puts("Measurement start failed.");
+        puts("start measurement [ERROR]");
         return -1;
     }
+    xtimer_usleep(TMP006_CONVERSION_TIME);
+    puts("[SUCCESS]\n");
 
     while (1) {
         tmp006_read(&dev, &rawvolt, &rawtemp, &drdy);
 
         if (drdy) {
             printf("Raw data T: %5d   V: %5d\n", rawtemp, rawvolt);
+            tmp006_convert(rawvolt, rawtemp,  &tamb, &tobj);
+            printf("Data Tabm: %d   Tobj: %d\n", (int)(tamb*100), (int)(tobj*100));
         }
         else {
-            printf("conversion in progress\n");
+            puts("conversion in progress ... ");
         }
-
-        tmp006_convert(rawvolt, rawtemp,  &tamb, &tobj);
-        printf("Data Tabm: %d   Tobj: %d\n", (int)(tamb*100), (int)(tobj*100));
-
         xtimer_usleep(TMP006_CONVERSION_TIME);
     }