Merge pull request #4 from c-jimenez/fix/clock_aligned_data_interval

[metervalues] Added listener to ClockAlignedDataInterval key to reconfigure timer on key value update

Author: c-jimenez

src/chargepoint/ChargePoint.cpp

@@ -238,7 +238,8 @@ bool ChargePoint::start()
                                                                       m_connectors,
                                                                       *m_msg_sender,
                                                                       *m_status_manager,
-                                                                      *m_trigger_manager);
+                                                                      *m_trigger_manager,
+                                                                      *m_config_manager);
         m_smart_charging_manager = std::make_unique<SmartChargingManager>(
             m_stack_config, m_ocpp_config, m_database, m_timer_pool, m_worker_pool, m_connectors, m_messages_converter, *m_msg_dispatcher);
         m_transaction_manager = std::make_unique<TransactionManager>(m_ocpp_config,

src/chargepoint/metervalues/MeterValuesManager.cpp

@@ -46,7 +46,8 @@ MeterValuesManager::MeterValuesManager(ocpp::config::IOcppConfig&            ocp
                                        Connectors&                           connectors,
                                        ocpp::messages::GenericMessageSender& msg_sender,
                                        IStatusManager&                       status_manager,
-                                       ITriggerMessageManager&               trigger_manager)
+                                       ITriggerMessageManager&               trigger_manager,
+                                       IConfigManager&                       config_manager)
     : m_ocpp_config(ocpp_config),
       m_database(database),
       m_events_handler(events_handler),
@@ -66,6 +67,9 @@ MeterValuesManager::MeterValuesManager(ocpp::config::IOcppConfig&            ocp
     trigger_manager.registerHandler(MessageTrigger::MeterValues, *this);
     m_clock_aligned_timer.setCallback(std::bind(&MeterValuesManager::processClockAligned, this));
 
+    // Register configuration change handler
+    config_manager.registerConfigChangedListener("ClockAlignedDataInterval", *this);
+
     // Start clock aligned and sample timers
     configureClockAlignedTimer();
     for (const Connector* connector : m_connectors.getConnectors())
@@ -194,6 +198,28 @@ bool MeterValuesManager::onTriggerMessage(ocpp::types::MessageTrigger message, u
     return ret;
 }
 
+/** @copydoc void IConfigChangedListener::configurationValueChanged(const std::string&) */
+void MeterValuesManager::configurationValueChanged(const std::string& key)
+{
+    // No need to check key, only ClockAlignedDataInterval is monitored
+    (void)key;
+
+    // Check new value
+    std::chrono::seconds interval = m_ocpp_config.clockAlignedDataInterval();
+    if (interval == std::chrono::seconds(0))
+    {
+        // Disable clock aligned values
+        m_clock_aligned_timer.stop();
+
+        LOG_INFO << "Clock aligned meter values disabled";
+    }
+    else
+    {
+        // Reconfigure clock aligned timer
+        configureClockAlignedTimer();
+    }
+}
+
 /** @brief Configure clock-aligned timer */
 void MeterValuesManager::configureClockAlignedTimer(void)
 {
@@ -204,6 +230,8 @@ void MeterValuesManager::configureClockAlignedTimer(void)
     std::chrono::seconds interval = m_ocpp_config.clockAlignedDataInterval();
     if (interval >= std::chrono::seconds(0))
     {
+        LOG_INFO << "Configure clock aligned meter values : interval in seconds = " << interval.count();
+
         // Compute next due date
         time_t    now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
         struct tm aligned_time_tm;

src/chargepoint/metervalues/MeterValuesManager.h

@@ -21,6 +21,7 @@ along with OpenOCPP. If not, see <http://www.gnu.org/licenses/>.
 
 #include "Database.h"
 #include "Enums.h"
+#include "IConfigManager.h"
 #include "IMeterValuesManager.h"
 #include "ITriggerMessageManager.h"
 #include "Timer.h"
@@ -50,7 +51,9 @@ class IChargePointEventsHandler;
 class IStatusManager;
 
 /** @brief Handle charge point meter values requests */
-class MeterValuesManager : public IMeterValuesManager, public ITriggerMessageManager::ITriggerMessageHandler
+class MeterValuesManager : public IMeterValuesManager,
+                           public ITriggerMessageManager::ITriggerMessageHandler,
+                           public IConfigManager::IConfigChangedListener
 {
   public:
     /** @brief Constructor */
@@ -62,7 +65,8 @@ class MeterValuesManager : public IMeterValuesManager, public ITriggerMessageMan
                        Connectors&                           connectors,
                        ocpp::messages::GenericMessageSender& msg_sender,
                        IStatusManager&                       status_manager,
-                       ITriggerMessageManager&               trigger_manager);
+                       ITriggerMessageManager&               trigger_manager,
+                       IConfigManager&                       config_manager);
 
     /** @brief Destructor */
     virtual ~MeterValuesManager();
@@ -89,6 +93,11 @@ class MeterValuesManager : public IMeterValuesManager, public ITriggerMessageMan
     /** @copydoc bool ITriggerMessageManager::ITriggerMessageHandler::onTriggerMessage(ocpp::types::MessageTrigger message, unsigned int) */
     bool onTriggerMessage(ocpp::types::MessageTrigger message, unsigned int connector_id) override;
 
+    // IConfigChangedListener interface
+
+    /** @copydoc void IConfigChangedListener::configurationValueChanged(const std::string&) */
+    void configurationValueChanged(const std::string& key) override;
+
   private:
     /** @brief Standard OCPP configuration */
     ocpp::config::IOcppConfig& m_ocpp_config;