diff --git a/bsp/stm32/stm32f412-st-nucleo/.ci/attachconfig/rtduino/sensors-adafruit.attach b/bsp/stm32/stm32f412-st-nucleo/.ci/attachconfig/rtduino/sensors-adafruit.attach index 25ba91a147..b5002c4246 100644 --- a/bsp/stm32/stm32f412-st-nucleo/.ci/attachconfig/rtduino/sensors-adafruit.attach +++ b/bsp/stm32/stm32f412-st-nucleo/.ci/attachconfig/rtduino/sensors-adafruit.attach @@ -14,6 +14,7 @@ CONFIG_PKG_USING_ARDUINO_ADAFRUIT_MAX6675=y CONFIG_PKG_USING_ARDUINO_ADAFRUIT_MLX90614=y CONFIG_PKG_USING_ARDUINO_ADAFRUIT_LSM9DS1=y CONFIG_PKG_USING_ARDUINO_ADAFRUIT_AHTX0=y +CONFIG_ARDUINO_ADAFRUIT_AHTX0_USING_SENSOR_DEVICE=y CONFIG_PKG_USING_ARDUINO_ADAFRUIT_LSM9DS0=y CONFIG_PKG_USING_ARDUINO_ADAFRUIT_BMP280=y CONFIG_PKG_USING_ARDUINO_ADAFRUIT_ADT7410=y diff --git a/components/drivers/Kconfig b/components/drivers/Kconfig index 4a8a3e5c8a..486dae6525 100755 --- a/components/drivers/Kconfig +++ b/components/drivers/Kconfig @@ -557,9 +557,9 @@ config RT_USING_SENSOR default n if RT_USING_SENSOR - # config RT_USING_SENSOR_V2 - # bool "Enable Sensor Framework v2" - # default n + config RT_USING_SENSOR_V2 + bool "Enable Sensor Framework v2" + default n config RT_USING_SENSOR_CMD bool "Using Sensor cmd" diff --git a/components/drivers/sensor/SConscript b/components/drivers/sensor/SConscript index 4c815c49b8..59f0a0b792 100644 --- a/components/drivers/sensor/SConscript +++ b/components/drivers/sensor/SConscript @@ -1,15 +1,19 @@ -# RT-Thread building script for bridge +# SConscript for sensor framework -import os from building import * +import os -cwd = GetCurrentDir() -objs = [] -list = os.listdir(cwd) +src = [] -for d in list: - path = os.path.join(cwd, d) - if os.path.isfile(os.path.join(path, 'SConscript')): - objs = objs + SConscript(os.path.join(d, 'SConscript')) +if GetDepend('RT_USING_SENSOR_V2'): + src += [os.path.join('v2', 'sensor.c')] + if GetDepend('RT_USING_SENSOR_CMD'): + src += [os.path.join('v2', 'sensor_cmd.c')] +else: + src += [os.path.join('v1', 'sensor.c')] + if GetDepend('RT_USING_SENSOR_CMD'): + src += [os.path.join('v1', 'sensor_cmd.c')] -Return('objs') +group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_SENSOR']) + +Return('group') diff --git a/components/drivers/sensor/v1/SConscript b/components/drivers/sensor/v1/SConscript deleted file mode 100644 index 1aa7831ffe..0000000000 --- a/components/drivers/sensor/v1/SConscript +++ /dev/null @@ -1,12 +0,0 @@ -# SConscript for sensor framework - -from building import * - -src = ['sensor.c'] - -if GetDepend('RT_USING_SENSOR_CMD'): - src += ['sensor_cmd.c'] - -group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_SENSOR']) - -Return('group') diff --git a/components/drivers/sensor/v2/SConscript b/components/drivers/sensor/v2/SConscript deleted file mode 100644 index 872b2cebaf..0000000000 --- a/components/drivers/sensor/v2/SConscript +++ /dev/null @@ -1,12 +0,0 @@ -# SConscript for sensor framework - -from building import * - -src = ['sensor_v2.c'] - -if GetDepend('RT_USING_SENSOR_CMD'): - src += ['sensor_cmd.c'] - -group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_SENSOR_V2']) - -Return('group') diff --git a/components/drivers/sensor/v2/sensor_v2.c b/components/drivers/sensor/v2/sensor.c similarity index 100% rename from components/drivers/sensor/v2/sensor_v2.c rename to components/drivers/sensor/v2/sensor.c