Rescan I2C on AQ module init (#10593)

src/modules/Telemetry/Sensor/AddI2CSensorTemplate.h

@@ -11,6 +11,15 @@ static std::forward_list<TelemetrySensor *> sensors;
 template <typename T> void addSensor(const ScanI2C *i2cScanner, ScanI2C::DeviceType type)
 {
     ScanI2C::FoundDevice dev = i2cScanner->find(type);
+    // Avoid adding the same device twice
+    if (dev.type != ScanI2C::DeviceType::NONE) {
+        for (const TelemetrySensor *_sensor : sensors) {
+            if ((_sensor->_address == dev.address.address) && (_sensor->_port == dev.address.port)) {
+                return;
+            }
+        }
+    }
+
     if (dev.type != ScanI2C::DeviceType::NONE || type == ScanI2C::DeviceType::NONE) {
         TelemetrySensor *sensor = new T();
 #if WIRE_INTERFACES_COUNT > 1

src/modules/Telemetry/Sensor/PMSA003ISensor.h

@@ -34,10 +34,7 @@ class PMSA003ISensor : public TelemetrySensor
     uint32_t pmMeasureStarted = 0;
 
     uint8_t buffer[PMSA003I_FRAME_LENGTH]{};
-    TwoWire *_bus{};
-    uint8_t _address{};
 #ifdef PMSA003I_I2C_CLOCK_SPEED
-    ScanI2C::I2CPort _port = ScanI2C::I2CPort::NO_I2C;
     ReClockI2C reClockI2C;
 #endif
 };

src/modules/Telemetry/Sensor/SCD30Sensor.h

@@ -13,10 +13,7 @@ class SCD30Sensor : public TelemetrySensor
 {
   private:
     SensirionI2cScd30 scd30;
-    TwoWire *_bus{};
-    uint8_t _address{};
 #ifdef SCD30_I2C_CLOCK_SPEED
-    ScanI2C::I2CPort _port = ScanI2C::I2CPort::NO_I2C;
     ReClockI2C reClockI2C;
 #endif
 

src/modules/Telemetry/Sensor/SCD4XSensor.h

@@ -16,10 +16,7 @@ class SCD4XSensor : public TelemetrySensor
 {
   private:
     SensirionI2cScd4x scd4x;
-    TwoWire *_bus{};
-    uint8_t _address{};
 #ifdef SCD4X_I2C_CLOCK_SPEED
-    ScanI2C::I2CPort _port = ScanI2C::I2CPort::NO_I2C;
     ReClockI2C reClockI2C;
 #endif
 

src/modules/Telemetry/Sensor/SEN5XSensor.h

@@ -61,10 +61,7 @@ struct _SEN5XMeasurements {
 class SEN5XSensor : public TelemetrySensor
 {
   private:
-    TwoWire *_bus{};
-    uint8_t _address{};
 #ifdef SEN5X_I2C_CLOCK_SPEED
-    ScanI2C::I2CPort _port = ScanI2C::I2CPort::NO_I2C;
     ReClockI2C reClockI2C;
 #endif
 

src/modules/Telemetry/Sensor/SFA30Sensor.h

@@ -20,10 +20,7 @@ class SFA30Sensor : public TelemetrySensor
     uint32_t measureStarted = 0;
 
     SensirionI2cSfa3x sfa30;
-    TwoWire *_bus{};
-    uint8_t _address{};
 #ifdef SFA30_I2C_CLOCK_SPEED
-    ScanI2C::I2CPort _port = ScanI2C::I2CPort::NO_I2C;
     ReClockI2C reClockI2C;
 #endif
 

src/modules/Telemetry/Sensor/SHTXXSensor.h

@@ -10,8 +10,6 @@ class SHTXXSensor : public TelemetrySensor
 {
   private:
     SHTSensor sht;
-    TwoWire *_bus{};
-    uint8_t _address{};
     SHTSensor::SHTAccuracy accuracy{};
     bool setAccuracy(SHTSensor::SHTAccuracy newAccuracy);
 

src/modules/Telemetry/Sensor/TelemetrySensor.h

@@ -56,6 +56,11 @@ class TelemetrySensor
     }
 
     const char *sensorName;
+    // TODO: Rename?
+    uint8_t _address = 0;
+    TwoWire *_bus{};
+    ScanI2C::I2CPort _port = ScanI2C::I2CPort::NO_I2C;
+
     // TODO: delete after migration
     bool hasSensor() { return nodeTelemetrySensorsMap[sensorType].first > 0; }