Add getLastUpdated() to DaylightSensor and ZLLTemperature.

Jojo-1000 · Moritz Wirger
1 parent 65ddf858
Showing 7 changed files with 36 additions and 3 deletions
include/hueplusplus/ResourceList.h
include/hueplusplus/Sensor.h
include/hueplusplus/TimePattern.h
include/hueplusplus/ZLLSensors.h
src/Sensor.cpp
src/ZLLSensors.cpp
test/test_SensorImpls.cpp
@@ -319,7 +319,7 @@ public:
             this->stateCache.refresh();
             return this->maybeStoi(idStr);
         }
-        return BaseResourceList::IdType {};
+        return typename BaseResourceList::IdType {};
     }
  
 protected:
@@ -336,6 +336,11 @@ public:
     //! \brief Get reported daylight status
     bool isDaylight() const;
  
+    //! \brief Get time of last status update
+    //! \returns The last update time, or a time with a zero duration from epoch
+    //! if the last update time is not set.
+    time::AbsoluteTime getLastUpdated() const;
+
     //! \brief Daylight sensor type name
     static constexpr const char* typeStr = "Daylight";
 };
@@ -24,6 +24,7 @@
  
 #include <chrono>
 #include <string>
+#include <cstddef>
  
 namespace hueplusplus
 {
@@ -422,7 +423,7 @@ private:
     Type type;
     union
     {
-        nullptr_t undefined;
+        std::nullptr_t undefined;
         AbsoluteVariedTime absolute;
         RecurringTime recurring;
         TimeInterval interval;
@@ -246,6 +246,11 @@ public:
     //! \returns Temperature in 0.01 degrees Celsius.
     int getTemperature() const;
  
+    //! \brief Get time of last status update
+    //! \returns The last update time, or a time with a zero duration from epoch
+    //! if the last update time is not set.
+    time::AbsoluteTime getLastUpdated() const;
+
     //! \brief ZLLTemperature sensor type name
     static constexpr const char* typeStr = "ZLLTemperature";
 };
@@ -326,5 +326,16 @@ bool DaylightSensor::isDaylight() const
 {
     return state.getValue().at("state").at("daylight").get<bool>();
 }
+
+time::AbsoluteTime DaylightSensor::getLastUpdated() const
+{
+    const nlohmann::json& stateJson = state.getValue().at("state");
+    auto it = stateJson.find("lastupdated");
+    if (it == stateJson.end() || !it->is_string() || *it == "none")
+    {
+        return time::AbsoluteTime(std::chrono::system_clock::time_point(std::chrono::seconds{ 0 }));
+    }
+    return time::AbsoluteTime::parseUTC(it->get<std::string>());
+}
 } // namespace sensors
 } // namespace hueplusplus
@@ -215,6 +215,17 @@ int ZLLTemperature::getTemperature() const
     return state.getValue().at("state").at("temperature").get<int>();
 }
  
+time::AbsoluteTime ZLLTemperature::getLastUpdated() const
+{
+    const nlohmann::json& stateJson = state.getValue().at("state");
+    auto it = stateJson.find("lastupdated");
+    if (it == stateJson.end() || !it->is_string() || *it == "none")
+    {
+        return time::AbsoluteTime(std::chrono::system_clock::time_point(std::chrono::seconds{ 0 }));
+    }
+    return time::AbsoluteTime::parseUTC(it->get<std::string>());
+}
+
 constexpr const char* ZLLLightLevel::typeStr;
  
 bool ZLLLightLevel::isOn() const
@@ -97,7 +97,7 @@ TYPED_TEST_SUITE(SensorReachableTest, SensorReachableTypes);
 template <typename T>
 class SensorUpdateTest : public SensorImplTest<T>
 { };
-using SensorUpdateTypes = Types<CLIPSwitch, ZLLSwitch, ZLLPresence, ZLLLightLevel>;
+using SensorUpdateTypes = Types<CLIPSwitch, ZLLSwitch, ZLLPresence, ZLLLightLevel, ZLLTemperature, DaylightSensor>;
 TYPED_TEST_SUITE(SensorUpdateTest, SensorUpdateTypes);
  
 template <typename T>