From 0b00a02f812faa3c87eeb994b8af30c505e099b9 Mon Sep 17 00:00:00 2001 From: raiden00pl Date: Thu, 21 Sep 2023 09:33:57 +0200 Subject: [PATCH] sensors: add suffix _uorb to all sensors that use the new sensor framework This'll make it easier to identify sensors supporting the new sensor approach --- drivers/sensors/CMakeLists.txt | 32 ++++++++++++++----- drivers/sensors/Make.defs | 24 +++++++------- drivers/sensors/{bme680.c => bme680_uorb.c} | 2 +- drivers/sensors/{bmp280.c => bmp280_uorb.c} | 2 +- drivers/sensors/{ds18b20.c => ds18b20_uorb.c} | 2 +- .../{fakesensor.c => fakesensor_uorb.c} | 2 +- .../{goldfish_gps.c => goldfish_gps_uorb.c} | 2 +- drivers/sensors/{gps.c => gps_uorb.c} | 2 +- drivers/sensors/{hyt271.c => hyt271_uorb.c} | 2 +- drivers/sensors/{l3gd20.c => l3gd20_uorb.c} | 2 +- drivers/sensors/{ltr308.c => ltr308_uorb.c} | 2 +- drivers/sensors/{mpu9250.c => mpu9250_uorb.c} | 2 +- drivers/sensors/{ms5611.c => ms5611_uorb.c} | 2 +- .../sensors/{wtgahrs2.c => wtgahrs2_uorb.c} | 2 +- 14 files changed, 48 insertions(+), 32 deletions(-) rename drivers/sensors/{bme680.c => bme680_uorb.c} (99%) rename drivers/sensors/{bmp280.c => bmp280_uorb.c} (99%) rename drivers/sensors/{ds18b20.c => ds18b20_uorb.c} (99%) rename drivers/sensors/{fakesensor.c => fakesensor_uorb.c} (99%) rename drivers/sensors/{goldfish_gps.c => goldfish_gps_uorb.c} (99%) rename drivers/sensors/{gps.c => gps_uorb.c} (99%) rename drivers/sensors/{hyt271.c => hyt271_uorb.c} (99%) rename drivers/sensors/{l3gd20.c => l3gd20_uorb.c} (99%) rename drivers/sensors/{ltr308.c => ltr308_uorb.c} (99%) rename drivers/sensors/{mpu9250.c => mpu9250_uorb.c} (99%) rename drivers/sensors/{ms5611.c => ms5611_uorb.c} (99%) rename drivers/sensors/{wtgahrs2.c => wtgahrs2_uorb.c} (99%) diff --git a/drivers/sensors/CMakeLists.txt b/drivers/sensors/CMakeLists.txt index 0ff0c89e69..f471a3cbb8 100644 --- a/drivers/sensors/CMakeLists.txt +++ b/drivers/sensors/CMakeLists.txt @@ -29,12 +29,20 @@ if(CONFIG_SENSORS) list(APPEND SRCS sensor_rpmsg.c) endif() + if(CONFIG_SENSORS_GPS) + list(APPEND SRCS gps_uorb.c) + endif() + if(CONFIG_SENSORS_WTGAHRS2) - list(APPEND SRCS wtgahrs2.c) + list(APPEND SRCS wtgahrs2_uorb.c) endif() if(CONFIG_SENSORS_FAKESENSOR) - list(APPEND SRCS fakesensor.c) + list(APPEND SRCS fakesensor_uorb.c) + endif() + + if(CONFIG_SENSORS_GOLDFISH_GPS) + list(APPEND SRCS goldfish_gps_uorb.c) endif() if(CONFIG_SENSORS_HCSR04) @@ -78,7 +86,7 @@ if(CONFIG_SENSORS) endif() if(CONFIG_SENSORS_HYT271) - list(APPEND SRCS hyt271.c) + list(APPEND SRCS hyt271_uorb.c) endif() if(CONFIG_SENSORS_KXTJ9) @@ -134,11 +142,11 @@ if(CONFIG_SENSORS) endif() if(CONFIG_SENSORS_BMP280) - list(APPEND SRCS bmp280.c) + list(APPEND SRCS bmp280_uorb.c) endif() if(CONFIG_SENSORS_BME680) - list(APPEND SRCS bme680.c) + list(APPEND SRCS bme680_uorb.c) endif() if(CONFIG_SENSORS_ISL29023) @@ -178,7 +186,7 @@ if(CONFIG_SENSORS) endif() if(CONFIG_SENSORS_MS5611) - list(APPEND SRCS ms5611.c) + list(APPEND SRCS ms5611_uorb.c) endif() if(CONFIG_SENSORS_MS58XX) @@ -233,6 +241,10 @@ if(CONFIG_SENSORS) list(APPEND SRCS t67xx.c) endif() + if(CONFIG_SENSORS_LTR308) + list(APPEND SRCS ltr308_uorb.c) + endif() + endif() # CONFIG_I2C # These drivers depend on SPI support @@ -276,7 +288,7 @@ if(CONFIG_SENSORS) endif() if(CONFIG_SENSORS_L3GD20) - list(APPEND SRCS l3gd20.c) + list(APPEND SRCS l3gd20_uorb.c) endif() if(CONFIG_SENSORS_ADT7320) @@ -294,7 +306,7 @@ if(CONFIG_SENSORS) if(CONFIG_1WIRE) if(CONFIG_SENSORS_DS18B20) - list(APPEND SRCS ds18b20.c) + list(APPEND SRCS ds18b20_uorb.c) endif() endif() # CONFIG_1WIRE @@ -303,6 +315,10 @@ if(CONFIG_SENSORS) list(APPEND SRCS mpu60x0.c) endif() + if(CONFIG_SENSORS_MPU9250) + list(APPEND SRCS mpu9250_uorb.c) + endif() + # Quadrature encoder upper half if(CONFIG_SENSORS_QENCODER) diff --git a/drivers/sensors/Make.defs b/drivers/sensors/Make.defs index 1514994768..664d5c88be 100644 --- a/drivers/sensors/Make.defs +++ b/drivers/sensors/Make.defs @@ -33,19 +33,19 @@ CSRCS += sensor_rpmsg.c endif ifeq ($(CONFIG_SENSORS_GPS),y) - CSRCS += gps.c + CSRCS += gps_uorb.c endif ifeq ($(CONFIG_SENSORS_WTGAHRS2),y) - CSRCS += wtgahrs2.c + CSRCS += wtgahrs2_uorb.c endif ifeq ($(CONFIG_SENSORS_FAKESENSOR),y) - CSRCS += fakesensor.c + CSRCS += fakesensor_uorb.c endif ifeq ($(CONFIG_SENSORS_GOLDFISH_GPS),y) - CSRCS += goldfish_gps.c + CSRCS += goldfish_gps_uorb.c endif ifeq ($(CONFIG_SENSORS_HCSR04),y) @@ -93,7 +93,7 @@ ifeq ($(CONFIG_SENSORS_FXOS8700CQ),y) endif ifeq ($(CONFIG_SENSORS_HYT271),y) - CSRCS += hyt271.c + CSRCS += hyt271_uorb.c endif ifeq ($(CONFIG_SENSORS_KXTJ9),y) @@ -163,11 +163,11 @@ endif endif ifeq ($(CONFIG_SENSORS_BMP280),y) - CSRCS += bmp280.c + CSRCS += bmp280_uorb.c endif ifeq ($(CONFIG_SENSORS_BME680),y) - CSRCS += bme680.c + CSRCS += bme680_uorb.c endif ifeq ($(CONFIG_SENSORS_ISL29023),y) @@ -207,7 +207,7 @@ ifeq ($(CONFIG_SENSORS_MLX90614),y) endif ifeq ($(CONFIG_SENSORS_MS5611),y) - CSRCS += ms5611.c + CSRCS += ms5611_uorb.c endif ifeq ($(CONFIG_SENSORS_MS58XX),y) @@ -263,7 +263,7 @@ ifeq ($(CONFIG_SENSORS_T67XX),y) endif ifeq ($(CONFIG_SENSORS_LTR308),y) - CSRCS += ltr308.c + CSRCS += ltr308_uorb.c endif endif # CONFIG_I2C @@ -309,7 +309,7 @@ ifeq ($(CONFIG_SENSORS_LSM330SPI),y) endif ifeq ($(CONFIG_SENSORS_L3GD20),y) - CSRCS += l3gd20.c + CSRCS += l3gd20_uorb.c endif ifeq ($(CONFIG_SENSORS_ADT7320),y) @@ -327,7 +327,7 @@ endif # CONFIG_SPI ifeq ($(CONFIG_1WIRE),y) ifeq ($(CONFIG_SENSORS_DS18B20),y) - CSRCS += ds18b20.c + CSRCS += ds18b20_uorb.c endif endif # CONFIG_1WIRE @@ -337,7 +337,7 @@ ifeq ($(CONFIG_SENSORS_MPU60X0),y) endif ifeq ($(CONFIG_SENSORS_MPU9250),y) - CSRCS += mpu9250.c + CSRCS += mpu9250_uorb.c endif # Quadrature encoder upper half diff --git a/drivers/sensors/bme680.c b/drivers/sensors/bme680_uorb.c similarity index 99% rename from drivers/sensors/bme680.c rename to drivers/sensors/bme680_uorb.c index c43715db30..6392734e11 100644 --- a/drivers/sensors/bme680.c +++ b/drivers/sensors/bme680_uorb.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/sensors/bme680.c + * drivers/sensors/bme680_uorb.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/drivers/sensors/bmp280.c b/drivers/sensors/bmp280_uorb.c similarity index 99% rename from drivers/sensors/bmp280.c rename to drivers/sensors/bmp280_uorb.c index d169b63e16..7acdb664d9 100644 --- a/drivers/sensors/bmp280.c +++ b/drivers/sensors/bmp280_uorb.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/sensors/bmp280.c + * drivers/sensors/bmp280_uorb.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/drivers/sensors/ds18b20.c b/drivers/sensors/ds18b20_uorb.c similarity index 99% rename from drivers/sensors/ds18b20.c rename to drivers/sensors/ds18b20_uorb.c index 835e001b76..62b7a1f887 100644 --- a/drivers/sensors/ds18b20.c +++ b/drivers/sensors/ds18b20_uorb.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/sensors/ds18b20.c + * drivers/sensors/ds18b20_uorb.c * Character driver for DS18B20 Digital Humidity and Temperature Module. * * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/drivers/sensors/fakesensor.c b/drivers/sensors/fakesensor_uorb.c similarity index 99% rename from drivers/sensors/fakesensor.c rename to drivers/sensors/fakesensor_uorb.c index 12b54ab804..a56bc1bf6e 100644 --- a/drivers/sensors/fakesensor.c +++ b/drivers/sensors/fakesensor_uorb.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/sensors/fakesensor.c + * drivers/sensors/fakesensor_uorb.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/drivers/sensors/goldfish_gps.c b/drivers/sensors/goldfish_gps_uorb.c similarity index 99% rename from drivers/sensors/goldfish_gps.c rename to drivers/sensors/goldfish_gps_uorb.c index e8a66eee82..e43520d511 100644 --- a/drivers/sensors/goldfish_gps.c +++ b/drivers/sensors/goldfish_gps_uorb.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/sensors/goldfish_gps.c + * drivers/sensors/goldfish_gps_uorb.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/drivers/sensors/gps.c b/drivers/sensors/gps_uorb.c similarity index 99% rename from drivers/sensors/gps.c rename to drivers/sensors/gps_uorb.c index 578ffa9a84..5ea9de865e 100644 --- a/drivers/sensors/gps.c +++ b/drivers/sensors/gps_uorb.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/sensors/gps.c + * drivers/sensors/gps_uorb.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/drivers/sensors/hyt271.c b/drivers/sensors/hyt271_uorb.c similarity index 99% rename from drivers/sensors/hyt271.c rename to drivers/sensors/hyt271_uorb.c index 4b785f6a09..7e3591eb3c 100644 --- a/drivers/sensors/hyt271.c +++ b/drivers/sensors/hyt271_uorb.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/sensors/hyt271.c + * drivers/sensors/hyt271_uorb.c * Character driver for HYT271 Digital Humidity and Temperature Module. * * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/drivers/sensors/l3gd20.c b/drivers/sensors/l3gd20_uorb.c similarity index 99% rename from drivers/sensors/l3gd20.c rename to drivers/sensors/l3gd20_uorb.c index 1a356420df..dee3de464b 100644 --- a/drivers/sensors/l3gd20.c +++ b/drivers/sensors/l3gd20_uorb.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/sensors/l3gd20.c + * drivers/sensors/l3gd20_uorb.c * Character driver for the ST L3GD20 3-Axis gyroscope. * * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/drivers/sensors/ltr308.c b/drivers/sensors/ltr308_uorb.c similarity index 99% rename from drivers/sensors/ltr308.c rename to drivers/sensors/ltr308_uorb.c index 4f32e01679..783e368b08 100644 --- a/drivers/sensors/ltr308.c +++ b/drivers/sensors/ltr308_uorb.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/sensors/ltr308.c + * drivers/sensors/ltr308_uorb.c * Character driver for the LTR-308ALS-01 Lite-On ambient light sensor. * * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/drivers/sensors/mpu9250.c b/drivers/sensors/mpu9250_uorb.c similarity index 99% rename from drivers/sensors/mpu9250.c rename to drivers/sensors/mpu9250_uorb.c index b74d5f440c..50db5e695c 100644 --- a/drivers/sensors/mpu9250.c +++ b/drivers/sensors/mpu9250_uorb.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/sensors/mpu9250.c + * drivers/sensors/mpu9250_uorb.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/drivers/sensors/ms5611.c b/drivers/sensors/ms5611_uorb.c similarity index 99% rename from drivers/sensors/ms5611.c rename to drivers/sensors/ms5611_uorb.c index 9a9cc1bb3c..8c9d33c95d 100644 --- a/drivers/sensors/ms5611.c +++ b/drivers/sensors/ms5611_uorb.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/sensors/ms5611.c + * drivers/sensors/ms5611_uorb.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/drivers/sensors/wtgahrs2.c b/drivers/sensors/wtgahrs2_uorb.c similarity index 99% rename from drivers/sensors/wtgahrs2.c rename to drivers/sensors/wtgahrs2_uorb.c index 337ea9cb00..1f46b30638 100644 --- a/drivers/sensors/wtgahrs2.c +++ b/drivers/sensors/wtgahrs2_uorb.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/sensors/wtgahrs2.c + * drivers/sensors/wtgahrs2_uorb.c * Driver for the Wit-Motion WTGAHRS2 accelerometer, gyroscope, magnetic, * angle, barometer, temperature, gps sensors by serial interface with host *