platform/mikro-e/dev: restructure thermo3-click driver files and update its test app

mayank-sirotiya-imgtec · mayank-sirotiya-imgtec · commit 8c81c7161fc0 · 2016-06-23T19:25:31.000+05:30
Signed-off-by: Mayank Sirotiya &lt;Mayank.Sirotiya@imgtec.com&gt;
diff --git a/platform/mikro-e/apps/test-thermo3/Makefile b/platform/mikro-e/apps/test-thermo3/Makefile
@@ -1,16 +1,17 @@
 CONTIKI_PROJECT = test-thermo3
-
-ifndef TARGET
-TARGET=mikro-e
-endif
-
 CONTIKI = ../../../..
 
-APPS += dev
+CFLAGS += -DTHERMO3_CLICK
 
-APPDIRS += ../..
+APPS += thermo3-click
+APPDIRS += ../../dev
 
 all: $(CONTIKI_PROJECT)
 	xc32-bin2hex $(CONTIKI_PROJECT).$(TARGET)
 
+distclean: cleanall
+
+cleanall:
+	rm -f symbols.*
+
 include $(CONTIKI)/Makefile.include
diff --git a/platform/mikro-e/apps/test-thermo3/test-thermo3.c b/platform/mikro-e/apps/test-thermo3/test-thermo3.c
@@ -39,7 +39,7 @@
 
 #include <contiki.h>
 #include <stdio.h>
-#include "thermo3-click.h"
+#include "dev/common-clicks.h"
 
 #define TEMP_REG	0x00   /*Temp. register Address*/
 #define CONFIG_REG	0x01   /*Config. register Address*/ 
@@ -52,7 +52,7 @@ AUTOSTART_PROCESSES (&test_thermo3);
 PROCESS_THREAD(test_thermo3, ev, data)
 {
   PROCESS_BEGIN();
-  static float temp_c;
+  static double temp_c;
   static struct etimer et;
   tmp102_init();
   tmp102_reg_select(CONFIG_REG);                
diff --git a/platform/mikro-e/dev/Makefile.dev b/platform/mikro-e/dev/Makefile.dev
diff --git a/platform/mikro-e/dev/common-clicks.h b/platform/mikro-e/dev/common-clicks.h
@@ -40,4 +40,8 @@
 #include "relay-click/relay-click.h"
 #endif
 
+#ifdef THERMO3_CLICK
+#include "thermo3-click/thermo3-click.h"
+#endif
+
 #endif /* __COMMON_CLICKS_H__ */
diff --git a/platform/mikro-e/dev/thermo3-click/Makefile.thermo3-click b/platform/mikro-e/dev/thermo3-click/Makefile.thermo3-click
@@ -0,0 +1,2 @@
+
+thermo3-click_src += thermo3-click.c
diff --git a/platform/mikro-e/dev/thermo3-click/thermo3-click.c b/platform/mikro-e/dev/thermo3-click/thermo3-click.c
diff --git a/platform/mikro-e/dev/thermo3-click/thermo3-click.h b/platform/mikro-e/dev/thermo3-click/thermo3-click.h
@@ -38,8 +38,8 @@
  *
  */
 
-#ifndef __TMP_102_H__
-#define __TMP_102_H__
+#ifndef __THERMO3_CLICK_H__
+#define __THERMO3_CLICK_H__
 
 #define I2C_FREQUENCY		100000
 
@@ -69,4 +69,4 @@ void tmp102_reg_read(uint8_t *);
 void tmp102_reg_write(uint8_t , uint8_t );
 
 /*---------------------------------------------------------------------------*/
-#endif /*  __TMP_102_H__ */
+#endif /*  __THERMO3_CLICK_H__ */

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+`
	`2`	`+thermo3-click_src += thermo3-click.c`