From 58d916da39854ea43cedebd01dcfa485ae9b94ef Mon Sep 17 00:00:00 2001 From: Tom Fifield Date: Tue, 1 Jul 2025 19:49:42 +1000 Subject: [PATCH] Fix merge --- platformio.ini | 1 - src/configuration.h | 1 - src/detect/ScanI2CTwoWire.cpp | 1 - 3 files changed, 3 deletions(-) diff --git a/platformio.ini b/platformio.ini index a6c0ef5cb..c7b728d6a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -146,7 +146,6 @@ lib_deps = adafruit/Adafruit TSL2591 Library@1.4.5 # renovate: datasource=custom.pio depName=EmotiBit MLX90632 packageName=emotibit/library/EmotiBit MLX90632 emotibit/EmotiBit MLX90632@1.0.8 - sensirion/Sensirion I2C SCD4x@^0.4.0 # renovate: datasource=custom.pio depName=Adafruit MLX90614 packageName=adafruit/library/Adafruit MLX90614 Library adafruit/Adafruit MLX90614 Library@2.1.5 # renovate: datasource=github-tags depName=INA3221 packageName=KodinLanewave/INA3221 diff --git a/src/configuration.h b/src/configuration.h index 990a57b26..cddc7ba7a 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -188,7 +188,6 @@ along with this program. If not, see . #define DFROBOT_LARK_ADDR 0x42 #define DFROBOT_RAIN_ADDR 0x1d #define NAU7802_ADDR 0x2A -#define SCD4X_ADDR 0x62 #define MAX30102_ADDR 0x57 #define SCD4X_ADDR 0x62 #define MLX90614_ADDR_DEF 0x5A diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp index 7cd382f7e..9e9441123 100644 --- a/src/detect/ScanI2CTwoWire.cpp +++ b/src/detect/ScanI2CTwoWire.cpp @@ -446,7 +446,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize) SCAN_SIMPLE_CASE(MAX1704X_ADDR, MAX17048, "MAX17048", (uint8_t)addr.address); SCAN_SIMPLE_CASE(DFROBOT_RAIN_ADDR, DFROBOT_RAIN, "DFRobot Rain Gauge", (uint8_t)addr.address); SCAN_SIMPLE_CASE(LTR390UV_ADDR, LTR390UV, "LTR390UV", (uint8_t)addr.address); - SCAN_SIMPLE_CASE(SCD4X_ADDR, SCD4X, "SCD4X", (uint8_t)addr.address); SCAN_SIMPLE_CASE(PCT2075_ADDR, PCT2075, "PCT2075", (uint8_t)addr.address); SCAN_SIMPLE_CASE(SCD4X_ADDR, SCD4X, "SCD4X", (uint8_t)addr.address); SCAN_SIMPLE_CASE(BMM150_ADDR, BMM150, "BMM150", (uint8_t)addr.address);