Added detection to apator08, fixed multi name fields, added simple va…

…lidator for unit.

README.md

@@ -78,7 +78,6 @@ From decoded JSON:
 ![decoded JSON](https://github.com/SzczepanLeon/esphome-components/blob/main/docs/decoded_telegram.png)
 
 find interesting data (in that case total_m3), split it into field (total) and unit (m3) and create sensor in YAML. In YAML config please use units from HA (ie. "m³" not "m3", etc).
-You can also use similar unit - for example liters "l".
 
 ```yaml
 wmbus:
@@ -259,8 +258,8 @@ Meter/sensor:
 - **sensors** (*Optional*):
   - **id** (*Optional*, string): Manually specify the ID for code generation. At least one of **id** and **name** must be specified.
   - **name** (*Optional*, string): The name for the sensor. At least one of **id** and **name** must be specified.
-  - **field** (*Optional*): Field from decoded telegram (without unit).
-  - **unit_of_measurement** (*Optional*): Unit for field defined above.
+  - **field** (*Optional*): Field from decoded telegram (without unit). If **field** is not present then **name** is used.
+  - **unit_of_measurement** (**Required**): Unit for field defined above.
   - All other options from [Sensor](https://esphome.io/components/sensor/index.html#config-sensor).
 
 ------------------------

components/wmbus/driver_apator08.cpp

@@ -36,6 +36,7 @@ namespace
         di.addLinkMode(LinkMode::T1);
         di.addDetection(MANUFACTURER_APT, 0x03,  0x03);
         di.addDetection(MANUFACTURER_APT, 0x0F, 0x0F);
+        di.addDetection(0x8614 /*APT?*/, 0x03,  0x03);
         di.usesProcessContent();
         di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr<Meter>(new Driver(mi, di)); });
     });

components/wmbus/sensor/__init__.py

@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor
+from esphome.log import Fore, color
 from esphome.const import (
     CONF_ID,
     CONF_TYPE,
@@ -27,6 +28,7 @@
     ENTITY_CATEGORY_DIAGNOSTIC,
     UNIT_SECOND,
     DEVICE_CLASS_TIMESTAMP,
+    CONF_UNIT_OF_MEASUREMENT,
 )
 
 AUTO_LOAD = ["wmbus"]
@@ -91,11 +93,15 @@ async def to_code(config):
                            config[CONF_KEY])
     if config[CONF_METER_ID]:
         for s in config.get(CONF_SENSORS, []):
+            if CONF_UNIT_OF_MEASUREMENT not in s:
+                print(color(Fore.RED, f"unit_of_measurement not defined for sensor '{s[CONF_NAME]}'!"))
+                exit()
             if (s[CONF_FIELD]):
                 field = s[CONF_FIELD].lower()
             else:
                 field = s[CONF_NAME].lower()
+            unit = s[CONF_UNIT_OF_MEASUREMENT]
             sens = await sensor.new_sensor(s)
-            cg.add(var.add_sensor(field, sens))
+            cg.add(var.add_sensor(field, unit, sens))
         wmbus = await cg.get_variable(config[CONF_WMBUS_ID])
         cg.add(wmbus.register_wmbus_listener(var))

components/wmbus/version.h

@@ -1,4 +1,4 @@
 #ifndef MY_VERSION
-#define MY_VERSION "4.0.2"
+#define MY_VERSION "4.0.3"
 #define WMBUSMETERS_VERSION "1.17.1"
 #endif

components/wmbus/wmbus.cpp

@@ -109,6 +109,8 @@ namespace wmbus {
             meter->handleTelegram(about, mbus_data.frame, false, &addresses, &id_match, &t);
             if (id_match) {
               for (auto const& field : sensor->fields) {
+                std::string field_name = field.first.first;
+                std::string unit = field.first.second;
                 if (field.first == "rssi") {
                   field.second->publish_state(mbus_data.rssi);
                 }
@@ -118,16 +120,16 @@ namespace wmbus {
                 else {
                   Unit field_unit = toUnit(field.second->get_unit_of_measurement());
                   if (field_unit != Unit::Unknown) {
-                    double value  = meter->getMyNumericValue(field.first, field_unit);
+                    double value  = meter->getNumericValue(field_name, field_unit);
                     if (!std::isnan(value)) {
                       field.second->publish_state(value);
                     }
                     else {
-                      ESP_LOGW(TAG, "Can't get requested field '%s' with unit '%s'", field.first.c_str(), field.second->get_unit_of_measurement().c_str());
+                      ESP_LOGW(TAG, "Can't get requested field '%s' with unit '%s'", field_name.c_str(), unit.c_str());
                     }
                   }
                   else {
-                    ESP_LOGW(TAG, "Can't get proper unit from '%s'", field.second->get_unit_of_measurement().c_str());
+                    ESP_LOGW(TAG, "Can't get proper unit from '%s'", unit.c_str());
                   }
                 }
               }
@@ -347,7 +349,7 @@ namespace wmbus {
     ESP_LOGCONFIG(TAG, "    Type: %s", ((this->type).empty() ? "auto detect" : this->type.c_str()));
     ESP_LOGCONFIG(TAG, "    Key: '%s'", key.c_str());
     for (const auto &ele : this->fields) {
-      ESP_LOGCONFIG(TAG, "    Field: '%s'", ele.first.c_str());
+      ESP_LOGCONFIG(TAG, "    Field: '%s'", ele.first.first.c_str());
       LOG_SENSOR("     ", "Name:", ele.second);
     }
   }

components/wmbus/wmbus.h

@@ -19,6 +19,7 @@
 #include "esphome/components/time/real_time_clock.h"
 
 #include <map>
+#include <utility>
 #include <string>
 
 #include "rf_cc1101.h"
@@ -67,9 +68,9 @@ namespace wmbus {
       std::string type;
       std::string myKey;
       std::vector<unsigned char> key{};
-      std::map<std::string, sensor::Sensor *> fields{};
-      void add_sensor(std::string field, sensor::Sensor *sensor) {
-        this->fields[field] = sensor;
+      std::map<std::pair<std::string, std::string>, sensor::Sensor *> fields{};
+      void add_sensor(std::string field, std::string unit, sensor::Sensor *sensor) {
+        this->fields[std::pair<std::string, std::string>(field, unit)] = sensor;
       };
 
       void dump_config();