From 7b35d6e0f0e8420df5e88784eac2a02ec2f2edb1 Mon Sep 17 00:00:00 2001
From: Leandro Lanzieri <leandro.lanzieri@haw-hamburg.de>
Date: Fri, 26 Nov 2021 15:04:40 +0100
Subject: [PATCH] drivers/sht1x: rework Kconfig

---
 drivers/sht1x/Kconfig              | 66 +++++++++++++++++++-----------
 tests/driver_sht1x/app.config.test |  1 +
 2 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/drivers/sht1x/Kconfig b/drivers/sht1x/Kconfig
index 11ded3b359..5adf5834f6 100644
--- a/drivers/sht1x/Kconfig
+++ b/drivers/sht1x/Kconfig
@@ -5,32 +5,52 @@
 # directory for more details.
 #
 
-if TEST_KCONFIG
-
-choice
-    bool "SHT10/SHT11/SHT15 Humidity and Temperature Sensor"
-    optional
-    depends on HAS_PERIPH_GPIO
-
-config MODULE_SHT10
-    bool "SHT10"
-    select MODULE_SHT1X
-
-config MODULE_SHT11
-    bool "SHT11"
-    select MODULE_SHT1X
-
-config MODULE_SHT15
-    bool "SHT15"
-    select MODULE_SHT1X
-
-endchoice
-
-config MODULE_SHT1X
+menuconfig MODULE_SHT1X
     bool
+    prompt "SHT10/SHT11/SHT15 Humidity and Temperature Sensor" if !(HAVE_SHT1X && MODULE_SAUL_DEFAULT)
+    default y if HAVE_SHT1X && MODULE_SAUL_DEFAULT
     depends on HAS_PERIPH_GPIO
     depends on TEST_KCONFIG
     select MODULE_PERIPH_GPIO
     select MODULE_XTIMER
 
-endif # TEST_KCONFIG
+choice
+    bool "Select sensor variant"
+    depends on MODULE_SHT1X
+    default MODULE_SHT10 if HAVE_SHT10
+    default MODULE_SHT11 if HAVE_SHT11
+    default MODULE_SHT15 if HAVE_SHT15
+
+config MODULE_SHT10
+    bool "SHT10"
+
+config MODULE_SHT11
+    bool "SHT11"
+
+config MODULE_SHT15
+    bool "SHT15"
+
+endchoice
+
+config HAVE_SHT10
+    bool
+    select HAVE_SHT1X
+    help
+      Indicates that an sht10 humidity and temperature sensor is present.
+
+config HAVE_SHT11
+    bool
+    select HAVE_SHT1X
+    help
+      Indicates that an sht11 humidity and temperature sensor is present.
+
+config HAVE_SHT15
+    bool
+    select HAVE_SHT1X
+    help
+      Indicates that an sht15 humidity and temperature sensor is present.
+
+config HAVE_SHT1X
+    bool
+    help
+      Indicates that an sht1x humidity and temperature sensor is present.
diff --git a/tests/driver_sht1x/app.config.test b/tests/driver_sht1x/app.config.test
index 77cb514afb..ef1de3576c 100644
--- a/tests/driver_sht1x/app.config.test
+++ b/tests/driver_sht1x/app.config.test
@@ -5,6 +5,7 @@
 CONFIG_MODULE_SAUL=y
 CONFIG_MODULE_SAUL_DEFAULT=y
 
+CONFIG_MODULE_SHT1X=y
 CONFIG_MODULE_SHT11=y
 
 CONFIG_MODULE_PS=y