diff --git a/src/helpers/sensors/EnvironmentSensorManager.cpp b/src/helpers/sensors/EnvironmentSensorManager.cpp index 6d681bb5..0b55abd6 100644 --- a/src/helpers/sensors/EnvironmentSensorManager.cpp +++ b/src/helpers/sensors/EnvironmentSensorManager.cpp @@ -70,7 +70,7 @@ static Adafruit_INA260 INA260; #define TELEM_INA226_SHUNT_VALUE 0.100 #define TELEM_INA226_MAX_AMP 0.8 #include -static INA226 INA226(TELEM_INA226_ADDRESS); +static INA226 INA226(TELEM_INA226_ADDRESS, TELEM_WIRE); #endif #if ENV_INCLUDE_MLX90614 diff --git a/variants/wio-tracker-l1-eink/platformio.ini b/variants/wio-tracker-l1-eink/platformio.ini index 62301354..a41e9e23 100644 --- a/variants/wio-tracker-l1-eink/platformio.ini +++ b/variants/wio-tracker-l1-eink/platformio.ini @@ -3,6 +3,7 @@ extends = nrf52_base board = seeed-wio-tracker-l1 board_build.ldscript = boards/nrf52840_s140_v7.ld build_flags = ${nrf52_base.build_flags} + ${sensor_base.build_flags} -I lib/nrf52/s140_nrf52_7.3.0_API/include -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52 -I variants/wio-tracker-l1 @@ -22,8 +23,6 @@ build_flags = ${nrf52_base.build_flags} -D DISPLAY_ROTATION=1 -D DISABLE_DIAGNOSTIC_OUTPUT -D AUTO_OFF_MILLIS=0 - -D ENV_INCLUDE_GPS=1 - -D ENV_INCLUDE_BME280=1 -D GPS_BAUD_RATE=9600 -D ENV_PIN_SDA=PIN_WIRE1_SDA -D ENV_PIN_SCL=PIN_WIRE1_SCL @@ -33,12 +32,10 @@ build_src_filter = ${nrf52_base.build_src_filter} + + lib_deps= ${nrf52_base.lib_deps} - adafruit/Adafruit SH110X @ ^2.1.13 + ${sensor_base.lib_deps} adafruit/Adafruit GFX Library @ ^1.12.1 - stevemarple/MicroNMEA @ ^2.0.6 zinggjm/GxEPD2 @ 1.6.2 bakercp/CRC32 @ ^2.0.0 - adafruit/Adafruit BME280 Library @ ^2.3.0 [env:WioTrackerL1Eink_companion_radio_ble] extends = WioTrackerL1Eink diff --git a/variants/wio-tracker-l1/platformio.ini b/variants/wio-tracker-l1/platformio.ini index 63228995..35ca2135 100644 --- a/variants/wio-tracker-l1/platformio.ini +++ b/variants/wio-tracker-l1/platformio.ini @@ -3,6 +3,7 @@ extends = nrf52_base board = seeed-wio-tracker-l1 board_build.ldscript = boards/nrf52840_s140_v7.ld build_flags = ${nrf52_base.build_flags} + ${sensor_base.build_flags} -I lib/nrf52/s140_nrf52_7.3.0_API/include -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52 -I variants/wio-tracker-l1 @@ -13,8 +14,6 @@ build_flags = ${nrf52_base.build_flags} -D SX126X_CURRENT_LIMIT=140 -D SX126X_RX_BOOSTED_GAIN=1 -D PIN_OLED_RESET=-1 - -D ENV_INCLUDE_GPS=1 - -D ENV_INCLUDE_BME280=1 -D GPS_BAUD_RATE=9600 -D ENV_PIN_SDA=PIN_WIRE1_SDA -D ENV_PIN_SCL=PIN_WIRE1_SCL @@ -24,9 +23,9 @@ build_src_filter = ${nrf52_base.build_src_filter} + + lib_deps= ${nrf52_base.lib_deps} + ${sensor_base.lib_deps} adafruit/Adafruit SH110X @ ^2.1.13 adafruit/Adafruit GFX Library @ ^1.12.1 - stevemarple/MicroNMEA @ ^2.0.6 [env:WioTrackerL1_Repeater] extends = WioTrackerL1