zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

differential pressure sensors delete test helpers 

- these are redundant with listener differential_pressure
sbg
Daniel Agar 7 years ago committed by Lorenz Meier
parent
b9081fb0ab
commit
1290db7cb7
4 changed files with 4 additions and 310 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 80
      src/drivers/differential_pressure/ets/ets_airspeed.cpp
  2. 82
      src/drivers/differential_pressure/ms4525/ms4525_airspeed.cpp
  3. 76
      src/drivers/differential_pressure/ms5525/MS5525_main.cpp
  4. 76
      src/drivers/differential_pressure/sdp3x/SDP3X_main.cpp

80
src/drivers/differential_pressure/ets/ets_airspeed.cpp
Unescape View File

@ -240,7 +240,6 @@ ETSAirspeed *g_dev;
int start(int i2c_bus); int start(int i2c_bus);
int stop(); int stop();
int test();
int reset(); int reset();
int info(); int info();
@ -314,76 +313,6 @@ stop()
return PX4_OK; return PX4_OK;
} }
/**
* Perform some basic functional tests on the driver;
* make sure we can collect data from the sensor in polled
* and automatic modes.
*/
int
test()
{
struct differential_pressure_s report;
ssize_t sz;
int ret;
int fd = px4_open(ETS_PATH, O_RDONLY);
if (fd < 0) {
PX4_ERR("%s open failed (try 'ets_airspeed start' if the driver is not running", ETS_PATH);
return PX4_ERROR;
}
/* do a simple demand read */
sz = px4_read(fd, &report, sizeof(report));
if (sz != sizeof(report)) {
PX4_ERR("immediate read failed");
return PX4_ERROR;
}
PX4_INFO("single read");
PX4_INFO("diff pressure: %d pa", (int)report.differential_pressure_filtered_pa);
/* start the sensor polling at 2Hz */
if (OK != px4_ioctl(fd, SENSORIOCSPOLLRATE, 2)) {
PX4_ERR("failed to set 2Hz poll rate");
return PX4_ERROR;
}
/* read the sensor 5x and report each value */
for (unsigned i = 0; i < 5; i++) {
px4_pollfd_struct_t fds;
/* wait for data to be ready */
fds.fd = fd;
fds.events = POLLIN;
ret = px4_poll(&fds, 1, 2000);
if (ret != 1) {
PX4_ERR("timed out waiting for sensor data");
return PX4_ERROR;
}
/* now go get it */
sz = px4_read(fd, &report, sizeof(report));
if (sz != sizeof(report)) {
PX4_ERR("periodic read failed");
}
PX4_INFO("periodic read %u", i);
PX4_INFO("diff pressure: %f pa", (double)report.differential_pressure_filtered_pa);
}
/* reset the sensor polling to its default rate */
if (OK != px4_ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT)) {
PX4_ERR("failed to set default rate");
return PX4_ERROR;
}
return PX4_OK;
}
/** /**
* Reset the driver. * Reset the driver.
*/ */
@ -420,7 +349,7 @@ ets_airspeed_usage()
PX4_INFO("options:"); PX4_INFO("options:");
PX4_INFO("\t-b --bus i2cbus (%d)", PX4_I2C_BUS_DEFAULT); PX4_INFO("\t-b --bus i2cbus (%d)", PX4_I2C_BUS_DEFAULT);
PX4_INFO("command:"); PX4_INFO("command:");
PX4_INFO("\tstart|stop|reset|test|info"); PX4_INFO("\tstart|stop|reset|info");
} }
int int
@ -452,13 +381,6 @@ ets_airspeed_main(int argc, char *argv[])
return ets_airspeed::stop(); return ets_airspeed::stop();
} }
/*
* Test the driver/device.
*/
if (!strcmp(argv[1], "test")) {
return ets_airspeed::test();
}
/* /*
* Reset the driver. * Reset the driver.
*/ */

82
src/drivers/differential_pressure/ms4525/ms4525_airspeed.cpp
Unescape View File

@ -376,7 +376,6 @@ MEASAirspeed *g_dev = nullptr;
int start(int i2c_bus); int start(int i2c_bus);
int stop(); int stop();
int test();
int reset(); int reset();
/** /**
@ -450,78 +449,6 @@ stop()
return PX4_OK; return PX4_OK;
} }
/**
* Perform some basic functional tests on the driver;
* make sure we can collect data from the sensor in polled
* and automatic modes.
*/
int
test()
{
struct differential_pressure_s report;
ssize_t sz;
int ret;
int fd = px4_open(PATH_MS4525, O_RDONLY);
if (fd < 0) {
PX4_ERR("%s open failed (try 'meas_airspeed start' if the driver is not running", PATH_MS4525);
return PX4_ERROR;
}
/* do a simple demand read */
sz = px4_read(fd, &report, sizeof(report));
if (sz != sizeof(report)) {
PX4_ERR("immediate read failed");
return PX4_ERROR;
}
PX4_INFO("single read");
PX4_INFO("diff pressure: %d pa", (int)report.differential_pressure_filtered_pa);
/* start the sensor polling at 2Hz */
if (OK != px4_ioctl(fd, SENSORIOCSPOLLRATE, 2)) {
PX4_ERR("failed to set 2Hz poll rate");
return PX4_ERROR;
}
/* read the sensor 5x and report each value */
for (unsigned i = 0; i < 5; i++) {
px4_pollfd_struct_t fds;
/* wait for data to be ready */
fds.fd = fd;
fds.events = POLLIN;
ret = px4_poll(&fds, 1, 2000);
if (ret != 1) {
PX4_ERR("timed out waiting for sensor data");
return PX4_ERROR;
}
/* now go get it */
sz = px4_read(fd, &report, sizeof(report));
if (sz != sizeof(report)) {
PX4_ERR("periodic read failed");
return PX4_ERROR;
}
PX4_INFO("periodic read %u", i);
PX4_INFO("diff pressure: %d pa", (int)report.differential_pressure_filtered_pa);
PX4_INFO("temperature: %d C (0x%02x)", (int)report.temperature, (unsigned) report.temperature);
}
/* reset the sensor polling to its default rate */
if (OK != px4_ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT)) {
PX4_ERR("failed to set default rate");
return PX4_ERROR;
}
return PX4_OK;
}
/** /**
* Reset the driver. * Reset the driver.
*/ */
@ -558,7 +485,7 @@ meas_airspeed_usage()
PX4_INFO("options:"); PX4_INFO("options:");
PX4_INFO("\t-b --bus i2cbus (%d)", PX4_I2C_BUS_DEFAULT); PX4_INFO("\t-b --bus i2cbus (%d)", PX4_I2C_BUS_DEFAULT);
PX4_INFO("command:"); PX4_INFO("command:");
PX4_INFO("\tstart|stop|reset|test"); PX4_INFO("\tstart|stop|reset");
} }
int int
@ -590,13 +517,6 @@ ms4525_airspeed_main(int argc, char *argv[])
return meas_airspeed::stop(); return meas_airspeed::stop();
} }
/*
* Test the driver/device.
*/
if (!strcmp(argv[1], "test")) {
return meas_airspeed::test();
}
/* /*
* Reset the driver. * Reset the driver.
*/ */

76
src/drivers/differential_pressure/ms5525/MS5525_main.cpp
Unescape View File

@ -43,7 +43,6 @@ MS5525 *g_dev = nullptr;
int start(uint8_t i2c_bus); int start(uint8_t i2c_bus);
int stop(); int stop();
int test();
int reset(); int reset();
// Start the driver. // Start the driver.
@ -111,72 +110,6 @@ int stop()
return PX4_OK; return PX4_OK;
} }
// perform some basic functional tests on the driver;
// make sure we can collect data from the sensor in polled
// and automatic modes.
int test()
{
int fd = px4_open(PATH_MS5525, O_RDONLY);
if (fd < 0) {
PX4_WARN("%s open failed (try 'ms5525_airspeed start' if the driver is not running", PATH_MS5525);
return PX4_ERROR;
}
// do a simple demand read
differential_pressure_s report;
ssize_t sz = px4_read(fd, &report, sizeof(report));
if (sz != sizeof(report)) {
PX4_WARN("immediate read failed");
return PX4_ERROR;
}
PX4_WARN("single read");
PX4_WARN("diff pressure: %d pa", (int)report.differential_pressure_filtered_pa);
/* start the sensor polling at 2Hz */
if (OK != px4_ioctl(fd, SENSORIOCSPOLLRATE, 2)) {
PX4_WARN("failed to set 2Hz poll rate");
return PX4_ERROR;
}
/* read the sensor 5x and report each value */
for (unsigned i = 0; i < 5; i++) {
px4_pollfd_struct_t fds;
/* wait for data to be ready */
fds.fd = fd;
fds.events = POLLIN;
int ret = px4_poll(&fds, 1, 2000);
if (ret != 1) {
PX4_ERR("timed out");
return PX4_ERROR;
}
/* now go get it */
sz = px4_read(fd, &report, sizeof(report));
if (sz != sizeof(report)) {
PX4_ERR("periodic read failed");
return PX4_ERROR;
}
PX4_WARN("periodic read %u", i);
PX4_WARN("diff pressure: %d pa", (int)report.differential_pressure_filtered_pa);
PX4_WARN("temperature: %d C (0x%02x)", (int)report.temperature, (unsigned) report.temperature);
}
/* reset the sensor polling to its default rate */
if (PX4_OK != px4_ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT)) {
PX4_WARN("failed to set default rate");
return PX4_ERROR;
}
return PX4_OK;
}
// reset the driver // reset the driver
int reset() int reset()
{ {
@ -210,7 +143,7 @@ ms5525_airspeed_usage()
PX4_WARN("options:"); PX4_WARN("options:");
PX4_WARN("\t-b --bus i2cbus (%d)", PX4_I2C_BUS_DEFAULT); PX4_WARN("\t-b --bus i2cbus (%d)", PX4_I2C_BUS_DEFAULT);
PX4_WARN("command:"); PX4_WARN("command:");
PX4_WARN("\tstart|stop|reset|test"); PX4_WARN("\tstart|stop|reset");
} }
int int
@ -240,13 +173,6 @@ ms5525_airspeed_main(int argc, char *argv[])
return ms5525_airspeed::stop(); return ms5525_airspeed::stop();
} }
/*
* Test the driver/device.
*/
if (!strcmp(argv[1], "test")) {
return ms5525_airspeed::test();
}
/* /*
* Reset the driver. * Reset the driver.
*/ */

76
src/drivers/differential_pressure/sdp3x/SDP3X_main.cpp
Unescape View File

@ -43,7 +43,6 @@ SDP3X *g_dev = nullptr;
int start(uint8_t i2c_bus); int start(uint8_t i2c_bus);
int stop(); int stop();
int test();
int reset(); int reset();
// Start the driver. // Start the driver.
@ -124,72 +123,6 @@ int stop()
return PX4_OK; return PX4_OK;
} }
// perform some basic functional tests on the driver;
// make sure we can collect data from the sensor in polled
// and automatic modes.
int test()
{
int fd = px4_open(PATH_SDP3X, O_RDONLY);
if (fd < 0) {
PX4_WARN("%s open failed (try 'sdp3x_airspeed start' if the driver is not running", PATH_SDP3X);
return PX4_ERROR;
}
// do a simple demand read
differential_pressure_s report;
ssize_t sz = px4_read(fd, &report, sizeof(report));
if (sz != sizeof(report)) {
PX4_WARN("immediate read failed");
return PX4_ERROR;
}
PX4_WARN("single read");
PX4_WARN("diff pressure: %d pa", (int)report.differential_pressure_filtered_pa);
/* start the sensor polling at 2Hz */
if (OK != px4_ioctl(fd, SENSORIOCSPOLLRATE, 2)) {
PX4_WARN("failed to set 2Hz poll rate");
return PX4_ERROR;
}
/* read the sensor 5x and report each value */
for (unsigned i = 0; i < 5; i++) {
px4_pollfd_struct_t fds;
/* wait for data to be ready */
fds.fd = fd;
fds.events = POLLIN;
int ret = px4_poll(&fds, 1, 2000);
if (ret != 1) {
PX4_ERR("timed out");
return PX4_ERROR;
}
/* now go get it */
sz = px4_read(fd, &report, sizeof(report));
if (sz != sizeof(report)) {
PX4_ERR("periodic read failed");
return PX4_ERROR;
}
PX4_WARN("periodic read %u", i);
PX4_WARN("diff pressure: %d pa", (int)report.differential_pressure_filtered_pa);
PX4_WARN("temperature: %d C (0x%02x)", (int)report.temperature, (unsigned) report.temperature);
}
/* reset the sensor polling to its default rate */
if (PX4_OK != px4_ioctl(fd, SENSORIOCSPOLLRATE, SENSOR_POLLRATE_DEFAULT)) {
PX4_WARN("failed to set default rate");
return PX4_ERROR;
}
return PX4_OK;
}
// reset the driver // reset the driver
int reset() int reset()
{ {
@ -223,7 +156,7 @@ sdp3x_airspeed_usage()
PX4_WARN("options:"); PX4_WARN("options:");
PX4_WARN("\t-b --bus i2cbus (%d)", PX4_I2C_BUS_DEFAULT); PX4_WARN("\t-b --bus i2cbus (%d)", PX4_I2C_BUS_DEFAULT);
PX4_WARN("command:"); PX4_WARN("command:");
PX4_WARN("\tstart|stop|reset|test"); PX4_WARN("\tstart|stop|reset");
} }
int int
@ -253,13 +186,6 @@ sdp3x_airspeed_main(int argc, char *argv[])
return sdp3x_airspeed::stop(); return sdp3x_airspeed::stop();
} }
/*
* Test the driver/device.
*/
if (!strcmp(argv[1], "test")) {
return sdp3x_airspeed::test();
}
/* /*
* Reset the driver. * Reset the driver.
*/ */

Write Preview
Loading…
Cancel
Save