In TriggerMessage.req connector_id is optional

In TriggerMessage.req connector_id is optional and if  connector_id is set by invalid  value will send rejected.for meter value if the connectorId is relevant but absent, this should be interpreted as “for all allowed connectorId values”. I am not sure about send meter values for connector 0 (zero)

Author: mahdidadashi65

src/chargepoint/metervalues/MeterValuesManager.cpp

@@ -188,10 +188,23 @@ void MeterValuesManager::getTxStopMeterValues(unsigned int connector_id, std::ve
 bool MeterValuesManager::onTriggerMessage(ocpp::types::MessageTrigger message, const ocpp::types::Optional<unsigned int>& connector_id)
 {
     bool ret = false;
-    if (connector_id.isSet() && (message == MessageTrigger::MeterValues))
+
+    if (message == MessageTrigger::MeterValues)
     {
-        processTriggered(connector_id);
-        ret = true;
+        if (connector_id.isSet())
+        {
+            processTriggered(connector_id);
+            ret = true;
+        }
+        else
+        {
+            for (const Connector* connector : m_connectors.getConnectors())
+            {
+                unsigned int id = connector->id;
+                processTriggered(id);
+            }
+            ret = true;
+        }
     }
     return ret;
 }
@@ -201,12 +214,25 @@ bool MeterValuesManager::onTriggerMessage(ocpp::types::MessageTriggerEnumType
                                           const ocpp::types::Optional<unsigned int>& connector_id)
 {
     bool ret = false;
-    if (connector_id.isSet() && (message == MessageTriggerEnumType::MeterValues))
+    if (message == MessageTriggerEnumType::MeterValues)
     {
-        processTriggered(connector_id);
-        ret = true;
+        if (connector_id.isSet())
+        {
+            processTriggered(connector_id);
+            ret = true;
+        }
+        else
+        {
+            for (const Connector* connector : m_connectors.getConnectors())
+            {
+                unsigned int id = connector->id;
+                processTriggered(id);
+            }
+            ret = true;
+        }
     }
     return ret;
+
 }
 
 /** @copydoc void IConfigChangedListener::configurationValueChanged(const std::string&) */

src/chargepoint/trigger/TriggerMessageManager.cpp

@@ -85,8 +85,14 @@ bool TriggerMessageManager::handleMessage(const ocpp::messages::TriggerMessageRe
     }
     else
     {
-        // Check connector id
-        if (!request.connectorId.isSet() || m_connectors.isValid(request.connectorId))
+        // Check invalid connector id
+        if (request.connectorId.isSet() && !m_connectors.isValid(request.connectorId))
+        {
+            error_code    = ocpp::rpc::IRpc::RPC_ERROR_PROPERTY_CONSTRAINT_VIOLATION;
+            error_message = "Invalid connector id";
+            response.status = TriggerMessageStatus::Rejected;
+        }
+        else
         {
             // Call handler
             if (it->second->onTriggerMessage(request.requestedMessage, request.connectorId))
@@ -100,11 +106,6 @@ bool TriggerMessageManager::handleMessage(const ocpp::messages::TriggerMessageRe
                 LOG_WARNING << "Trigger message rejected : " << trigger_message;
             }
         }
-        else
-        {
-            error_code    = ocpp::rpc::IRpc::RPC_ERROR_PROPERTY_CONSTRAINT_VIOLATION;
-            error_message = "Invalid connector id";
-        }
     }
 
     return ret;
@@ -136,26 +137,27 @@ bool TriggerMessageManager::handleMessage(const ocpp::messages::ExtendedTriggerM
     }
     else
     {
-        // Check connector id
-        if (!request.connectorId.isSet() || m_connectors.isValid(request.connectorId))
+        // Check invalid connector id
+        if (request.connectorId.isSet() && !m_connectors.isValid(request.connectorId))
+        {
+            error_code    = ocpp::rpc::IRpc::RPC_ERROR_PROPERTY_CONSTRAINT_VIOLATION;
+            error_message = "Invalid connector id";
+            response.status = TriggerMessageStatusEnumType::Rejected;
+        }
+        else
         {
             // Call handler
             if (it->second->onTriggerMessage(request.requestedMessage, request.connectorId))
             {
                 response.status = TriggerMessageStatusEnumType::Accepted;
-                LOG_INFO << "Extended trigger message accepted : " << trigger_message;
+                LOG_INFO << "Trigger message accepted : " << trigger_message;
             }
             else
             {
                 response.status = TriggerMessageStatusEnumType::Rejected;
-                LOG_WARNING << "Extended trigger message rejected : " << trigger_message;
+                LOG_WARNING << "Trigger message rejected : " << trigger_message;
             }
         }
-        else
-        {
-            error_code    = ocpp::rpc::IRpc::RPC_ERROR_PROPERTY_CONSTRAINT_VIOLATION;
-            error_message = "Invalid connector id";
-        }
     }
 
     return ret;