Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup

src/drivers/ets_airspeed/ets_airspeed.cpp

@@ -383,6 +383,10 @@ test()
 		warnx("diff pressure: %d pa", report.differential_pressure_pa);
 	}
 
+	/* reset the sensor polling to its default rate */
+	if (OK != ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT))
+		errx(1, "failed to set default rate");
+
 	errx(0, "PASS");
 }
 

src/drivers/meas_airspeed/meas_airspeed.cpp

@@ -415,6 +415,10 @@ test()
 		warnx("temperature: %d C (0x%02x)", (int)report.temperature, (unsigned) report.temperature);
 	}
 
+	/* reset the sensor polling to its default rate */
+	if (OK != ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT))
+		errx(1, "failed to set default rate");
+
 	errx(0, "PASS");
 }