Used a bitmap rather than uint8_t and sync EnergyTimeUtils files from the EVSE_Add_Get_Set_Clear_Targets_Support branch

Author: PeterC1965

examples/energy-management-app/energy-management-common/include/EnergyTimeUtils.h

@@ -18,9 +18,11 @@
 
 #pragma once
 
+#include <app-common/zap-generated/cluster-enums.h>
 #include <app/util/config.h>
 #include <cstring>
 #include <lib/core/CHIPError.h>
+#include <lib/support/BitMask.h>
 #include <protocols/Protocols.h>
 #include <time.h>
 
@@ -45,16 +47,26 @@ CHIP_ERROR GetEpochTS(uint32_t & chipEpoch);
  *
  * @param   unixEpoch (as time_t)
  *
- * @return  bitmap value for day of week as defined by EnergyEvse::TargetDayOfWeekBitmap
+ * @return  bitmap value for day of week as defined by EnergyEvse::TargetDayOfWeekBitmap. Note
+ *          only one bit will be set for the day of the week.
  */
-uint8_t GetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch);
+BitMask<EnergyEvse::TargetDayOfWeekBitmap> GetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch);
 
 /**
  * @brief   Helper function to get current timestamp and work out the day of week based on localtime
  *
- * @param   reference to hold the day of week as a bitmap as defined by EnergyEvse::TargetDayOfWeekBitmap
+ * @param   reference to hold the day of week as a bitmap as defined by EnergyEvse::TargetDayOfWeekBitmap.
+ *          Note only one bit will be set for the current day.
  */
-CHIP_ERROR GetLocalDayOfWeekNow(uint8_t & dayOfWeekMap);
+CHIP_ERROR GetLocalDayOfWeekNow(BitMask<EnergyEvse::TargetDayOfWeekBitmap> & dayOfWeekMap);
+
+/**
+ * @brief   Helper function to get current timestamp and work out the current number of minutes
+ *          past midnight based on localtime
+ *
+ * @param   reference to hold the number of minutes past midnight
+ */
+CHIP_ERROR GetMinutesPastMidnight(uint16_t & minutesPastMidnight);
 
 } // namespace DeviceEnergyManagement
 } // namespace Clusters

examples/energy-management-app/energy-management-common/src/EnergyTimeUtils.cpp

@@ -80,9 +80,10 @@ CHIP_ERROR GetEpochTS(uint32_t & chipEpoch)
  *
  * @param   unixEpoch (as time_t)
  *
- * @return  bitmap value for day of week as defined by EnergyEvse::TargetDayOfWeekBitmap
+ * @return  bitmap value for day of week as defined by EnergyEvse::TargetDayOfWeekBitmap. Note
+ *          only one bit will be set for the day of the week.
  */
-uint8_t GetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch)
+BitMask<EnergyEvse::TargetDayOfWeekBitmap> GetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch)
 {
     // Define a timezone structure and initialize it to the local timezone
     // This will capture any daylight saving time changes
@@ -101,9 +102,10 @@ uint8_t GetLocalDayOfWeekFromUnixEpoch(time_t unixEpoch)
 /**
  * @brief   Helper function to get current timestamp and work out the day of week based on localtime
  *
- * @param   reference to hold the day of week as a bitmap as defined by EnergyEvse::TargetDayOfWeekBitmap
+ * @return  bitmap value for day of week as defined by EnergyEvse::TargetDayOfWeekBitmap. Note
+ *          only one bit will be set for the current day.
  */
-CHIP_ERROR GetLocalDayOfWeekNow(uint8_t & dayOfWeekMap)
+CHIP_ERROR GetLocalDayOfWeekNow(BitMask<EnergyEvse::TargetDayOfWeekBitmap> & dayOfWeekMap)
 {
     System::Clock::Milliseconds64 cTMs;
     CHIP_ERROR err = chip::System::SystemClock().GetClock_RealTimeMS(cTMs);
@@ -118,6 +120,33 @@ CHIP_ERROR GetLocalDayOfWeekNow(uint8_t & dayOfWeekMap)
     return CHIP_NO_ERROR;
 }
 
+/**
+ * @brief   Helper function to get current timestamp and work out the current number of minutes
+ *          past midnight based on localtime
+ *
+ * @param   reference to hold the number of minutes past midnight
+ */
+CHIP_ERROR GetMinutesPastMidnight(uint16_t & minutesPastMidnight)
+{
+    chip::System::Clock::Milliseconds64 cTMs;
+    CHIP_ERROR err = chip::System::SystemClock().GetClock_RealTimeMS(cTMs);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(Zcl, "EVSE: unable to get current time to check user schedules error=%" CHIP_ERROR_FORMAT, err.Format());
+        return err;
+    }
+    time_t unixEpoch = std::chrono::duration_cast<chip::System::Clock::Seconds32>(cTMs).count();
+
+    // Define a timezone structure and initialize it to the local timezone
+    // This will capture any daylight saving time changes
+    struct tm local_time;
+    localtime_r(&unixEpoch, &local_time);
+
+    minutesPastMidnight = static_cast<uint16_t>((local_time.tm_hour * 60) + local_time.tm_min);
+
+    return err;
+}
+
 } // namespace DeviceEnergyManagement
 } // namespace Clusters
 } // namespace app