Fix date in days strucd and function CompareDay

Author: Michail-Antropov

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

@@ -32,11 +32,8 @@ using namespace chip::app::Clusters::EnergyCalendar::Attributes;
 
 constexpr uint32_t kOneDay = 24 * 60 * 60;
 
-static TransitionDayOfWeekBitmap GetDayOfWeek(uint32_t date)
+static void ParceDay(uint32_t date, uint16_t & year, uint8_t & month, uint8_t & dayOfMonth, uint8_t & weekDay)
 {
-    uint16_t year;
-    uint8_t month;
-    uint8_t dayOfMonth;
     uint8_t hour;
     uint8_t minute;
     uint8_t second;
@@ -45,9 +42,7 @@ static TransitionDayOfWeekBitmap GetDayOfWeek(uint32_t date)
     ChipEpochToCalendarTime(date, year, month, dayOfMonth, hour, minute, second);
     uint8_t weekDayOffeset = FirstWeekdayOfYear(year);
     CalendarDateToOrdinalDate(year, month, dayOfMonth, dayOfYear);
-    uint8_t weekDay = static_cast<uint8_t>((dayOfYear -1 + weekDayOffeset) % kDaysPerWeek);
-
-    return static_cast<TransitionDayOfWeekBitmap>(1 << weekDay);
+    weekDay = static_cast<uint8_t>((dayOfYear -1 + weekDayOffeset) % kDaysPerWeek);
 }
 
 #if 0
@@ -235,6 +230,9 @@ 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;
@@ -243,21 +241,22 @@ DataModel::Nullable<Structs::DayStruct::Type> CalendarProviderInstance::GetDay(u
     uint16_t year;
     uint8_t month;
     uint8_t dayOfMonth;
-    uint8_t hour;
-    uint8_t minute;
-    uint8_t second;
-    ChipEpochToCalendarTime(date, year, month, dayOfMonth, hour, minute, second);
+    uint8_t weekDay;
+
+    ParceDay(date, year, month, dayOfMonth, weekDay);
 
     for (auto & day : mSpecialDays)
     {
         if (day.date.HasValue())
         {
             dt = day.date.Value();
-            if (((dt & 0xFF)!=0xFF) && ((dt & 0xFF) != (uint8_t)(year - 1900)))
+            if (!EQUAL_BYTE(dt, 0, 0xFF) && !EQUAL_BYTE(dt, 0, year - 1900))
+                continue;
+            if (!EQUAL_BYTE(dt, 8, 0) && !EQUAL_BYTE(dt, 8, month))
                 continue;
-            if (((dt >>8) & 0xFF) != month)
+            if (!EQUAL_BYTE(dt, 16, 0) && !EQUAL_BYTE(dt, 16, dayOfMonth))
                 continue;
-            if (((dt >>16) & 0xFF) != dayOfMonth)
+            if (!EQUAL_BYTE(dt, 24, 0) && !EQUAL_BYTE(dt, 24, weekDay))
                 continue;
             return day;
         }
@@ -268,7 +267,6 @@ DataModel::Nullable<Structs::DayStruct::Type> CalendarProviderInstance::GetDay(u
         return result;
     }
 
-    TransitionDayOfWeekBitmap week_day = GetDayOfWeek(date);
 
     for (auto & period : mCalendarPeriods)
     {
@@ -282,7 +280,7 @@ DataModel::Nullable<Structs::DayStruct::Type> CalendarProviderInstance::GetDay(u
         {
             for (auto & day : period.days)
             {
-                if (day.daysOfWeek.ValueOr(0).Has(week_day))
+                if (day.daysOfWeek.ValueOr(0).Has(static_cast<TransitionDayOfWeekBitmap>(1 << weekDay)))
                 {
                     result = day;
                     break;