cleanup

gateway/include/ha.h

@@ -8,6 +8,7 @@
 
 namespace Ha {
     uint16_t (*publisher)(const char* topic, const char* message);
+    typedef void (*onMessage)(const char* msg);
 
     struct DeviceConfig {
         const char* id = nullptr;
@@ -17,7 +18,6 @@ namespace Ha {
         const char* area = nullptr;
         DeviceConfig* parent = nullptr;
 
-        DeviceConfig() {}
         DeviceConfig(const char* id) : id(id) {}
         DeviceConfig(DeviceConfig& d) : id(d.id), name(d.name), model(d.model), manufacturer(d.manufacturer), area(d.area), parent(d.parent) {}
 
@@ -107,7 +107,6 @@ namespace Ha {
             publisher(configTopic, "");
         }
     };
-    
     List<Component> Component::components;
 
     struct AbstractBuilder {
@@ -124,20 +123,16 @@ namespace Ha {
     };
     List<AbstractBuilder> AbstractBuilder::builders;
 
-    template <class T = Component>
+    template <class T>
     struct Builder : AbstractBuilder {
         T* cmp;
 
-        Builder() : AbstractBuilder() {}
         Builder(T* cmp) :  AbstractBuilder(), cmp(cmp) {}
+
         Builder(const char* id) : AbstractBuilder() {
             cmp = new T{id};
         }
 
-        static Builder& instance() {
-            return *(new Builder<T>());
-        }
-
         static Builder& instance(T* c) {
             return *(new Builder<T>(c));
         }
@@ -167,7 +162,6 @@ namespace Ha {
         }
     };
 
-    typedef void (*onMessage)(const char* msg);
     struct Command : Component {
         char commandTopic[TOPIC_SIZE];
         onMessage f;
@@ -285,20 +279,18 @@ namespace Ha {
     };
 
     struct HumiditySensor : Sensor {
-        HumiditySensor(const char* name, const char* id) : Sensor(name, id) {
-            name = "Humidity";
+        HumiditySensor(const char* id, const char* name = "Humidity") : Sensor(name, id) {
             deviceClass = "humidity";
             unitMeasure = "%";
-            valueTemplate = "{{ value_json.sensor.humidity }}";
+            // valueTemplate = "{{ value_json.sensor.humidity }}";
         }
     };
 
     struct PressureSensor : Sensor {
-        PressureSensor(const char* name, const char* id) : Sensor(name, id) {
-            name = "Pressure";
+        PressureSensor(const char* id, const char* name = "Pressure") : Sensor(name, id) {
             deviceClass = "pressure";
             unitMeasure = "hPa";
-            valueTemplate = "{{ value_json.sensor.pressure }}";
+            // valueTemplate = "{{ value_json.sensor.pressure }}";
         }
     };
 }