meas_airspeed rename to ms4525_airspeed

src/drivers/ms4525_airspeed/CMakeLists.txt

@@ -31,12 +31,12 @@
 #
 ############################################################################
 px4_add_module(
-	MODULE drivers__meas_airspeed
-	MAIN meas_airspeed
+	MODULE drivers__ms4525_airspeed
+	MAIN ms4525_airspeed
 	STACK_MAIN 1200
 	COMPILE_FLAGS
 	SRCS
-		meas_airspeed.cpp
+		ms4525_airspeed.cpp
 	DEPENDS
 		platforms__common
 	)

src/drivers/ms4525_airspeed/ms4525_airspeed.cpp

@@ -131,7 +131,7 @@ protected:
 /*
  * 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,
 			CONVERSION_INTERVAL, path),
@@ -436,6 +436,12 @@ start(int i2c_bus)
 		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 */
 	fd = open(PATH_MS4525, O_RDONLY);
 
@@ -596,7 +602,7 @@ meas_airspeed_usage()
 }
 
 int
-meas_airspeed_main(int argc, char *argv[])
+ms4525_airspeed_main(int argc, char *argv[])
 {
 	int i2c_bus = PX4_I2C_BUS_DEFAULT;