Merge pull request #55 from HomeControlAS/no_issue_arduino_lib_manager

No issue arduino lib manager

examples/basic_TemperatureTarget_OnOff/basic_TemperatureTarget_OnOff.ino → examples/basic_Thermostat_OnOff/basic_Thermostat_OnOff.ino

@@ -7,7 +7,7 @@
 
 #include "DHT.h"
 #include "Endpoints/EndpointOnOff.h"
-#include "Endpoints/EndpointTemperatureTarget.h"
+#include "Endpoints/EndpointThermostat.h"
 
 //#define DEBUG
 
@@ -30,7 +30,7 @@ bool last_state = false;
 
 HomeControlMagic hcm(deviceName);
 
-EndpointTemperatureTarget endpointTemperatureTarget(&hcm);
+EndpointThermostat endpointThermostat(&hcm);
 EndpointOnOff endpointOnOff(&hcm);
 
 DHT dht(DHT_PIN, DHTTYPE);
@@ -76,13 +76,13 @@ void setup()
 
     pinMode(DEVICE_PIN, OUTPUT);
 
-    hcm.addEndpoint(&endpointTemperatureTarget);
+    hcm.addEndpoint(&endpointThermostat);
     hcm.addEndpoint(&endpointOnOff);
 
     dht.begin();
 
     double temperature = dht.readTemperature();
-    endpointTemperatureTarget.setTemperatureTarget(temperature);
+    endpointThermostat.setTemperatureTarget(temperature);
 }
 
 void loop()
@@ -105,17 +105,17 @@ void loop()
         }
         else
         {
-            endpointTemperatureTarget.setTemperature(temperature);
+            endpointThermostat.setTemperature(temperature);
         }
 
 #ifdef DEBUG
         Serial.print("Temperature from sensor: ");
-        Serial.print(endpointTemperatureTarget.getTemperature());
+        Serial.print(endpointThermostat.getTemperature());
         Serial.print(" *C ");
         Serial.println();
 
         Serial.print("Temperature target: ");
-        Serial.print(endpointTemperatureTarget.getTemperatureTarget());
+        Serial.print(endpointThermostat.getTemperatureTarget());
         Serial.print(" *C ");
         Serial.println();
 #endif

keywords.txt

@@ -0,0 +1,38 @@
+# Syntax Coloring Map For HomeControl-mqtt library
+
+# Datatypes (KEYWORD1)
+HomeControlMagic	KEYWORD1
+EndpointOnOff	KEYWORD1
+EndpointColor KEYWORD1
+EndpointIdentify	KEYWORD1
+EndpointLevel	KEYWORD1
+EndpointMotion	KEYWORD1
+EndpointTemperature	KEYWORD1
+EndpointThermostat	KEYWORD1
+
+# Methods and Functions (KEYWORD2)
+doMagic	KEYWORD2
+addEndpoint	KEYWORD2
+getState	KEYWORD2
+setState	KEYWORD2
+setLevel	KEYWORD2
+getLevel	KEYWORD2
+getColorR	KEYWORD2
+getColorG	KEYWORD2
+getColorB	KEYWORD2
+setTemperature	KEYWORD2
+getTemperature	KEYWORD2
+setHeatingSetpoint	KEYWORD2
+getHeatingSetpoint	KEYWORD2
+networkSetSsid	KEYWORD2
+networkSetPass	KEYWORD2
+networkSetSecure	KEYWORD2
+networkSetup	KEYWORD2
+networkStart	KEYWORD2
+wrapperSetServer	KEYWORD2
+wrapperSetUsernamePassword	KEYWORD2
+wrapperSetup	KEYWORD2
+
+# Instances (KEYWORD2)
+
+# Constants (LITERAL1)

library.properties

@@ -1,9 +1,10 @@
 name=homecontrol-mqtt
-version=0.1
-author=homecontrol
-maintainer=homecontrol
+version=1.0.0
+author=Home Control <integration@homecontrol.no>
+maintainer=Home Control <integration@homecontrol.no>
 sentence=A client library for MQTT messaging.
 paragraph= This library allows you to send and receive MQTT messages with HomeControlAS system.
 category=Communication
 url=https://github.com/HomeControlAS/homecontrol-mqtt
-architectures=*
+architectures=*
+depends=PubSubClient

src/Endpoints/EndpointThermostat.cpp

@@ -0,0 +1,66 @@
+#include "EndpointThermostat.h"
+#include "HomeControlMagic.h"
+#include "debugDefines.h"
+#include "helperFunctions.h"
+#include "printWrapper.h"
+
+static char* const CONFIG = "thrmstt";
+
+EndpointThermostat::EndpointThermostat(HomeControlMagic* hcm_ptr)
+    : Endpoint(hcm_ptr)
+    , m_temperature(0)
+{
+    m_config = CONFIG;
+}
+
+void EndpointThermostat::setTemperature(double temperature)
+{
+    m_temperature = temperature;
+}
+
+double EndpointThermostat::getTemperature()
+{
+    return m_temperature;
+}
+
+void EndpointThermostat::setHeatingSetpoint(double temperature)
+{
+    m_heating_setpoint = temperature;
+}
+
+double EndpointThermostat::getHeatingSetpoint()
+{
+    return m_heating_setpoint;
+}
+
+void EndpointThermostat::incomingMessage(char* topic, uint8_t* payload, unsigned int length)
+{
+#ifdef ENDPOINT_THERMOSTAT_DEBUG
+    print(F("Incoming message, EndpointThermostat"));
+#endif
+
+    if(lineContains(topic, "chs"))
+    {
+        m_heating_setpoint = extractDouble(payload, length);
+    }
+
+    else if(lineContains(topic, "shs"))
+    {
+        m_owner->sendMessage("shs", m_heating_setpoint, m_id);
+    }
+
+    else if(lineContains(topic, "st"))
+    {
+        m_owner->sendMessage("st", m_temperature, m_id);
+    }
+}
+
+void EndpointThermostat::sendFeedbackMessage()
+{
+#ifdef ENDPOINT_THERMOSTAT_DEBUG
+    print(F("Sending feedback message, EndpointThermostat"));
+#endif
+
+    m_owner->sendMessage("st", m_temperature, m_id);
+    m_owner->sendMessage("shs", m_heating_setpoint, m_id);
+}

src/Endpoints/EndpointTemperatureTarget.h → src/Endpoints/EndpointThermostat.h

@@ -2,22 +2,22 @@
 
 #include "Endpoint.h"
 
-class EndpointTemperatureTarget : public Endpoint
+class EndpointThermostat : public Endpoint
 {
 public:
-    EndpointTemperatureTarget(HomeControlMagic* hcm_ptr);
+    EndpointThermostat(HomeControlMagic* hcm_ptr);
 
     virtual void sendFeedbackMessage();
 
     virtual void incomingMessage(char* topic, uint8_t* payload, unsigned int length);
 
     virtual void setTemperature(double temperature);
-    virtual void setTemperatureTarget(double temperature);
+    virtual void setHeatingSetpoint(double temperature);
 
     virtual double getTemperature();
-    virtual double getTemperatureTarget();
+    virtual double getHeatingSetpoint();
 
 protected:
     double m_temperature;
-    double m_temperature_target;
+    double m_heating_setpoint;
 };

src/debugDefines.h

@@ -7,7 +7,7 @@
 #define HCM_DEBUG
 #define ENDPOINT_DEBUG
 #define ENDPOINT_ZERO_DEBUG
-#define ENDPOINT_TEMPERATURE_TARGET_DEBUG
+#define ENDPOINT_THERMOSTAT_DEBUG
 #define ENDPOINT_TEMPERATURE_DEBUG
 #define ENDPOINT_ON_OFF_DEBUG
 #define ENDPOINT_MOTION_DEBUG
@@ -21,7 +21,7 @@
 // #define HCM_DEBUG
 // #define ENDPOINT_DEBUG
 // #define ENDPOINT_ZERO_DEBUG
-// #define ENDPOINT_TEMPERATURE_TARGET_DEBUG
+// #define ENDPOINT_THERMOSTAT_DEBUG
 // #define ENDPOINT_TEMPERATURE_DEBUG
 // #define ENDPOINT_ON_OFF_DEBUG
 // #define ENDPOINT_MOTION_DEBUG