Merge branch 'v1.2.0'

This commit is contained in:
Nicu Hodos 2024-10-07 21:57:38 +02:00
commit 3ec92c43a6
2 changed files with 8 additions and 3 deletions

View File

@ -1,7 +1,7 @@
{ {
"$schema": "https://raw.githubusercontent.com/platformio/platformio-core/develop/platformio/assets/schema/library.json", "$schema": "https://raw.githubusercontent.com/platformio/platformio-core/develop/platformio/assets/schema/library.json",
"name": "ha-mqtt", "name": "ha-mqtt",
"version": "1.1.0", "version": "1.2.0",
"description": "Home Assistant classes for integration with MQTT auto discovery", "description": "Home Assistant classes for integration with MQTT auto discovery",
"repository": { "repository": {
"type": "git", "type": "git",

View File

@ -212,7 +212,7 @@ namespace Ha {
} }
Builder& addSecondary(Component* c) { Builder& addSecondary(Component* c) {
if (cmp->mainDevice) c->mainDevice = &DeviceConfig::create(cmp->mainDevice->id); if (cmp->mainDevice) c->mainDevice = &DeviceConfig::create(cmp->mainDevice->id).withName(cmp->mainDevice->name);
return *this; return *this;
} }
@ -373,7 +373,12 @@ namespace Ha {
StateConfig::buildConfig(jsonDoc); StateConfig::buildConfig(jsonDoc);
if (unitMeasure) jsonDoc["unit_of_measurement"] = unitMeasure; if (unitMeasure) jsonDoc["unit_of_measurement"] = unitMeasure;
if (valueTemplate) jsonDoc["value_template"] = valueTemplate; if (valueTemplate) jsonDoc["value_template"] = valueTemplate;
jsonDoc["suggested_display_precision"] = precision; if (isNumericSensor()) jsonDoc["suggested_display_precision"] = precision;
}
private:
bool isNumericSensor() {
return deviceClass || unitMeasure;
} }
}; };