Browse Source

More formatting cleanups

sbg
Simon Wilks 12 years ago
parent
commit
7a99de9d30
  1. 23
      src/drivers/ets_airspeed/ets_airspeed.cpp

23
src/drivers/ets_airspeed/ets_airspeed.cpp

@ -230,6 +230,7 @@ ETSAirspeed::init() @@ -230,6 +230,7 @@ ETSAirspeed::init()
/* allocate basic report buffers */
_num_reports = 2;
_reports = new struct differential_pressure_s[_num_reports];
for (unsigned i = 0; i < _num_reports; i++)
_reports[i].max_differential_pressure_pa = 0;
@ -432,12 +433,12 @@ ETSAirspeed::measure() @@ -432,12 +433,12 @@ ETSAirspeed::measure()
uint8_t cmd = READ_CMD;
ret = transfer(&cmd, 1, nullptr, 0);
if (OK != ret)
{
if (OK != ret) {
perf_count(_comms_errors);
log("i2c::transfer returned %d", ret);
return ret;
}
ret = OK;
return ret;
@ -466,6 +467,7 @@ ETSAirspeed::collect() @@ -466,6 +467,7 @@ ETSAirspeed::collect()
if (diff_pres_pa < _diff_pres_offset + MIN_ACCURATE_DIFF_PRES_PA) {
diff_pres_pa = 0;
} else {
diff_pres_pa -= _diff_pres_offset;
}
@ -517,11 +519,13 @@ ETSAirspeed::start() @@ -517,11 +519,13 @@ ETSAirspeed::start()
true,
true,
true,
SUBSYSTEM_TYPE_DIFFPRESSURE};
SUBSYSTEM_TYPE_DIFFPRESSURE
};
static orb_advert_t pub = -1;
if (pub > 0) {
orb_publish(ORB_ID(subsystem_info), pub, &info);
} else {
pub = orb_advertise(ORB_ID(subsystem_info), &info);
}
@ -653,8 +657,7 @@ start(int i2c_bus) @@ -653,8 +657,7 @@ start(int i2c_bus)
fail:
if (g_dev != nullptr)
{
if (g_dev != nullptr) {
delete g_dev;
g_dev = nullptr;
}
@ -668,15 +671,14 @@ fail: @@ -668,15 +671,14 @@ fail:
void
stop()
{
if (g_dev != nullptr)
{
if (g_dev != nullptr) {
delete g_dev;
g_dev = nullptr;
}
else
{
} else {
errx(1, "driver not running");
}
exit(0);
}
@ -789,6 +791,7 @@ ets_airspeed_main(int argc, char *argv[]) @@ -789,6 +791,7 @@ ets_airspeed_main(int argc, char *argv[])
int i2c_bus = PX4_I2C_BUS_DEFAULT;
int i;
for (i = 1; i < argc; i++) {
if (strcmp(argv[i], "-b") == 0 || strcmp(argv[i], "--bus") == 0) {
if (argc > i + 1) {

Loading…
Cancel
Save