Darkages/SpotMicroESP32-Leika
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added PAJ7620U2 defs, set mag for ICM20948 temp

Browse Source
This commit is contained in:
Niklas Jensen
2025-11-27 19:30:19 +01:00
parent 94a50302cc
commit 5c4dc51093
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esp32/include/peripherals/imu.h
+1 -1
View File
@@ -76,7 +76,7 @@ class IMU : public SensorBase<IMUAnglesMsg> {
#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; }
esp32/include/peripherals/peripherals.h
+1 -1
View File
@@ -90,7 +90,7 @@ class Peripherals : public StatefulService<PeripheralsConfiguration> {
#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)
esp32/src/features.cpp
+2
View File
@@ -19,6 +19,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");
esp32/src/peripherals/peripherals.cpp
+3 -3
View File
@@ -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<JsonVariant>();
_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<JsonVariant>();
_mag.getResults(mag);
#endif