diff --git a/esp32/include/peripherals/imu.h b/esp32/include/peripherals/imu.h index af7d93d..eb266cb 100644 --- a/esp32/include/peripherals/imu.h +++ b/esp32/include/peripherals/imu.h @@ -76,7 +76,7 @@ class IMU : public SensorBase { #if USE_ICM20948_SPIMODE > 0 _imu.begin(CS_PIN, SPI_PORT); #else - _imu.begin(Wire, 1); + _imu.begin(Wire, 1, 0xFF); #endif if (_imu.status != ICM_20948_Stat_Ok){ return false; } diff --git a/esp32/include/peripherals/peripherals.h b/esp32/include/peripherals/peripherals.h index 18248e5..369e765 100644 --- a/esp32/include/peripherals/peripherals.h +++ b/esp32/include/peripherals/peripherals.h @@ -90,7 +90,7 @@ class Peripherals : public StatefulService { #if FT_ENABLED(USE_MPU6050 || USE_BNO055 || USE_ICM20948) IMU _imu; #endif -#if FT_ENABLED(USE_HMC5883 || USE_ICM20948) +#if FT_ENABLED(USE_HMC5883) // TODO: Add USE_ICM20948 Magnetometer _mag; #endif #if FT_ENABLED(USE_BMP180) diff --git a/esp32/src/features.cpp b/esp32/src/features.cpp index 2e23663..076b860 100644 --- a/esp32/src/features.cpp +++ b/esp32/src/features.cpp @@ -18,6 +18,8 @@ void printFeatureConfiguration() { ESP_LOGI("Features", "USE_HMC5883: %s", USE_HMC5883 ? "enabled" : "disabled"); ESP_LOGI("Features", "USE_BMP180: %s", USE_BMP180 ? "enabled" : "disabled"); ESP_LOGI("Features", "USE_USS: %s", USE_USS ? "enabled" : "disabled"); + ESP_LOGI("Features", "USE_PAJ7620U2: %s", USE_PAJ7620U2 ? "enabled" : "disabled"); + // Peripherals ESP_LOGI("Features", "USE_PCA9685: %s", USE_PCA9685 ? "enabled" : "disabled"); diff --git a/esp32/src/peripherals/peripherals.cpp b/esp32/src/peripherals/peripherals.cpp index ff02c26..6ba7cea 100644 --- a/esp32/src/peripherals/peripherals.cpp +++ b/esp32/src/peripherals/peripherals.cpp @@ -18,7 +18,7 @@ void Peripherals::begin() { #if FT_ENABLED(USE_MPU6050 || USE_BNO055 || USE_ICM20948) if (!_imu.initialize()) ESP_LOGE("IMUService", "IMU initialize failed"); #endif -#if FT_ENABLED(USE_HMC5883 || USE_ICM20948) +#if FT_ENABLED(USE_HMC5883) // TODO: Add USE_ICM20948 if (!_mag.initialize()) ESP_LOGE("IMUService", "MAG initialize failed"); #endif #if FT_ENABLED(USE_BMP180) @@ -89,7 +89,7 @@ bool Peripherals::readImu() { bool Peripherals::readMag() { bool updated = false; -#if FT_ENABLED(USE_HMC5883) +#if FT_ENABLED(USE_HMC5883) // TODO: Add USE_ICM20948 beginTransaction(); updated = _mag.update(); endTransaction(); @@ -169,7 +169,7 @@ void Peripherals::getIMUResult(JsonVariant &root) { JsonVariant imu = root["imu"].to(); _imu.getResults(imu); #endif -#if FT_ENABLED(USE_HMC5883 || USE_ICM20948) +#if FT_ENABLED(USE_HMC5883) // TODO: Add USE_ICM20948 JsonVariant mag = root["mag"].to(); _mag.getResults(mag); #endif