From 08301c793f8f76e200d4bc79ba892bbf58bb743f Mon Sep 17 00:00:00 2001
From: Nasimovy <smeetswout@hotmail.com>
Date: Sun, 25 May 2025 16:32:19 +0200
Subject: [PATCH] resolve conflicts

---
 src/detect/ScanI2C.h          | 1 +
 src/detect/ScanI2CTwoWire.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/detect/ScanI2C.h b/src/detect/ScanI2C.h
index e43bc7017..daab968e1 100644
--- a/src/detect/ScanI2C.h
+++ b/src/detect/ScanI2C.h
@@ -71,6 +71,7 @@ class ScanI2C
         DPS310,
         LTR390UV,
         TCA8418KB,
+        PCT2075,
         CST226SE,
     } DeviceType;
 
diff --git a/src/detect/ScanI2CTwoWire.cpp b/src/detect/ScanI2CTwoWire.cpp
index 740649a1b..bcb1af556 100644
--- a/src/detect/ScanI2CTwoWire.cpp
+++ b/src/detect/ScanI2CTwoWire.cpp
@@ -434,6 +434,7 @@ 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(PCT2075_ADDR, PCT2075, "PCT2075", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(CST226SE_ADDR, CST226SE, "CST226SE", (uint8_t)addr.address);
 #ifdef HAS_TPS65233
                 SCAN_SIMPLE_CASE(TPS65233_ADDR, TPS65233, "TPS65233", (uint8_t)addr.address);