diff --git a/drivers/Kconfig b/drivers/Kconfig index 86afd4ad577..7ac2f9e8875 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -27,8 +27,6 @@ source "drivers/timer/Kconfig" source "drivers/entropy/Kconfig" -source "drivers/grove/Kconfig" - source "drivers/pci/Kconfig" source "drivers/gpio/Kconfig" diff --git a/drivers/sensor/CMakeLists.txt b/drivers/sensor/CMakeLists.txt index 1bba222137e..ff72725cb8e 100644 --- a/drivers/sensor/CMakeLists.txt +++ b/drivers/sensor/CMakeLists.txt @@ -14,6 +14,7 @@ add_subdirectory_ifdef(CONFIG_CCS811 ccs811) add_subdirectory_ifdef(CONFIG_DHT dht) add_subdirectory_ifdef(CONFIG_FXAS21002 fxas21002) add_subdirectory_ifdef(CONFIG_FXOS8700 fxos8700) +add_subdirectory(grove) add_subdirectory_ifdef(CONFIG_HDC1008 hdc1008) add_subdirectory_ifdef(CONFIG_HMC5883L hmc5883l) add_subdirectory_ifdef(CONFIG_HP206C hp206c) diff --git a/drivers/sensor/Kconfig b/drivers/sensor/Kconfig index 812f433231f..dd4e7e5fb97 100644 --- a/drivers/sensor/Kconfig +++ b/drivers/sensor/Kconfig @@ -57,6 +57,8 @@ source "drivers/sensor/fxas21002/Kconfig" source "drivers/sensor/fxos8700/Kconfig" +source "drivers/sensor/grove/Kconfig" + source "drivers/sensor/hdc1008/Kconfig" source "drivers/sensor/hmc5883l/Kconfig" diff --git a/drivers/grove/CMakeLists.txt b/drivers/sensor/grove/CMakeLists.txt similarity index 100% rename from drivers/grove/CMakeLists.txt rename to drivers/sensor/grove/CMakeLists.txt diff --git a/drivers/grove/Kconfig b/drivers/sensor/grove/Kconfig similarity index 85% rename from drivers/grove/Kconfig rename to drivers/sensor/grove/Kconfig index 82ebddb0493..9c972c57115 100644 --- a/drivers/grove/Kconfig +++ b/drivers/sensor/grove/Kconfig @@ -5,26 +5,23 @@ # # SPDX-License-Identifier: Apache-2.0 # - - - +if SENSOR config GROVE_LIGHT_SENSOR bool "Enable the Seeed Grove Light Sensor" - depends on SENSOR && GROVE && ADC && NEWLIB_LIBC + depends on ADC && NEWLIB_LIBC help Setting this value will enable driver support for the Grove Light Sensor. +if GROVE_LIGHT_SENSOR config GROVE_LIGHT_SENSOR_NAME string "Driver name" - depends on GROVE_LIGHT_SENSOR default "GROVE_LIGHT_SENSOR" help Specify the device name with which the sensor is identified. config GROVE_LIGHT_SENSOR_ADC_DEV_NAME string "ADC where Grove Light Sensor is connected" - depends on GROVE_LIGHT_SENSOR default "ADC_0" help Specify the device name of the ADC to which the Grove Light Sensor @@ -32,22 +29,22 @@ config GROVE_LIGHT_SENSOR_ADC_DEV_NAME config GROVE_LIGHT_SENSOR_ADC_CHANNEL int "ADC channel used by Grove Light Sensor" - depends on GROVE_LIGHT_SENSOR default 10 help Specify the channel of the ADC to which the Grove Light Sensor is connected. +endif config GROVE_TEMPERATURE_SENSOR bool "Enable the Seeed Grove Temperature Sensor" - depends on SENSOR && GROVE && ADC && NEWLIB_LIBC + depends on ADC && NEWLIB_LIBC help Setting this value will enable driver support for the Grove Temperature Sensor. +if GROVE_TEMPERATURE_SENSOR config GROVE_TEMPERATURE_SENSOR_NAME string "Driver name" - depends on GROVE_TEMPERATURE_SENSOR default "GROVE_TEMPERATURE_SENSOR" help Specify the device name with which the Grove Temperature Sensor @@ -55,7 +52,6 @@ config GROVE_TEMPERATURE_SENSOR_NAME choice prompt "Sensor version" - depends on GROVE_TEMPERATURE_SENSOR default GROVE_TEMPERATURE_SENSOR_V1_0 help Choose the version of the Grove Temperature Sensor. @@ -74,7 +70,6 @@ endchoice config GROVE_TEMPERATURE_SENSOR_ADC_DEV_NAME string "ADC where Grove Temperature Sensor is connected" - depends on GROVE_TEMPERATURE_SENSOR default "ADC_0" help Specify the device name of the ADC to which the Grove Temperature @@ -82,8 +77,11 @@ config GROVE_TEMPERATURE_SENSOR_ADC_DEV_NAME config GROVE_TEMPERATURE_SENSOR_ADC_CHANNEL int "ADC channel used by Grove Temperature Sensor" - depends on GROVE_TEMPERATURE_SENSOR default 10 help Specify the channel of the ADC to which the Grove Temperature Sensor is connected. + +endif + +endif diff --git a/drivers/grove/light_sensor.c b/drivers/sensor/grove/light_sensor.c similarity index 98% rename from drivers/grove/light_sensor.c rename to drivers/sensor/grove/light_sensor.c index c57af863053..96b8f18d9c0 100644 --- a/drivers/grove/light_sensor.c +++ b/drivers/sensor/grove/light_sensor.c @@ -10,7 +10,7 @@ #include #include -#define LOG_LEVEL CONFIG_GROVE_LOG_LEVEL +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL #include LOG_MODULE_REGISTER(grove_light); diff --git a/drivers/grove/temperature_sensor.c b/drivers/sensor/grove/temperature_sensor.c similarity index 98% rename from drivers/grove/temperature_sensor.c rename to drivers/sensor/grove/temperature_sensor.c index 54934f89353..e0873778164 100644 --- a/drivers/grove/temperature_sensor.c +++ b/drivers/sensor/grove/temperature_sensor.c @@ -10,7 +10,7 @@ #include #include -#define LOG_LEVEL CONFIG_GROVE_LOG_LEVEL +#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL #include LOG_MODULE_REGISTER(grove_temp); diff --git a/samples/sensor/grove_light/prj.conf b/samples/sensor/grove_light/prj.conf index 19482d564d4..2bff9641d57 100644 --- a/samples/sensor/grove_light/prj.conf +++ b/samples/sensor/grove_light/prj.conf @@ -1,6 +1,5 @@ CONFIG_ADC=y CONFIG_GROVE_LIGHT_SENSOR=y -CONFIG_GROVE=y CONFIG_SENSOR=y CONFIG_NEWLIB_LIBC=y CONFIG_STDOUT_CONSOLE=y diff --git a/samples/sensor/grove_temperature/prj.conf b/samples/sensor/grove_temperature/prj.conf index 459063c652e..ef58dfe62b4 100644 --- a/samples/sensor/grove_temperature/prj.conf +++ b/samples/sensor/grove_temperature/prj.conf @@ -4,7 +4,6 @@ CONFIG_I2C=y CONFIG_ADC=y CONFIG_NEWLIB_LIBC=y CONFIG_DISPLAY=y -CONFIG_GROVE=y CONFIG_GROVE_TEMPERATURE_SENSOR_ADC_CHANNEL=10 CONFIG_GROVE_TEMPERATURE_SENSOR=y CONFIG_GROVE_TEMPERATURE_SENSOR_V1_X=y diff --git a/samples/sensor/th02/prj.conf b/samples/sensor/th02/prj.conf index cd80cf9c547..45d648eae4b 100644 --- a/samples/sensor/th02/prj.conf +++ b/samples/sensor/th02/prj.conf @@ -4,6 +4,5 @@ CONFIG_SENSOR=y CONFIG_TH02=y CONFIG_LOG=n CONFIG_SENSOR_LOG_LEVEL_DBG=y -CONFIG_GROVE=y CONFIG_GROVE_LCD_RGB=y CONFIG_DISPLAY=y