Merge pull request #245 from jorisoffouga/fix/MeterValueSampleInterval

[metervalues] Enhance MeterValuesManager to support dynamic meter val…

Author: c-jimenez

src/chargepoint/metervalues/MeterValuesManager.cpp

@@ -73,11 +73,13 @@ MeterValuesManager::MeterValuesManager(ocpp::config::IOcppConfig&            ocp
 
     // Register configuration change handler
     config_manager.registerConfigChangedListener("ClockAlignedDataInterval", *this);
+    config_manager.registerConfigChangedListener("MeterValueSampleInterval", *this);
 
     // Start clock aligned and sample timers
     configureClockAlignedTimer();
-    for (const Connector* connector : m_connectors.getConnectors())
+    for (Connector* connector : m_connectors.getConnectors())
     {
+        connector->meter_values_timer.setCallback(std::bind(&MeterValuesManager::processSampled, this, connector->id));
         if (connector->transaction_id != 0)
         {
             startSampledMeterValues(connector->id);
@@ -131,7 +133,6 @@ void MeterValuesManager::startSampledMeterValues(unsigned int connector_id)
         if (connector)
         {
             // Start meter value timer for the connector
-            connector->meter_values_timer.setCallback(std::bind(&MeterValuesManager::processSampled, this, connector_id));
             connector->meter_values_timer.start(interval);
         }
     }
@@ -235,23 +236,74 @@ bool MeterValuesManager::onTriggerMessage(ocpp::types::MessageTriggerEnumType
 /** @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))
+    if (key == "metervaluesampleinterval")
+    {
+        // Check new value
+        std::chrono::seconds interval = m_ocpp_config.meterValueSampleInterval();
+        for (Connector* connector : m_connectors.getConnectors())
+        {
+            if (interval == std::chrono::seconds(0))
+            {
+                // Disable meter values
+                connector->meter_values_timer.stop();
+                LOG_INFO << "Meter values disabled on connector " << connector->id;
+            }
+            else if (connector->status == ocpp::types::ChargePointStatus::Charging)
+            {
+                configureMeterValueSampleTimer(connector->id, interval);
+            }
+        }
+    }else if (key == "clockaligneddatainterval")
     {
-        // Disable clock aligned values
-        m_clock_aligned_timer.stop();
+        // 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";
+            LOG_INFO << "Clock aligned meter values disabled";
+        }
+        else
+        {
+            // Reconfigure clock aligned timer
+            configureClockAlignedTimer();
+        }
     }
-    else
+}
+
+/** @brief Configure meter value sample timer */
+void MeterValuesManager::configureMeterValueSampleTimer(const unsigned int connector_id, const std::chrono::seconds interval)
+{
+    Connector* connector = m_connectors.getConnector(connector_id);
+
+    if (!connector) {
+        return;
+    }
+
+    // Reconfigure meter value timer
+    // Stop timer
+    connector->meter_values_timer.stop();
+
+    LOG_INFO << "Configure meter values on connector " << connector->id << " : 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;
+#ifdef _MSC_VER
+    localtime_s(&aligned_time_tm, &now);
+#else  // _MSC_VER
+    localtime_r(&now, &aligned_time_tm);
+#endif // _MSC_VER
+    aligned_time_tm.tm_min = 0;
+    aligned_time_tm.tm_sec = 0;
+    time_t aligned_time    = std::mktime(&aligned_time_tm);
+    while (aligned_time <= now)
     {
-        // Reconfigure clock aligned timer
-        configureClockAlignedTimer();
+        aligned_time += interval.count();
     }
+    std::chrono::seconds next_due_interval = std::chrono::seconds(aligned_time - now);
+    connector->meter_values_timer.start(std::chrono::milliseconds(next_due_interval));
 }
 
 /** @brief Configure clock-aligned timer */

src/chargepoint/metervalues/MeterValuesManager.h

@@ -134,6 +134,8 @@ class MeterValuesManager : public IMeterValuesManager,
     /** @brief Query to insert a meter value associated to a transaction */
     std::unique_ptr<ocpp::database::Database::Query> m_insert_query;
 
+    /** @brief Configure the meter value sample timer */
+    void configureMeterValueSampleTimer(const unsigned int connector_id, const std::chrono::seconds interval);
     /** @brief Configure clock-aligned timer */
     void configureClockAlignedTimer(void);
     /** @brief Process clock-aligned meter values */

tests/chargepoint/metervalues/test_metervalues.cpp

@@ -582,14 +582,14 @@ TEST_SUITE("Metervalues component")
 
         // Disable clock aligned values
         ocpp_config.setConfigValue("ClockAlignedDataInterval", "0");
-        meter_mgr.configurationValueChanged("ClockAlignedDataInterval");
+        meter_mgr.configurationValueChanged("clockaligneddatainterval");
 
         // Check periodic timer configuration
         CHECK_FALSE(periodic_timer->isStarted());
 
         // Re-enable clock aligned values
         ocpp_config.setConfigValue("ClockAlignedDataInterval", "100");
-        meter_mgr.configurationValueChanged("ClockAlignedDataInterval");
+        meter_mgr.configurationValueChanged("clockaligneddatainterval");
 
         // Check periodic timer configuration
         CHECK(periodic_timer->isStarted());