drivers/differential_pressure: remove lib/drivers/airspeed dependency…

… and cleanup - split ms4525_airspeed into separate ms4515 and ms4525 drivers
dagar · Apr 26, 2022 · f390f52 · f390f52
1 parent d1d15a6
commit f390f52
Show file tree

Hide file tree

Showing 50 changed files with 1,345 additions and 874 deletions.
diff --git a/ROMFS/px4fmu_common/init.d/rc.sensors b/ROMFS/px4fmu_common/init.d/rc.sensors
@@ -129,30 +129,36 @@ fi
 # Sensirion SDP3X differential pressure sensor external I2C
 if param compare -s SENS_EN_SDP3X 1
 then
-	if ! sdp3x_airspeed start -X
+	if ! sdp3x start -X
 	then
 		# try another common address
-		sdp3x_airspeed start -X -a 0x22
+		sdp3x start -X -a 0x22
 	fi
 fi
 
-# SHT3x temperature and hygrometer sensor, external I2C
-if param compare -s SENS_EN_SHT3X 1
+# TE MS4515 differential pressure sensor external I2C
+if param compare -s SENS_EN_MS4515 1
 then
-	sht3x start -X
-	sht3x start -X -a 0x45
+	ms4515 start -X
 fi
 
-# TE MS4525 differential pressure sensor external I2C
-if param compare -s SENS_EN_MS4525 1
+# TE MS4525DO differential pressure sensor external I2C
+if param compare -s SENS_EN_MS4525DO 1
 then
-	ms4525_airspeed start -X
+	ms4525do start -X
 fi
 
-# TE MS5525 differential pressure sensor external I2C
-if param compare -s SENS_EN_MS5525 1
+# TE MS5525DSO differential pressure sensor external I2C
+if param compare -s SENS_EN_MS5525DS 1
 then
-	ms5525_airspeed start -X
+	ms5525dso start -X
+fi
+
+# SHT3x temperature and hygrometer sensor, external I2C
+if param compare -s SENS_EN_SHT3X 1
+then
+	sht3x start -X
+	sht3x start -X -a 0x45
 fi
 
 # IR-LOCK sensor external I2C

diff --git a/ROMFS/px4fmu_test/init.d/rc.sensors b/ROMFS/px4fmu_test/init.d/rc.sensors
@@ -16,15 +16,15 @@ if board_adc start
 then
 fi
 
-if sdp3x_airspeed start -X
+if sdp3x start -X
 then
 fi
 
-if ms5525_airspeed start -X
+if ms5525dso start -X
 then
 fi
 
-if ms4525_airspeed start -X
+if ms4525do start -X
 then
 fi
 

diff --git a/boards/ark/cannode/init/rc.board_sensors b/boards/ark/cannode/init/rc.board_sensors
@@ -61,10 +61,10 @@ fi
 # Sensirion SDP3X differential pressure sensor external I2C
 if param compare -s SENS_EN_SDP3X 1
 then
-	if ! sdp3x_airspeed start -X
+	if ! sdp3x start -X
 	then
 		# try another common address
-		sdp3x_airspeed start -X -a 0x22
+		sdp3x start -X -a 0x22
 	fi
 fi
 
@@ -75,16 +75,16 @@ then
 	sht3x start -X -a 0x45
 fi
 
-# TE MS4525 differential pressure sensor external I2C
-if param compare -s SENS_EN_MS4525 1
+# TE MS4525DO differential pressure sensor external I2C
+if param compare -s SENS_EN_MS4525DO 1
 then
-	ms4525_airspeed start -X
+	ms4525do start -X
 fi
 
-# TE MS5525 differential pressure sensor external I2C
-if param compare -s SENS_EN_MS5525 1
+# TE MS5525DSO differential pressure sensor external I2C
+if param compare -s SENS_EN_MS5525DS 1
 then
-	ms5525_airspeed start -X
+	ms5525dso start -X
 fi
 
 # IR-LOCK sensor external I2C

diff --git a/boards/av/x-v1/init/rc.board_sensors b/boards/av/x-v1/init/rc.board_sensors
@@ -11,7 +11,7 @@ lps22hb -s start
 
 lsm303agr -s -R 4 start
 
-ms4525_airspeed -T 4515 -I -b 3 start
+ms4515 -I -b 3 start
 
 if ! param greater SENS_EN_PMW3901 0
 then

diff --git a/boards/px4/fmu-v2/fixedwing.px4board b/boards/px4/fmu-v2/fixedwing.px4board
@@ -4,7 +4,7 @@ CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=n
 CONFIG_MODULES_MC_POS_CONTROL=n
 CONFIG_MODULES_MC_RATE_CONTROL=n
 CONFIG_SYSTEMCMDS_BL_UPDATE=n
-CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_MS4525=y
+CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_MS4525DO=y
 CONFIG_DRIVERS_DISTANCE_SENSOR_LIGHTWARE_LASER_I2C=y
 CONFIG_DRIVERS_DISTANCE_SENSOR_LIGHTWARE_LASER_SERIAL=y
 CONFIG_DRIVERS_DISTANCE_SENSOR_LL40LS=y

diff --git a/posix-configs/rpi/pilotpi_fw.config b/posix-configs/rpi/pilotpi_fw.config
@@ -50,7 +50,7 @@ gps start -d /dev/ttySC0 -i uart -p ubx -s
 #ist8310 start -X
 
 # Airspeed
-ms4525_airspeed start -X
+ms4525do start -X
 
 rc_input start -d /dev/ttyAMA0
 

diff --git a/posix-configs/rpi/px4_fw.config b/posix-configs/rpi/px4_fw.config
@@ -33,7 +33,7 @@ board_adc start
 battery_status start
 
 gps start -d /dev/spidev0.0 -i spi -p ubx
-ms4525_airspeed start -X
+ms4525do start -X
 rc_update start
 sensors start
 commander start

diff --git a/src/drivers/differential_pressure/Kconfig b/src/drivers/differential_pressure/Kconfig
@@ -3,8 +3,9 @@ menu "Differential pressure"
         bool "Common differential pressure module's"
         default n
         select DRIVERS_DIFFERENTIAL_PRESSURE_ETS
-        select DRIVERS_DIFFERENTIAL_PRESSURE_MS4525
-        select DRIVERS_DIFFERENTIAL_PRESSURE_MS5525
+        select DRIVERS_DIFFERENTIAL_PRESSURE_MS4515
+        select DRIVERS_DIFFERENTIAL_PRESSURE_MS4525DO
+        select DRIVERS_DIFFERENTIAL_PRESSURE_MS5525DSO
         select DRIVERS_DIFFERENTIAL_PRESSURE_SDP3X
         ---help---
             Enable default set of differential pressure drivers

diff --git a/src/drivers/differential_pressure/ets/CMakeLists.txt b/src/drivers/differential_pressure/ets/CMakeLists.txt
@@ -1,6 +1,6 @@
 ############################################################################
 #
-#   Copyright (c) 2015 PX4 Development Team. All rights reserved.
+#   Copyright (c) 2015-2021 PX4 Development Team. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -31,11 +31,13 @@
 #
 ############################################################################
 px4_add_module(
-	MODULE drivers__ets_airspeed
+	MODULE drivers__differential_pressure__ets_airspeed
 	MAIN ets_airspeed
 	COMPILE_FLAGS
 	SRCS
-		ets_airspeed.cpp
+		ets_airspeed_main.cpp
+		ETSAirspeed.cpp
+		ETSAirspeed.hpp
 	DEPENDS
-		drivers__airspeed
+		px4_work_queue
 	)