Merge pull request RIOT-OS#9317 from maribu/sht1x

drivers/sht11: Major refactoring

boards/common/msb-430/Makefile

@@ -1,5 +1,3 @@
 MODULE = boards_common_msb-430
 
-DIRS = drivers
-
 include $(RIOTBASE)/Makefile.base

boards/common/msb-430/Makefile.include

@@ -25,6 +25,3 @@ export DEBUGGER_FLAGS = --tui --ex="target remote localhost:2000" --ex "monitor
 
 # export common msb-430 includes
 export INCLUDES += -I$(RIOTBOARD)/common/msb-430/include
-export INCLUDES += -I$(RIOTBOARD)/common/msb-430/drivers/include
-
-USEMODULE += boards_common_msb-430-drivers

boards/common/msba2/Makefile

@@ -1,5 +1,3 @@
 MODULE = boards_common_msba2
 
-DIRS = drivers
-
 include $(RIOTBASE)/Makefile.base

boards/common/msba2/Makefile.include

@@ -27,8 +27,5 @@ endif
 export FFLAGS = $(PORT) $(HEXFILE)
 
 INCLUDES += -I$(RIOTBOARD)/common/msba2/include
-INCLUDES += -I$(RIOTBOARD)/common/msba2/drivers/include
 
 export UNDEF += $(BINDIR)/cpu/startup.o
-
-USEMODULE += boards_common_msba2-drivers

boards/msb-430/Makefile.dep

@@ -0,0 +1,3 @@
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += sht11
+endif

boards/msb-430/include/board.h

@@ -59,6 +59,14 @@ extern "C" {
 #define MSP430_HAS_EXTERNAL_CRYSTAL 0
 /** @} */
 
+/**
+ * @name   Configure on-board SHT11 device
+ * @{
+ */
+#define SHT1X_PARAM_CLK             (GPIO_PIN(3, 5))
+#define SHT1X_PARAM_DATA            (GPIO_PIN(3, 4))
+/** @} */
+
 #ifdef __cplusplus
 }
 #endif

boards/msb-430h/Makefile.dep

@@ -0,0 +1,3 @@
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += sht11
+endif

boards/msb-430h/include/board.h

@@ -47,6 +47,14 @@ extern "C" {
 #define MSP430_HAS_EXTERNAL_CRYSTAL 1
 /** @} */
 
+/**
+ * @name   Configure on-board SHT11 device
+ * @{
+ */
+#define SHT1X_PARAM_CLK             (GPIO_PIN(3, 5))
+#define SHT1X_PARAM_DATA            (GPIO_PIN(3, 4))
+/** @} */
+
 #ifdef __cplusplus
 }
 #endif

boards/msba2/Makefile.dep

@@ -3,3 +3,7 @@ include $(RIOTBOARD)/common/msba2/Makefile.dep
 ifneq (,$(filter netdev_default gnrc_netdev_default,$(USEMODULE)))
   USEMODULE += cc110x
 endif
+
+ifneq (,$(filter saul_default,$(USEMODULE)))
+  USEMODULE += sht11
+endif

drivers/Makefile.dep

@@ -307,7 +307,9 @@ ifneq (,$(filter servo,$(USEMODULE)))
   FEATURES_REQUIRED += periph_pwm
 endif
 
-ifneq (,$(filter sht11,$(USEMODULE)))
+ifneq (,$(filter sht1%,$(USEMODULE)))
+  USEMODULE += sht1x
+  FEATURES_REQUIRED += periph_gpio
   USEMODULE += xtimer
 endif
 

drivers/Makefile.include

@@ -50,6 +50,10 @@ ifneq (,$(filter dht,$(USEMODULE)))
   USEMODULE_INCLUDES += $(RIOTBASE)/drivers/dht/include
 endif
 
+ifneq (,$(filter sht1x,$(USEMODULE)))
+  USEMODULE_INCLUDES += $(RIOTBASE)/drivers/sht1x/include
+endif
+
 ifneq (,$(filter ds1307,$(USEMODULE)))
   USEMODULE_INCLUDES += $(RIOTBASE)/drivers/ds1307/include
 endif