sensord: cleanup logging (#33875)

Co-authored-by: Comma Device <device@comma.ai>
pull/33877/head
Adeeb Shihadeh 6 months ago committed by GitHub
parent 72a88c9319
commit 1932aff0d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 9
      system/sensord/sensors/bmx055_accel.cc
  2. 4
      system/sensord/sensors/bmx055_gyro.cc
  3. 6
      system/sensord/sensors/bmx055_magn.cc
  4. 2
      system/sensord/sensors/i2c_sensor.h
  5. 2
      system/sensord/sensors/sensor.h
  6. 2
      system/sensord/sensors_qcom2.cc

@ -10,12 +10,15 @@ BMX055_Accel::BMX055_Accel(I2CBus *bus) : I2CSensor(bus) {}
int BMX055_Accel::init() { int BMX055_Accel::init() {
int ret = verify_chip_id(BMX055_ACCEL_I2C_REG_ID, {BMX055_ACCEL_CHIP_ID}); int ret = verify_chip_id(BMX055_ACCEL_I2C_REG_ID, {BMX055_ACCEL_CHIP_ID});
if (ret == -1) return -1; if (ret == -1) {
goto fail;
}
ret = set_register(BMX055_ACCEL_I2C_REG_PMU, BMX055_ACCEL_NORMAL_MODE); ret = set_register(BMX055_ACCEL_I2C_REG_PMU, BMX055_ACCEL_NORMAL_MODE);
if (ret < 0) { if (ret < 0) {
goto fail; goto fail;
} }
// bmx055 accel has a 1.3ms wakeup time from deep suspend mode // bmx055 accel has a 1.3ms wakeup time from deep suspend mode
util::sleep_for(10); util::sleep_for(10);
@ -36,11 +39,15 @@ int BMX055_Accel::init() {
goto fail; goto fail;
} }
enabled = true;
fail: fail:
return ret; return ret;
} }
int BMX055_Accel::shutdown() { int BMX055_Accel::shutdown() {
if (!enabled) return 0;
// enter deep suspend mode (lowest power mode) // enter deep suspend mode (lowest power mode)
int ret = set_register(BMX055_ACCEL_I2C_REG_PMU, BMX055_ACCEL_DEEP_SUSPEND); int ret = set_register(BMX055_ACCEL_I2C_REG_PMU, BMX055_ACCEL_DEEP_SUSPEND);
if (ret < 0) { if (ret < 0) {

@ -46,11 +46,15 @@ int BMX055_Gyro::init() {
goto fail; goto fail;
} }
enabled = true;
fail: fail:
return ret; return ret;
} }
int BMX055_Gyro::shutdown() { int BMX055_Gyro::shutdown() {
if (!enabled) return 0;
// enter deep suspend mode (lowest power mode) // enter deep suspend mode (lowest power mode)
int ret = set_register(BMX055_GYRO_I2C_REG_LPM1, BMX055_GYRO_DEEP_SUSPEND); int ret = set_register(BMX055_GYRO_I2C_REG_LPM1, BMX055_GYRO_DEEP_SUSPEND);
if (ret < 0) { if (ret < 0) {

@ -78,7 +78,7 @@ int BMX055_Magn::init() {
// suspend -> sleep // suspend -> sleep
int ret = set_register(BMX055_MAGN_I2C_REG_PWR_0, 0x01); int ret = set_register(BMX055_MAGN_I2C_REG_PWR_0, 0x01);
if (ret < 0) { if (ret < 0) {
LOGW("Enabling power failed: %d", ret); LOGD("Enabling power failed: %d", ret);
goto fail; goto fail;
} }
util::sleep_for(5); // wait until the chip is powered on util::sleep_for(5); // wait until the chip is powered on
@ -139,7 +139,7 @@ int BMX055_Magn::init() {
goto fail; goto fail;
} }
enabled = true;
return 0; return 0;
fail: fail:
@ -147,6 +147,8 @@ int BMX055_Magn::init() {
} }
int BMX055_Magn::shutdown() { int BMX055_Magn::shutdown() {
if (!enabled) return 0;
// move to suspend mode // move to suspend mode
int ret = set_register(BMX055_MAGN_I2C_REG_PWR_0, 0); int ret = set_register(BMX055_MAGN_I2C_REG_PWR_0, 0);
if (ret < 0) { if (ret < 0) {

@ -39,7 +39,7 @@ public:
uint8_t chip_id = 0; uint8_t chip_id = 0;
int ret = read_register(address, &chip_id, 1); int ret = read_register(address, &chip_id, 1);
if (ret < 0) { if (ret < 0) {
LOGW("Reading chip ID failed: %d", ret); LOGD("Reading chip ID failed: %d", ret);
return -1; return -1;
} }
for (int i = 0; i < expected_ids.size(); ++i) { for (int i = 0; i < expected_ids.size(); ++i) {

@ -5,8 +5,10 @@
class Sensor { class Sensor {
public: public:
int gpio_fd = -1; int gpio_fd = -1;
bool enabled = false;
uint64_t start_ts = 0; uint64_t start_ts = 0;
uint64_t init_delay = 500e6; // default dealy 500ms uint64_t init_delay = 500e6; // default dealy 500ms
virtual ~Sensor() {} virtual ~Sensor() {}
virtual int init() = 0; virtual int init() = 0;
virtual bool get_event(MessageBuilder &msg, uint64_t ts = 0) = 0; virtual bool get_event(MessageBuilder &msg, uint64_t ts = 0) = 0;

@ -39,7 +39,7 @@ void interrupt_loop(std::vector<std::tuple<Sensor *, std::string>> sensors) {
} }
} }
uint64_t offset = 0; uint64_t offset = nanos_since_epoch() - nanos_since_boot();
struct pollfd fd_list[1] = {0}; struct pollfd fd_list[1] = {0};
fd_list[0].fd = fd; fd_list[0].fd = fd;
fd_list[0].events = POLLIN | POLLPRI; fd_list[0].events = POLLIN | POLLPRI;

Loading…
Cancel
Save