diff --git a/src/drivers/imu/bmi055/BMI055.hpp b/src/drivers/imu/bmi055/BMI055.hpp index e7b465717e..30839d6f0d 100644 --- a/src/drivers/imu/bmi055/BMI055.hpp +++ b/src/drivers/imu/bmi055/BMI055.hpp @@ -66,7 +66,6 @@ protected: perf_counter_t _sample_perf; perf_counter_t _bad_transfers; perf_counter_t _bad_registers; - perf_counter_t _good_transfers; perf_counter_t _reset_retries; perf_counter_t _duplicates; diff --git a/src/drivers/imu/bmi055/BMI055_accel.cpp b/src/drivers/imu/bmi055/BMI055_accel.cpp index 4fe1c2c88f..d479346141 100644 --- a/src/drivers/imu/bmi055/BMI055_accel.cpp +++ b/src/drivers/imu/bmi055/BMI055_accel.cpp @@ -713,12 +713,9 @@ BMI055_accel::measure() return; } - perf_count(_good_transfers); - if (_register_wait != 0) { // we are waiting for some good transfers before using - // the sensor again. We still increment - // _good_transfers, but don't return any data yet + // the sensor again, but don't return any data yet _register_wait--; return; } @@ -809,7 +806,6 @@ BMI055_accel::print_info() perf_print_counter(_accel_reads); perf_print_counter(_bad_transfers); perf_print_counter(_bad_registers); - perf_print_counter(_good_transfers); perf_print_counter(_reset_retries); perf_print_counter(_duplicates); diff --git a/src/drivers/imu/bmi055/BMI055_gyro.cpp b/src/drivers/imu/bmi055/BMI055_gyro.cpp index 22e79a1f84..90ab85d75b 100644 --- a/src/drivers/imu/bmi055/BMI055_gyro.cpp +++ b/src/drivers/imu/bmi055/BMI055_gyro.cpp @@ -688,12 +688,9 @@ BMI055_gyro::measure() return; } - perf_count(_good_transfers); - if (_register_wait != 0) { // we are waiting for some good transfers before using - // the sensor again. We still increment - // _good_transfers, but don't return any data yet + // the sensor again, but don't return any data yet _register_wait--; return; } @@ -785,7 +782,6 @@ BMI055_gyro::print_info() perf_print_counter(_gyro_reads); perf_print_counter(_bad_transfers); perf_print_counter(_bad_registers); - perf_print_counter(_good_transfers); perf_print_counter(_reset_retries); perf_print_counter(_duplicates); diff --git a/src/drivers/imu/bmi055/bmi055_main.cpp b/src/drivers/imu/bmi055/bmi055_main.cpp index 3713c44b6c..866295a9a6 100644 --- a/src/drivers/imu/bmi055/bmi055_main.cpp +++ b/src/drivers/imu/bmi055/bmi055_main.cpp @@ -40,10 +40,6 @@ /** driver 'main' command */ extern "C" { __EXPORT int bmi055_main(int argc, char *argv[]); } -/** - * Local functions in support of the shell command. - */ - enum sensor_type { BMI055_NONE = 0, BMI055_ACCEL = 1, @@ -67,7 +63,6 @@ void regdump(bool, enum sensor_type); void testerror(bool, enum sensor_type); void usage(); - /** * Start the driver. * @@ -186,7 +181,6 @@ fail_gyro: PX4_WARN("No BMI055 gyro found"); exit(PX4_ERROR); - } void @@ -356,7 +350,6 @@ reset(bool external_bus, enum sensor_type sensor) exit(0); } - /** * Print a little info about the driver. */ @@ -417,7 +410,6 @@ regdump(bool external_bus, enum sensor_type sensor) exit(0); } - /** * deliberately produce an error to test recovery */ @@ -455,7 +447,6 @@ usage() warnx(" -R rotation"); warnx(" -A (Enable Accelerometer)"); warnx(" -G (Enable Gyroscope)"); - } }//namespace ends @@ -471,7 +462,6 @@ BMI055::BMI055(const char *name, const char *devname, int bus, uint32_t device, _sample_perf(perf_alloc(PC_ELAPSED, "bmi055_read")), _bad_transfers(perf_alloc(PC_COUNT, "bmi055_bad_transfers")), _bad_registers(perf_alloc(PC_COUNT, "bmi055_bad_registers")), - _good_transfers(perf_alloc(PC_COUNT, "bmi055_good_transfers")), _reset_retries(perf_alloc(PC_COUNT, "bmi055_reset_retries")), _duplicates(perf_alloc(PC_COUNT, "bmi055_duplicates")), _register_wait(0), @@ -479,21 +469,16 @@ BMI055::BMI055(const char *name, const char *devname, int bus, uint32_t device, _rotation(rotation), _checked_next(0) { - } - - BMI055::~BMI055() { /* delete the perf counter */ perf_free(_sample_perf); perf_free(_bad_transfers); perf_free(_bad_registers); - perf_free(_good_transfers); perf_free(_reset_retries); perf_free(_duplicates); - } uint8_t @@ -504,7 +489,6 @@ BMI055::read_reg(unsigned reg) transfer(cmd, cmd, sizeof(cmd)); return cmd[1]; - } uint16_t @@ -517,7 +501,6 @@ BMI055::read_reg16(unsigned reg) return (uint16_t)(cmd[1] << 8) | cmd[2]; } - void BMI055::write_reg(unsigned reg, uint8_t value) { @@ -529,8 +512,6 @@ BMI055::write_reg(unsigned reg, uint8_t value) transfer(cmd, nullptr, sizeof(cmd)); } - - int bmi055_main(int argc, char *argv[]) { @@ -622,4 +603,3 @@ bmi055_main(int argc, char *argv[]) bmi055::usage(); exit(1); } -