Add support for up to 16 LM75AD sensors

tasmota/my_user_config.h

@@ -668,7 +668,8 @@
 //  #define USE_SGP4X                              // [I2cDriver82] Enable SGP41 sensor (I2C address 0x59) (+7k2 code)
 //  #define USE_SEN5X                              // [I2cDriver76] Enable SEN5X sensor (I2C address 0x69) (+3k code)
 //  #define USE_SI1145                             // [I2cDriver19] Enable SI1145/46/47 sensor (I2C address 0x60) (+1k code)
-//  #define USE_LM75AD                             // [I2cDriver20] Enable LM75AD sensor (I2C addresses 0x48 - 0x4F) (+0k5 code)
+//  #define USE_LM75AD                             // [I2cDriver20] Enable LM75AD sensor (I2C addresses 0x48 - 0x4F) (+0k6 code)
+//    #define LM75AD_MAX_SENSORS    8              // Max number of LM75AD sensors supported (default = 8 on 2 busses, max = 16 on 2 busses)
 //  #define USE_APDS9960                           // [I2cDriver21] Enable APDS9960 Proximity Sensor (I2C address 0x39). Disables SHT and VEML6070 (+4k7 code)
     #define USE_APDS9960_GESTURE                   // Enable APDS9960 Gesture feature (+2k code)
     #define USE_APDS9960_PROXIMITY                 // Enable APDS9960 Proximity feature (>50 code)

tasmota/tasmota_xsns_sensor/xsns_26_lm75ad.ino

@@ -29,47 +29,48 @@
 \*********************************************************************************************/
 
 #define XSNS_26                 26
-#define XI2C_20                 20  // See I2CDEVICES.md
+#define XI2C_20                 20    // See I2CDEVICES.md
 
-#define LM75AD_ADDRESS1					0x48
+#ifndef LM75AD_MAX_SENSORS
-#define LM75AD_ADDRESS2					0x49
+#define LM75AD_MAX_SENSORS      8
-#define LM75AD_ADDRESS3					0x4A
+#endif
-#define LM75AD_ADDRESS4					0x4B
+
-#define LM75AD_ADDRESS5					0x4C
+#define LM75AD_ADDRESS          0x48  // Start address
-#define LM75AD_ADDRESS6					0x4D
+#define LM75AD_COUNT            8     // Number of sequential addresses
-#define LM75AD_ADDRESS7					0x4E
-#define LM75AD_ADDRESS8					0x4F
 
 #define LM75_TEMP_REGISTER      0x00
 #define LM75_CONF_REGISTER      0x01
 #define LM75_THYST_REGISTER     0x02
 #define LM75_TOS_REGISTER       0x03
 
-bool lm75ad_type = false;
+struct {
-uint8_t lm75ad_address;
+  uint8_t address[LM75AD_MAX_SENSORS];
-uint8_t lm75ad_bus;
+  uint8_t bus[LM75AD_MAX_SENSORS];
-uint8_t lm75ad_addresses[] = { LM75AD_ADDRESS1, LM75AD_ADDRESS2, LM75AD_ADDRESS3, LM75AD_ADDRESS4, LM75AD_ADDRESS5, LM75AD_ADDRESS6, LM75AD_ADDRESS7, LM75AD_ADDRESS8 };
+  uint8_t count;
+} Lm75;
 
 void LM75ADDetect(void) {
-  for (lm75ad_bus = 0; lm75ad_bus < 2; lm75ad_bus++) {
+  if ((LM75AD_MAX_SENSORS < 1) || (LM75AD_MAX_SENSORS > 16)) { return; }  // Safeguard user changed LM75AD_MAX_SENSORS out of bounds
-    for (uint32_t i = 0; i < sizeof(lm75ad_addresses); i++) {
+  for (uint32_t bus = 0; bus < 2; bus++) {
-      lm75ad_address = lm75ad_addresses[i];
+    for (uint32_t address = LM75AD_ADDRESS; address < LM75AD_ADDRESS + LM75AD_COUNT; address++) {
-      if (!I2cSetDevice(lm75ad_address, lm75ad_bus)) { continue; } // do not make the next step without a confirmed device on the bus
+      if (!I2cSetDevice(address, bus)) { continue; } // Do not make the next step without a confirmed device on the bus
       uint16_t buffer;
-      if (I2cValidRead16(&buffer, lm75ad_address, LM75_THYST_REGISTER, lm75ad_bus)) {
+      if (I2cValidRead16(&buffer, address, LM75_THYST_REGISTER, bus)) {
         if (buffer == 0x4B00) {
-          lm75ad_type = true;
+          I2cSetActiveFound(address, "LM75AD", bus);
-          I2cSetActiveFound(lm75ad_address, "LM75AD", lm75ad_bus);
+          Lm75.address[Lm75.count] = address;
-          return;
+          Lm75.bus[Lm75.count] = bus;
+          Lm75.count++;
+          if (LM75AD_MAX_SENSORS == Lm75.count) { return; }
         }
       }
     }
   }
 }
 
-float LM75ADGetTemp(void) {
+float LM75ADGetTemp(uint32_t sensor) {
   uint16_t t;
-  if (I2cValidRead16(&t, lm75ad_address, LM75_TEMP_REGISTER, lm75ad_bus)) {
+  if (I2cValidRead16(&t, Lm75.address[sensor], LM75_TEMP_REGISTER, Lm75.bus[sensor])) {
     int16_t sign = 1;
     if (t & 0x8000) { // We are getting a negative temperature value
       t = (~t) +0x20;
@@ -82,17 +83,42 @@ float LM75ADGetTemp(void) {
 }
 
 void LM75ADShow(bool json) {
-  float t = LM75ADGetTemp();
+  for (uint32_t sensor = 0; sensor < Lm75.count; sensor++) {
+    float t = LM75ADGetTemp(sensor);
+//    if (!isnan(t)) {
+      char name[16];
+      // LM75AD
+      strlcpy(name, "LM75AD", sizeof(name));
+      if (Lm75.count > 1) {
+        // LM75AD-49
+        snprintf_P(name, sizeof(name), PSTR("%s%c%02X"), name, IndexSeparator(), Lm75.address[sensor]);
+#ifdef USE_I2C_BUS2
+        if (TasmotaGlobal.i2c_enabled[1]) {  // Second bus enabled
+          uint8_t bus = Lm75.bus[0];
+          for (uint32_t i = 1; i < Lm75.count; i++) {
+            if (bus != Lm75.bus[i]) {        // Different busses
+              // LM75AD-49-1
+              snprintf_P(name, sizeof(name), PSTR("%s%c%d"), name, IndexSeparator(), Lm75.bus[sensor] +1);
+              break;
+            }
+          }
+        }
+#endif  // USE_I2C_BUS2
+      }
 
-  if (json) {
+      if (json) {
-    ResponseAppend_P(JSON_SNS_F_TEMP, "LM75AD", Settings->flag2.temperature_resolution, &t);
+        ResponseAppend_P(JSON_SNS_F_TEMP, name, Settings->flag2.temperature_resolution, &t);
 #ifdef USE_DOMOTICZ
-    if (0 == TasmotaGlobal.tele_period) { DomoticzFloatSensor(DZ_TEMP, t); }
+        if ((0 == TasmotaGlobal.tele_period) && (0 == sensor)) {
+          DomoticzFloatSensor(DZ_TEMP, t);
+        }
 #endif  // USE_DOMOTICZ
 #ifdef USE_WEBSERVER
-  } else {
+      } else {
-    WSContentSend_Temp("LM75AD", t);
+        WSContentSend_Temp(name, t);
 #endif  // USE_WEBSERVER
+      }
+//    }
   }
 }
 
@@ -109,7 +135,7 @@ bool Xsns26(uint32_t function)
   if (FUNC_INIT == function) {
     LM75ADDetect();
   }
-  else if (lm75ad_type) {
+  else if (Lm75.count) {
     switch (function) {
       case FUNC_JSON_APPEND:
         LM75ADShow(1);