mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-12-21 03:30:01 +00:00
Moved the sht11 driver to its own module
This commit is contained in:
parent
8bb4860138
commit
4cfe6c4a5e
@ -3,7 +3,7 @@
|
|||||||
#include "dev/leds.h"
|
#include "dev/leds.h"
|
||||||
#include "dev/light-sensor.h"
|
#include "dev/light-sensor.h"
|
||||||
#include "dev/battery-sensor.h"
|
#include "dev/battery-sensor.h"
|
||||||
#include "dev/sht11-sensor.h"
|
#include "dev/sht11/sht11-sensor.h"
|
||||||
|
|
||||||
#include "collect-view-sky.h"
|
#include "collect-view-sky.h"
|
||||||
|
|
||||||
|
@ -46,10 +46,10 @@
|
|||||||
#include "net/netstack.h"
|
#include "net/netstack.h"
|
||||||
#include "cc2420.h"
|
#include "cc2420.h"
|
||||||
#include "dev/leds.h"
|
#include "dev/leds.h"
|
||||||
#include "dev/sht11.h"
|
#include "dev/sht11/sht11.h"
|
||||||
#include "dev/light-sensor.h"
|
#include "dev/light-sensor.h"
|
||||||
#include "dev/battery-sensor.h"
|
#include "dev/battery-sensor.h"
|
||||||
#include "dev/sht11-sensor.h"
|
#include "dev/sht11/sht11-sensor.h"
|
||||||
#include "net/rime/timesynch.h"
|
#include "net/rime/timesynch.h"
|
||||||
|
|
||||||
#include "sys/node-id.h"
|
#include "sys/node-id.h"
|
||||||
|
1
dev/sht11/Makefile.dev-sht11
Normal file
1
dev/sht11/Makefile.dev-sht11
Normal file
@ -0,0 +1 @@
|
|||||||
|
dev-sht11_src = sht11.c sht11-sensor.c
|
@ -34,8 +34,8 @@
|
|||||||
|
|
||||||
#include "contiki.h"
|
#include "contiki.h"
|
||||||
#include "lib/sensors.h"
|
#include "lib/sensors.h"
|
||||||
#include "dev/sht11.h"
|
#include "dev/sht11/sht11.h"
|
||||||
#include "dev/sht11-sensor.h"
|
#include "dev/sht11/sht11-sensor.h"
|
||||||
|
|
||||||
const struct sensors_sensor sht11_sensor;
|
const struct sensors_sensor sht11_sensor;
|
||||||
|
|
@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
#include "contiki.h"
|
#include "contiki.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <dev/sht11.h>
|
#include "dev/sht11/sht11.h"
|
||||||
#include "sht11-arch.h"
|
#include "sht11-arch.h"
|
||||||
|
|
||||||
#define DEBUG 0
|
#define DEBUG 0
|
@ -39,7 +39,7 @@
|
|||||||
|
|
||||||
#include "contiki.h"
|
#include "contiki.h"
|
||||||
#include "dev/serial-line.h"
|
#include "dev/serial-line.h"
|
||||||
#include "dev/sht11.h"
|
#include "dev/sht11/sht11.h"
|
||||||
#include "lib/random.h"
|
#include "lib/random.h"
|
||||||
#include "net/rime.h"
|
#include "net/rime.h"
|
||||||
#include "net/rime/mesh.h"
|
#include "net/rime/mesh.h"
|
||||||
|
@ -75,7 +75,7 @@
|
|||||||
#include "dev/battery-sensor.h"
|
#include "dev/battery-sensor.h"
|
||||||
#endif
|
#endif
|
||||||
#if defined (PLATFORM_HAS_SHT11)
|
#if defined (PLATFORM_HAS_SHT11)
|
||||||
#include "dev/sht11-sensor.h"
|
#include "dev/sht11/sht11-sensor.h"
|
||||||
#endif
|
#endif
|
||||||
#if defined (PLATFORM_HAS_RADIO)
|
#if defined (PLATFORM_HAS_RADIO)
|
||||||
#include "dev/radio-sensor.h"
|
#include "dev/radio-sensor.h"
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
|
|
||||||
#include "contiki.h"
|
#include "contiki.h"
|
||||||
#include "dev/leds.h"
|
#include "dev/leds.h"
|
||||||
#include "dev/sht11-sensor.h"
|
#include "dev/sht11/sht11-sensor.h"
|
||||||
#include "jsontree.h"
|
#include "jsontree.h"
|
||||||
#include "json-ws.h"
|
#include "json-ws.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
|
|
||||||
#include "contiki.h"
|
#include "contiki.h"
|
||||||
#include "httpd-simple.h"
|
#include "httpd-simple.h"
|
||||||
#include "dev/sht11-sensor.h"
|
#include "dev/sht11/sht11-sensor.h"
|
||||||
#include "dev/light-sensor.h"
|
#include "dev/light-sensor.h"
|
||||||
#include "dev/leds.h"
|
#include "dev/leds.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
#include "contiki.h"
|
#include "contiki.h"
|
||||||
#include "lib/sensors.h"
|
#include "lib/sensors.h"
|
||||||
#include "dev/sht11-sensor.h"
|
#include "dev/sht11/sht11-sensor.h"
|
||||||
#include "slip-radio.h"
|
#include "slip-radio.h"
|
||||||
#include "cmd.h"
|
#include "cmd.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include "dev/battery-sensor.h"
|
#include "dev/battery-sensor.h"
|
||||||
#endif
|
#endif
|
||||||
#if defined (PLATFORM_HAS_SHT11)
|
#if defined (PLATFORM_HAS_SHT11)
|
||||||
#include "dev/sht11-sensor.h"
|
#include "dev/sht11/sht11-sensor.h"
|
||||||
#endif
|
#endif
|
||||||
#if defined (PLATFORM_HAS_LEDS)
|
#if defined (PLATFORM_HAS_LEDS)
|
||||||
#include "dev/leds.h"
|
#include "dev/leds.h"
|
||||||
|
@ -103,7 +103,7 @@ httpd_cgi_add(struct httpd_cgi_call *c)
|
|||||||
}
|
}
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
#if CONTIKI_TARGET_SKY
|
#if CONTIKI_TARGET_SKY
|
||||||
#include "dev/sht11-sensor.h"
|
#include "dev/sht11/sht11-sensor.h"
|
||||||
#include "dev/light-sensor.h"
|
#include "dev/light-sensor.h"
|
||||||
#endif /* CONTIKI_TARGET_SKY */
|
#endif /* CONTIKI_TARGET_SKY */
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
#include "cc2420.h"
|
#include "cc2420.h"
|
||||||
#include "dev/leds.h"
|
#include "dev/leds.h"
|
||||||
#include "dev/light.h"
|
#include "dev/light.h"
|
||||||
#include "dev/sht11.h"
|
#include "dev/sht11/sht11.h"
|
||||||
#include "dev/battery-sensor.h"
|
#include "dev/battery-sensor.h"
|
||||||
|
|
||||||
#include "net/rime/timesynch.h"
|
#include "net/rime/timesynch.h"
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
#include "dev/leds.h"
|
#include "dev/leds.h"
|
||||||
#include "dev/button-sensor.h"
|
#include "dev/button-sensor.h"
|
||||||
#include "dev/light-sensor.h"
|
#include "dev/light-sensor.h"
|
||||||
#include "dev/sht11-sensor.h"
|
#include "dev/sht11/sht11-sensor.h"
|
||||||
|
|
||||||
#include "cc2420.h"
|
#include "cc2420.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "contiki.h"
|
#include "contiki.h"
|
||||||
#include "dev/sht11.h"
|
#include "dev/sht11/sht11.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@
|
|||||||
|
|
||||||
#include "dev/battery-sensor.h"
|
#include "dev/battery-sensor.h"
|
||||||
#include "dev/button-sensor.h"
|
#include "dev/button-sensor.h"
|
||||||
#include "dev/sht11-sensor.h"
|
#include "dev/sht11/sht11-sensor.h"
|
||||||
|
|
||||||
SENSORS(&button_sensor);
|
SENSORS(&button_sensor);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user