arduino/rc-gateway
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

configure sensors

Browse Source
This commit is contained in:
Nicu Hodos 2024-05-03 09:57:43 +02:00
parent 6793b2da35
commit aadc7313e7
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gateway/include/ha.h
View File

@ -19,6 +19,7 @@ namespace Ha {
DeviceConfig() {} DeviceConfig() {}
DeviceConfig(const char* id, const char* name) : id(id), name(name) {} DeviceConfig(const char* id, const char* name) : id(id), name(name) {}
DeviceConfig(DeviceConfig& d) : id(d.id), name(d.name), model(d.model), manufacturer(d.manufacturer), area(d.area), parent(d.parent) {}
void buildConfig(JsonDocument& jsonDoc) { void buildConfig(JsonDocument& jsonDoc) {
JsonObject device = jsonDoc.createNestedObject("device"); JsonObject device = jsonDoc.createNestedObject("device");
@ -96,8 +97,8 @@ namespace Ha {
return static_cast<T*>(this); return static_cast<T*>(this);
} }
T* asSelfDevice(DeviceConfig* deviceConfig) { T* copyFromDevice(DeviceConfig* deviceConfig) {
mainDevice = deviceConfig; mainDevice = new DeviceConfig{*deviceConfig};
mainDevice->id = id; mainDevice->id = id;
mainDevice->name = name; mainDevice->name = name;
return static_cast<T*>(this); return static_cast<T*>(this);
@ -181,7 +182,6 @@ namespace Ha {
void buildConfig(JsonDocument& jsonDoc) override { void buildConfig(JsonDocument& jsonDoc) override {
EntityConfig::buildConfig(jsonDoc); EntityConfig::buildConfig(jsonDoc);
jsonDoc["name"] = "Temperature";
jsonDoc["device_class"] = deviceClass; jsonDoc["device_class"] = deviceClass;
jsonDoc["unit_of_measurement"] = unitMeasure; jsonDoc["unit_of_measurement"] = unitMeasure;
jsonDoc["value_template"] = valueTemplate; jsonDoc["value_template"] = valueTemplate;
@ -191,6 +191,7 @@ namespace Ha {
struct TemperatureSensor : Sensor { struct TemperatureSensor : Sensor {
TemperatureSensor(const char* name, const char* id) : Sensor(name, id) { TemperatureSensor(const char* name, const char* id) : Sensor(name, id) {
name = "Temperature";
deviceClass = "temperature"; deviceClass = "temperature";
unitMeasure = "°C"; unitMeasure = "°C";
valueTemplate = "{{ value_json.sensor.temperature }}"; valueTemplate = "{{ value_json.sensor.temperature }}";
@ -199,6 +200,7 @@ namespace Ha {
struct HumiditySensor : Sensor { struct HumiditySensor : Sensor {
HumiditySensor(const char* name, const char* id) : Sensor(name, id) { HumiditySensor(const char* name, const char* id) : Sensor(name, id) {
name = "Humidity";
deviceClass = "humidity"; deviceClass = "humidity";
unitMeasure = "%"; unitMeasure = "%";
valueTemplate = "{{ value_json.sensor.humidity }}"; valueTemplate = "{{ value_json.sensor.humidity }}";
@ -207,6 +209,7 @@ namespace Ha {
struct PressureSensor : Sensor { struct PressureSensor : Sensor {
PressureSensor(const char* name, const char* id) : Sensor(name, id) { PressureSensor(const char* name, const char* id) : Sensor(name, id) {
name = "Pressure";
deviceClass = "pressure"; deviceClass = "pressure";
unitMeasure = "hPa"; unitMeasure = "hPa";
valueTemplate = "{{ value_json.sensor.pressure }}"; valueTemplate = "{{ value_json.sensor.pressure }}";

2
gateway/include/mqtt.h
View File

@ -33,7 +33,7 @@ namespace Mqtt {
} }
Ha::Sensor* sensors[] = { Ha::Sensor* sensors[] = {
(new Ha::TemperatureSensor{"Oil tank room1", "id4"})->withStateTopic()->asSelfDevice(atTinyDevice) (new Ha::TemperatureSensor{"Oil tank room1", "id4"})->withStateTopic()->copyFromDevice(atTinyDevice)
// new Ha::TemperatureSensor{"Temperature", "temperature"}, // new Ha::TemperatureSensor{"Temperature", "temperature"},
// new Ha::HumiditySensor{"Humidity", "humidity"}, // new Ha::HumiditySensor{"Humidity", "humidity"},
// new Ha::PressureSensor{"Pressure", "pressure"}, // new Ha::PressureSensor{"Pressure", "pressure"},