Set Features over Json

Support Date type in DayStruct

Author: Michail-Antropov

examples/all-clusters-app/all-clusters-common/include/energy-calendar-instance.h

@@ -67,6 +67,7 @@ class CalendarProviderInstance : public CalendarProvider
     DataModel::Nullable<Structs::PeakPeriodStruct::Type> mNextPeak;
 
     void JsonToCalendarPeriodStruct(Json::Value & root, Structs::CalendarPeriodStruct::Type & value);
+    void JsonToDateStruct(Json::Value & root, Structs::DateStruct::Type & value);
     void JsonToDayStruct(Json::Value & root, Structs::DayStruct::Type & value);
     void JsonToPeakPeriodStruct(Json::Value & root, Structs::PeakPeriodStruct::Type & value);
 

examples/all-clusters-app/all-clusters-common/src/energy-calendar-instance.cpp

@@ -45,6 +45,10 @@ static void ParceDay(uint32_t date, uint16_t & year, uint8_t & month, uint8_t &
     weekDay = static_cast<uint8_t>((dayOfYear -1 + weekDayOffeset) % kDaysPerWeek);
 }
 
+namespace chip::app::Clusters::EnergyCalendar {
+    static void RestartServer(uint32_t features);
+}
+
 #if 0
 static uint64_t GetCurrentDateTime(void)
 {
@@ -93,6 +97,16 @@ CHIP_ERROR CalendarProviderInstance::LoadJson(Json::Value & root)
     DataModel::Nullable<uint32_t> eventID;
     Structs::PeakPeriodStruct::Type peak;
 
+    if (root.isMember("Features"))
+    {
+        value = root.get("Features", Json::Value());
+        if (value.isUInt() && value.asUInt() <= 0x0F)
+        {
+            RestartServer(value.asUInt());
+            return CHIP_NO_ERROR;
+        }
+    }
+
     if (root.isMember("CalendarID"))
     {
         value = root.get("CalendarID", Json::Value());
@@ -230,33 +244,30 @@ void chip::app::Clusters::EnergyCalendar::CalendarProviderInstance::ErrorMessage
     va_end(v);
 }
 
-//
-#define EQUAL_BYTE(a, offset, expected)     (((a)>>(offset) & 0xFF) == (uint8_t)(expected))
-
 DataModel::Nullable<Structs::DayStruct::Type> CalendarProviderInstance::GetDay(uint32_t date)
 {
     DataModel::Nullable<Structs::DayStruct::Type> result = std::nullopt;
-    uint32_t dt;
+    Structs::DateStruct::Type dt;
 
     uint16_t year;
     uint8_t month;
     uint8_t dayOfMonth;
-    uint8_t weekDay;
+    uint8_t dayOfWeek;
 
-    ParceDay(date, year, month, dayOfMonth, weekDay);
+    ParceDay(date, year, month, dayOfMonth, dayOfWeek);
 
     for (auto & day : mSpecialDays)
     {
         if (day.date.HasValue())
         {
             dt = day.date.Value();
-            if (!EQUAL_BYTE(dt, 0, 0xFF) && !EQUAL_BYTE(dt, 0, year - 1900))
+            if (!dt.year.IsNull() && dt.year.Value() != (uint8_t)(year - 1900))
                 continue;
-            if (!EQUAL_BYTE(dt, 8, 0) && !EQUAL_BYTE(dt, 8, month))
+            if (!dt.month.IsNull() && dt.month.Value() != month)
                 continue;
-            if (!EQUAL_BYTE(dt, 16, 0) && !EQUAL_BYTE(dt, 16, dayOfMonth))
+            if (!dt.day.IsNull() && dt.day.Value() != dayOfMonth)
                 continue;
-            if (!EQUAL_BYTE(dt, 24, 0) && !EQUAL_BYTE(dt, 24, weekDay))
+            if (!dt.dayOfWeek.IsNull() && dt.dayOfWeek.Value() != dayOfWeek)
                 continue;
             return day;
         }
@@ -267,7 +278,6 @@ DataModel::Nullable<Structs::DayStruct::Type> CalendarProviderInstance::GetDay(u
         return result;
     }
 
-
     for (auto & period : mCalendarPeriods)
     {
         if (period.startDate.ValueOr(0) > date)
@@ -280,7 +290,7 @@ DataModel::Nullable<Structs::DayStruct::Type> CalendarProviderInstance::GetDay(u
         {
             for (auto & day : period.days)
             {
-                if (day.daysOfWeek.ValueOr(0).Has(static_cast<TransitionDayOfWeekBitmap>(1 << weekDay)))
+                if (day.daysOfWeek.ValueOr(0).Has(static_cast<TransitionDayOfWeekBitmap>(1 << dayOfWeek)))
                 {
                     result = day;
                     break;
@@ -313,12 +323,41 @@ void CalendarProviderInstance::JsonToCalendarPeriodStruct(Json::Value & root, St
     }
 }
 
+void CalendarProviderInstance::JsonToDateStruct(Json::Value & root, Structs::DateStruct::Type & value)
+{
+    Json::Value t = root.get("Year", Json::Value());
+    if (!t.empty() && t.isUInt() && t.asUInt() <= 0xff)
+    {
+        value.year.SetNonNull(t.asUInt());
+    }
+
+    t = root.get("Month", Json::Value());
+    if (!t.empty() && t.isUInt() && t.asUInt() >= 1 && t.asUInt() <= 12)
+    {
+        value.month.SetNonNull(t.asUInt());
+    }
+
+    t = root.get("Day", Json::Value());
+    if (!t.empty() && t.isUInt() && t.asUInt() >= 1 && t.asUInt() <= 31)
+    {
+        value.day.SetNonNull(t.asUInt());
+    }
+
+    t = root.get("DayOfWeek", Json::Value());
+    if (!t.empty() && t.isUInt() && t.asUInt() >= 1 && t.asUInt() <= 37)
+    {
+        value.dayOfWeek.SetNonNull(t.asUInt());
+    }
+}
+
 void CalendarProviderInstance::JsonToDayStruct(Json::Value & root, Structs::DayStruct::Type & value)
 {
     Json::Value t = root.get("Date", Json::Value());
-    if (!t.empty() && t.isUInt() && t.asUInt() < static_cast<uint32_t>(-1))
+    if (!t.empty())
     {
-        value.date.SetValue(t.asUInt());
+        Structs::DateStruct::Type date;
+        JsonToDateStruct(t, date);
+        value.date.SetValue(date);
     }
 
     t = root.get("DaysOfWeek", Json::Value());
@@ -478,6 +517,8 @@ void CalendarProviderInstance::FreeMemoryCalendarPeriodStructList(DataModel::Lis
 
 static std::unique_ptr<CalendarProviderInstance> gMIDelegate;
 static std::unique_ptr<EnergyCalendarServer> gMIInstance;
+static BitMask<Feature> gMIFeature = BitMask<Feature, uint32_t>(
+        Feature::kPricingTier, Feature::kFriendlyCredit, Feature::kAuxiliaryLoad, Feature::kPeakPeriod);
 
 void emberAfEnergyCalendarClusterInitCallback(chip::EndpointId endpointId)
 {
@@ -489,8 +530,7 @@ void emberAfEnergyCalendarClusterInitCallback(chip::EndpointId endpointId)
     {
         gMIDelegate->Init();
 
-        gMIInstance = std::make_unique<EnergyCalendarServer>(BitMask<Feature, uint32_t>(
-            Feature::kPricingTier, Feature::kFriendlyCredit, Feature::kAuxiliaryLoad, Feature::kPeakPeriod));
+        gMIInstance = std::make_unique<EnergyCalendarServer>(gMIFeature);
 
         gMIInstance->Init();
 
@@ -506,3 +546,20 @@ CalendarProviderInstance * chip::app::Clusters::EnergyCalendar::GetProvider()
 {
     return &(*gMIDelegate);
 }
+
+void chip::app::Clusters::EnergyCalendar::RestartServer(uint32_t features)
+{
+    gMIFeature = static_cast<BitMask<Feature>>(features);
+
+    VerifyOrDie(gMIInstance);
+    gMIInstance.reset();
+
+    gMIInstance = std::make_unique<EnergyCalendarServer>(gMIFeature);
+    gMIInstance->Init();
+
+    CHIP_ERROR err = gMIInstance->AddCalendarProvider(&(*gMIDelegate));
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(NotSpecified, "Failed to add Calendar provider: %s", err.AsString());
+    }
+}

src/app/clusters/energy-calendar-server/energy-calendar-server.cpp

@@ -303,19 +303,19 @@ bool CalendarProvider::CheckPeriods(DataModel::List<Structs::CalendarPeriodStruc
 
 bool CalendarProvider::CheckSpecialDays(DataModel::List<Structs::DayStruct::Type> & specialDays)
 {
-    uint32_t date = 0;
+    //uint32_t date = 0;
     VerifyOrReturnLogSend(specialDays.size() <= 50, mEndpoint, "Special Days list size must be no more 50");
     for (auto & day : specialDays)
     {
         VerifyOrReturnLogSend(!day.daysOfWeek.HasValue(), mEndpoint, "Day in Special Days cannot have DayOfWeek value");
         VerifyOrReturnLogSend(!day.calendarID.HasValue(), mEndpoint, "Day in Special Days cannot have CalendarID value");
         VerifyOrReturnLogSend(day.date.HasValue(), mEndpoint, "Day in Special Days must have Date value");
-        VerifyOrReturnLogSend(day.date.Value() > date, mEndpoint, "Days in Special Days must be order");
+        //VerifyOrReturnLogSend(day.date.Value() > date, mEndpoint, "Days in Special Days must be order");
         if(!CheckDay(day))
         {
             return false;
         }
-        date = day.date.Value();
+        //date = day.date.Value();
     }
 
     return true;