pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-08 14:12:05 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'master' into AddRAK12035VB_4.19.25

Browse Source
This commit is contained in:
Justin E. Mann 2025-05-19 14:36:11 -06:00
commit 825a17f03e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platformio.ini
View File

@ -108,7 +108,7 @@ lib_deps =
[device-ui_base] [device-ui_base]
lib_deps = lib_deps =
# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master # renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
https://github.com/meshtastic/device-ui/archive/48e963f164238d9e83719b8ee77cfea735a6cd6e.zip https://github.com/meshtastic/device-ui/archive/c9a55f661a735d1f393a02657e5183ccf39cf1a2.zip
; Common libs for environmental measurements in telemetry module ; Common libs for environmental measurements in telemetry module
[environmental_base] [environmental_base]

16
src/motion/ICM20948Sensor.cpp
View File

@ -189,13 +189,19 @@ bool ICM20948Singleton::init(ScanI2C::FoundDevice device)
enableDebugging(); enableDebugging();
#endif #endif
// startup // startup
#ifdef Wire1 #if defined(WIRE_INTERFACES_COUNT) && (WIRE_INTERFACES_COUNT > 1)
ICM_20948_Status_e status = TwoWire &bus = (device.address.port == ScanI2C::I2CPort::WIRE1 ? Wire1 : Wire);
begin(device.address.port == ScanI2C::I2CPort::WIRE1 ? Wire1 : Wire, device.address.address == ICM20948_ADDR ? 1 : 0);
#else #else
ICM_20948_Status_e status = begin(Wire, device.address.address == ICM20948_ADDR ? 1 : 0); TwoWire &bus = Wire; // fallback if only one I2C interface
#endif #endif
bool bAddr = (device.address.address == 0x69);
delay(100);
LOG_DEBUG("ICM20948 begin on addr 0x%02X (port=%d, bAddr=%d)", device.address.address, device.address.port, bAddr);
ICM_20948_Status_e status = begin(bus, bAddr);
if (status != ICM_20948_Stat_Ok) { if (status != ICM_20948_Stat_Ok) {
LOG_DEBUG("ICM20948 init begin - %s", statusString()); LOG_DEBUG("ICM20948 init begin - %s", statusString());
return false; return false;