From 4cfe6c4a5e3de7b8e9b63459bb8d47c00ef0f89d Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Thu, 28 Nov 2013 14:53:23 +0100 Subject: [PATCH] Moved the sht11 driver to its own module --- apps/collect-view/collect-view-sky.c | 2 +- apps/shell/shell-sky.c | 4 ++-- dev/sht11/Makefile.dev-sht11 | 1 + {core/dev => dev/sht11}/sht11-sensor.c | 4 ++-- {core/dev => dev/sht11}/sht11-sensor.h | 0 {core/dev => dev/sht11}/sht11.c | 2 +- {core/dev => dev/sht11}/sht11.h | 0 examples/antelope/netdb/netdb-server.c | 2 +- examples/er-rest-example/er-example-server.c | 2 +- examples/ipv6/json-ws/websense-sky.c | 2 +- examples/ipv6/sky-websense/sky-websense.c | 2 +- examples/ipv6/slip-radio/slip-radio-sky-sensors.c | 2 +- examples/rest-example/rest-server-example.c | 2 +- examples/sky-ip/ajax-cgi.c | 2 +- examples/sky-shell-exec/sky-shell-exec.c | 2 +- examples/sky/sky-collect.c | 2 +- examples/z1/test-sht11.c | 2 +- platform/z1/contiki-z1-main.c | 2 +- 18 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 dev/sht11/Makefile.dev-sht11 rename {core/dev => dev/sht11}/sht11-sensor.c (97%) rename {core/dev => dev/sht11}/sht11-sensor.h (100%) rename {core/dev => dev/sht11}/sht11.c (99%) rename {core/dev => dev/sht11}/sht11.h (100%) diff --git a/apps/collect-view/collect-view-sky.c b/apps/collect-view/collect-view-sky.c index 1cb3dfa0b..ed6b6abe8 100644 --- 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 index 084961ae5..ad779d268 100644 --- 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 new file mode 100644 index 000000000..1aedf2ebb --- /dev/null +++ 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 b/dev/sht11/sht11-sensor.c similarity index 97% rename from core/dev/sht11-sensor.c rename to dev/sht11/sht11-sensor.c index 9968416d7..cbe472218 100644 --- a/core/dev/sht11-sensor.c +++ b/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 b/dev/sht11/sht11-sensor.h similarity index 100% rename from core/dev/sht11-sensor.h rename to dev/sht11/sht11-sensor.h diff --git a/core/dev/sht11.c b/dev/sht11/sht11.c similarity index 99% rename from core/dev/sht11.c rename to dev/sht11/sht11.c index d8abc7e68..f6780d0a0 100644 --- a/core/dev/sht11.c +++ b/dev/sht11/sht11.c @@ -35,7 +35,7 @@ #include "contiki.h" #include -#include +#include "dev/sht11/sht11.h" #include "sht11-arch.h" #define DEBUG 0 diff --git a/core/dev/sht11.h b/dev/sht11/sht11.h similarity index 100% rename from core/dev/sht11.h rename to dev/sht11/sht11.h diff --git a/examples/antelope/netdb/netdb-server.c b/examples/antelope/netdb/netdb-server.c index f575c958b..18fe196a8 100644 --- 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 index 36fbb5635..aae05acf9 100644 --- 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 index 83375bdd6..a203a6081 100644 --- 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 diff --git a/examples/ipv6/sky-websense/sky-websense.c b/examples/ipv6/sky-websense/sky-websense.c index 1949a190f..2cc8c5522 100644 --- 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 diff --git a/examples/ipv6/slip-radio/slip-radio-sky-sensors.c b/examples/ipv6/slip-radio/slip-radio-sky-sensors.c index a88d7b9d3..9cf238741 100644 --- 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 diff --git a/examples/rest-example/rest-server-example.c b/examples/rest-example/rest-server-example.c index d13d9c1d9..24b33ff15 100644 --- 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 index e1a835441..f8e4d0a32 100644 --- 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 index dbafed346..94c44dbe6 100644 --- 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 index 26d00a121..142c86eb7 100644 --- 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 diff --git a/examples/z1/test-sht11.c b/examples/z1/test-sht11.c index 9bf48d04b..ff812eec3 100644 --- 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 diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c index c619fa3f6..fd6f96011 100644 --- 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);