Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 18:47:21 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

meas_airspeed rename to ms4525_airspeed

Browse Source
This commit is contained in:
Daniel Agar
2017-06-15 20:39:24 -04:00
parent 7029be87c0
commit 73d9358b1d
14 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/configs/nuttx_aerocore2_default.cmake
+1 -1
View File
@@ -25,7 +25,7 @@ set(config_module_list
drivers/pwm_out_sim drivers/pwm_out_sim
drivers/airspeed drivers/airspeed
drivers/ets_airspeed drivers/ets_airspeed
drivers/meas_airspeed drivers/ms4525_airspeed
drivers/ms5525_airspeed drivers/ms5525_airspeed
#drivers/frsky_telemetry #drivers/frsky_telemetry
modules/sensors modules/sensors
cmake/configs/nuttx_auav-x21_default.cmake
+1 -1
View File
@@ -37,7 +37,7 @@ set(config_module_list
drivers/blinkm drivers/blinkm
drivers/airspeed drivers/airspeed
drivers/ets_airspeed drivers/ets_airspeed
drivers/meas_airspeed drivers/ms4525_airspeed
drivers/ms5525_airspeed drivers/ms5525_airspeed
drivers/frsky_telemetry drivers/frsky_telemetry
modules/sensors modules/sensors
cmake/configs/nuttx_mindpx-v2_default.cmake
+1 -1
View File
@@ -40,7 +40,7 @@ set(config_module_list
drivers/blinkm drivers/blinkm
drivers/airspeed drivers/airspeed
drivers/ets_airspeed drivers/ets_airspeed
drivers/meas_airspeed drivers/ms4525_airspeed
drivers/ms5525_airspeed drivers/ms5525_airspeed
drivers/frsky_telemetry drivers/frsky_telemetry
modules/sensors modules/sensors
cmake/configs/nuttx_px4fmu-v1_default.cmake
+1 -1
View File
@@ -35,7 +35,7 @@ set(config_module_list
drivers/blinkm drivers/blinkm
drivers/airspeed drivers/airspeed
drivers/ets_airspeed drivers/ets_airspeed
drivers/meas_airspeed drivers/ms4525_airspeed
drivers/ms5525_airspeed drivers/ms5525_airspeed
drivers/frsky_telemetry drivers/frsky_telemetry
modules/sensors modules/sensors
cmake/configs/nuttx_px4fmu-v2_default.cmake
+1 -1
View File
@@ -39,7 +39,7 @@ set(config_module_list
drivers/airspeed drivers/airspeed
drivers/sdp3x_airspeed drivers/sdp3x_airspeed
drivers/ets_airspeed drivers/ets_airspeed
drivers/meas_airspeed drivers/ms4525_airspeed
drivers/ms5525_airspeed drivers/ms5525_airspeed
drivers/frsky_telemetry drivers/frsky_telemetry
modules/sensors modules/sensors
cmake/configs/nuttx_px4fmu-v2_test.cmake
+1 -1
View File
@@ -38,7 +38,7 @@ set(config_module_list
drivers/blinkm drivers/blinkm
drivers/airspeed drivers/airspeed
drivers/ets_airspeed drivers/ets_airspeed
drivers/meas_airspeed drivers/ms4525_airspeed
drivers/ms5525_airspeed drivers/ms5525_airspeed
drivers/frsky_telemetry drivers/frsky_telemetry
modules/sensors modules/sensors
cmake/configs/nuttx_px4fmu-v3_default.cmake
+1 -1
View File
@@ -32,7 +32,7 @@ set(config_module_list
drivers/ll40ls drivers/ll40ls
drivers/lsm303d drivers/lsm303d
drivers/mb12xx drivers/mb12xx
drivers/meas_airspeed drivers/ms4525_airspeed
drivers/ms5525_airspeed drivers/ms5525_airspeed
drivers/mkblctrl drivers/mkblctrl
drivers/mpu6000 drivers/mpu6000
cmake/configs/nuttx_px4fmu-v4_default.cmake
+1 -1
View File
@@ -37,7 +37,7 @@ set(config_module_list
drivers/blinkm drivers/blinkm
drivers/airspeed drivers/airspeed
drivers/ets_airspeed drivers/ets_airspeed
drivers/meas_airspeed drivers/ms4525_airspeed
drivers/ms5525_airspeed drivers/ms5525_airspeed
drivers/frsky_telemetry drivers/frsky_telemetry
modules/sensors modules/sensors
cmake/configs/nuttx_px4fmu-v4pro_default.cmake
+1 -1
View File
@@ -33,7 +33,7 @@ set(config_module_list
drivers/ll40ls drivers/ll40ls
drivers/lsm303d drivers/lsm303d
drivers/mb12xx drivers/mb12xx
drivers/meas_airspeed drivers/ms4525_airspeed
drivers/ms5525_airspeed drivers/ms5525_airspeed
drivers/mkblctrl drivers/mkblctrl
drivers/mpu6000 drivers/mpu6000
cmake/configs/nuttx_px4fmu-v5_default.cmake
+1 -1
View File
@@ -32,7 +32,7 @@ set(config_module_list
drivers/lis3mdl drivers/lis3mdl
drivers/ll40ls drivers/ll40ls
drivers/mb12xx drivers/mb12xx
drivers/meas_airspeed drivers/ms4525_airspeed
drivers/ms5525_airspeed drivers/ms5525_airspeed
drivers/mkblctrl drivers/mkblctrl
drivers/mpu6000 drivers/mpu6000
cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
+1 -1
View File
@@ -35,7 +35,7 @@ set(config_module_list
drivers/blinkm drivers/blinkm
drivers/airspeed drivers/airspeed
drivers/ets_airspeed drivers/ets_airspeed
drivers/meas_airspeed drivers/ms4525_airspeed
drivers/ms5525_airspeed drivers/ms5525_airspeed
drivers/frsky_telemetry drivers/frsky_telemetry
modules/sensors modules/sensors
cmake/configs/nuttx_tap-v1_default.cmake
+1 -1
View File
@@ -24,7 +24,7 @@ set(config_module_list
drivers/hmc5883 drivers/hmc5883
drivers/gps drivers/gps
drivers/airspeed drivers/airspeed
drivers/meas_airspeed drivers/ms4525_airspeed
drivers/ms5525_airspeed drivers/ms5525_airspeed
modules/sensors modules/sensors
drivers/vmount drivers/vmount
src/drivers/meas_airspeed/CMakeLists.txt → src/drivers/ms4525_airspeed/CMakeLists.txt
+3 -3
View File
@@ -31,12 +31,12 @@
# #
############################################################################ ############################################################################
px4_add_module( px4_add_module(
MODULE drivers__meas_airspeed MODULE drivers__ms4525_airspeed
MAIN meas_airspeed MAIN ms4525_airspeed
STACK_MAIN 1200 STACK_MAIN 1200
COMPILE_FLAGS COMPILE_FLAGS
SRCS SRCS
meas_airspeed.cpp ms4525_airspeed.cpp
DEPENDS DEPENDS
platforms__common platforms__common
) )
src/drivers/meas_airspeed/meas_airspeed.cpp → src/drivers/ms4525_airspeed/ms4525_airspeed.cpp
+8 -2
View File
@@ -131,7 +131,7 @@ protected:
/* /*
* Driver 'main' command. * Driver 'main' command.
*/ */
extern "C" __EXPORT int meas_airspeed_main(int argc, char *argv[]); extern "C" __EXPORT int ms4525_airspeed_main(int argc, char *argv[]);
MEASAirspeed::MEASAirspeed(int bus, int address, const char *path) : Airspeed(bus, address, MEASAirspeed::MEASAirspeed(int bus, int address, const char *path) : Airspeed(bus, address,
CONVERSION_INTERVAL, path), CONVERSION_INTERVAL, path),
@@ -436,6 +436,12 @@ start(int i2c_bus)
goto fail; goto fail;
} }
/* both versions failed if the init for the MS5525DSO fails, give up */
if (OK != g_dev->Airspeed::init()) {
PX4_WARN("init fail");
goto fail;
}
/* set the poll rate to default, starts automatic data collection */ /* set the poll rate to default, starts automatic data collection */
fd = open(PATH_MS4525, O_RDONLY); fd = open(PATH_MS4525, O_RDONLY);
@@ -596,7 +602,7 @@ meas_airspeed_usage()
} }
int int
meas_airspeed_main(int argc, char *argv[]) ms4525_airspeed_main(int argc, char *argv[])
{ {
int i2c_bus = PX4_I2C_BUS_DEFAULT; int i2c_bus = PX4_I2C_BUS_DEFAULT;