Moved the sht11 driver to its own module

oriolpinol · Jan 26, 2014 · 4cfe6c4 · 4cfe6c4
1 parent 8bb4860
commit 4cfe6c4
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 17 deletions.
diff --git a/apps/collect-view/collect-view-sky.c b/apps/collect-view/collect-view-sky.c
@@ -3,7 +3,7 @@
 #include "dev/leds.h"
 #include "dev/light-sensor.h"
 #include "dev/battery-sensor.h"
-#include "dev/sht11-sensor.h"
+#include "dev/sht11/sht11-sensor.h"
 
 #include "collect-view-sky.h"
 

diff --git a/apps/shell/shell-sky.c b/apps/shell/shell-sky.c
@@ -46,10 +46,10 @@
 #include "net/netstack.h"
 #include "cc2420.h"
 #include "dev/leds.h"
-#include "dev/sht11.h"
+#include "dev/sht11/sht11.h"
 #include "dev/light-sensor.h"
 #include "dev/battery-sensor.h"
-#include "dev/sht11-sensor.h"
+#include "dev/sht11/sht11-sensor.h"
 #include "net/rime/timesynch.h"
 
 #include "sys/node-id.h"

diff --git a/dev/sht11/Makefile.dev-sht11 b/dev/sht11/Makefile.dev-sht11
@@ -0,0 +1 @@
+dev-sht11_src = sht11.c sht11-sensor.c
diff --git a/core/dev/sht11-sensor.c → dev/sht11/sht11-sensor.c b/core/dev/sht11-sensor.c → dev/sht11/sht11-sensor.c
@@ -34,8 +34,8 @@
 
 #include "contiki.h"
 #include "lib/sensors.h"
-#include "dev/sht11.h"
-#include "dev/sht11-sensor.h"
+#include "dev/sht11/sht11.h"
+#include "dev/sht11/sht11-sensor.h"
 
 const struct sensors_sensor sht11_sensor;
 

diff --git a/core/dev/sht11-sensor.h → dev/sht11/sht11-sensor.h b/core/dev/sht11-sensor.h → dev/sht11/sht11-sensor.h
diff --git a/core/dev/sht11.c → dev/sht11/sht11.c b/core/dev/sht11.c → dev/sht11/sht11.c
@@ -35,7 +35,7 @@
 
 #include "contiki.h"
 #include <stdio.h>
-#include <dev/sht11.h>
+#include "dev/sht11/sht11.h"
 #include "sht11-arch.h"
 
 #define DEBUG 0

diff --git a/core/dev/sht11.h → dev/sht11/sht11.h b/core/dev/sht11.h → dev/sht11/sht11.h
diff --git a/examples/antelope/netdb/netdb-server.c b/examples/antelope/netdb/netdb-server.c
@@ -39,7 +39,7 @@
 
 #include "contiki.h"
 #include "dev/serial-line.h"
-#include "dev/sht11.h"
+#include "dev/sht11/sht11.h"
 #include "lib/random.h"
 #include "net/rime.h"
 #include "net/rime/mesh.h"

diff --git a/examples/er-rest-example/er-example-server.c b/examples/er-rest-example/er-example-server.c
@@ -75,7 +75,7 @@
 #include "dev/battery-sensor.h"
 #endif
 #if defined (PLATFORM_HAS_SHT11)
-#include "dev/sht11-sensor.h"
+#include "dev/sht11/sht11-sensor.h"
 #endif
 #if defined (PLATFORM_HAS_RADIO)
 #include "dev/radio-sensor.h"

diff --git a/examples/ipv6/json-ws/websense-sky.c b/examples/ipv6/json-ws/websense-sky.c
@@ -40,7 +40,7 @@
 
 #include "contiki.h"
 #include "dev/leds.h"
-#include "dev/sht11-sensor.h"
+#include "dev/sht11/sht11-sensor.h"
 #include "jsontree.h"
 #include "json-ws.h"
 #include <stdio.h>

diff --git a/examples/ipv6/sky-websense/sky-websense.c b/examples/ipv6/sky-websense/sky-websense.c
@@ -39,7 +39,7 @@
 
 #include "contiki.h"
 #include "httpd-simple.h"
-#include "dev/sht11-sensor.h"
+#include "dev/sht11/sht11-sensor.h"
 #include "dev/light-sensor.h"
 #include "dev/leds.h"
 #include <stdio.h>

diff --git a/examples/ipv6/slip-radio/slip-radio-sky-sensors.c b/examples/ipv6/slip-radio/slip-radio-sky-sensors.c
@@ -29,7 +29,7 @@
 
 #include "contiki.h"
 #include "lib/sensors.h"
-#include "dev/sht11-sensor.h"
+#include "dev/sht11/sht11-sensor.h"
 #include "slip-radio.h"
 #include "cmd.h"
 #include <stdio.h>

diff --git a/examples/rest-example/rest-server-example.c b/examples/rest-example/rest-server-example.c
@@ -12,7 +12,7 @@
 #include "dev/battery-sensor.h"
 #endif
 #if defined (PLATFORM_HAS_SHT11)
-#include "dev/sht11-sensor.h"
+#include "dev/sht11/sht11-sensor.h"
 #endif
 #if defined (PLATFORM_HAS_LEDS)
 #include "dev/leds.h"

diff --git a/examples/sky-ip/ajax-cgi.c b/examples/sky-ip/ajax-cgi.c
@@ -103,7 +103,7 @@ httpd_cgi_add(struct httpd_cgi_call *c)
 }
 /*---------------------------------------------------------------------------*/
 #if CONTIKI_TARGET_SKY
-#include "dev/sht11-sensor.h"
+#include "dev/sht11/sht11-sensor.h"
 #include "dev/light-sensor.h"
 #endif /* CONTIKI_TARGET_SKY */
 

diff --git a/examples/sky-shell-exec/sky-shell-exec.c b/examples/sky-shell-exec/sky-shell-exec.c
@@ -40,7 +40,7 @@
 #include "cc2420.h"
 #include "dev/leds.h"
 #include "dev/light.h"
-#include "dev/sht11.h"
+#include "dev/sht11/sht11.h"
 #include "dev/battery-sensor.h"
 
 #include "net/rime/timesynch.h"

diff --git a/examples/sky/sky-collect.c b/examples/sky/sky-collect.c
@@ -46,7 +46,7 @@
 #include "dev/leds.h"
 #include "dev/button-sensor.h"
 #include "dev/light-sensor.h"
-#include "dev/sht11-sensor.h"
+#include "dev/sht11/sht11-sensor.h"
 
 #include "cc2420.h"
 #include <stdio.h>

diff --git a/examples/z1/test-sht11.c b/examples/z1/test-sht11.c
@@ -39,7 +39,7 @@
  */
 
 #include "contiki.h"
-#include "dev/sht11.h"
+#include "dev/sht11/sht11.h"
 
 #include <stdio.h>
 

diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c
@@ -60,7 +60,7 @@
 
 #include "dev/battery-sensor.h"
 #include "dev/button-sensor.h"
-#include "dev/sht11-sensor.h"
+#include "dev/sht11/sht11-sensor.h"
 
 SENSORS(&button_sensor);