vinothkrstatiq
diff --git a/‎src/ArduinoOcpp/Tasks/ChargePointStatus/ConnectorStatus.cpp‎
Lines changed: 19 additions & 0 deletions b/‎src/ArduinoOcpp/Tasks/ChargePointStatus/ConnectorStatus.cpp‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎src/ArduinoOcpp/Tasks/ChargePointStatus/ConnectorStatus.h‎
Lines changed: 9 additions & 5 deletions b/‎src/ArduinoOcpp/Tasks/ChargePointStatus/ConnectorStatus.h‎
Lines changed: 9 additions & 5 deletions
@@ -31,6 +31,7 @@ ConnectorStatus::ConnectorStatus(OcppModel& context, int connectorId)
     sIdTag = declareConfiguration<const char *>(keySession.c_str(), "", CONFIGURATION_FN, false, false, true, false);
     transactionId = declareConfiguration<int>(keyTx.c_str(), -1, CONFIGURATION_FN, false, false, true, false);
     availability = declareConfiguration<int>(keyAvailability.c_str(), AVAILABILITY_OPERATIVE, CONFIGURATION_FN, false, false, true, false);
+    connectionTimeOut = declareConfiguration<int>("ConnectionTimeOut", 30, CONFIGURATION_FN, true, true, true, false);
     if (!sIdTag || !transactionId || !availability) {
         AO_DBG_ERR("Cannot declare sessionIdTag, transactionId or availability");
     }
@@ -138,6 +139,19 @@ OcppMessage *ConnectorStatus::loop() {
         }
     }
 
+    if (connectionTimeOutListen) {
+        if (getTransactionId() >= 0 || !session) {
+            AO_DBG_DEBUG("Session mngt: release connectionTimeOut");
+            connectionTimeOutListen = false;
+        } else {
+            if (connectionTimeOutTimestamp - ao_tick_ms() >= ((ulong) *connectionTimeOut) * 1000UL) {
+                AO_DBG_INFO("Session mngt: timeout");
+                endSession();
+                connectionTimeOutListen = false;
+            }
+        }
+    }
+
     auto inferencedStatus = inferenceStatus();
 
     if (inferencedStatus != currentStatus) {
@@ -174,6 +188,9 @@ void ConnectorStatus::beginSession(const char *sessionIdTag) {
     sIdTag->setValue(idTag, IDTAG_LEN_MAX + 1);
     saveState();
     session = true;
+
+    connectionTimeOutListen = true;
+    connectionTimeOutTimestamp = ao_tick_ms();
 }
 
 void ConnectorStatus::endSession() {
@@ -184,6 +201,8 @@ void ConnectorStatus::endSession() {
         saveState();
     }
     session = false;
+
+    connectionTimeOutListen = false;
 }
 
 const char *ConnectorStatus::getSessionIdTag() {
 
@@ -24,21 +24,25 @@ class ConnectorStatus {
 
     const int connectorId;
 
-    std::shared_ptr<Configuration<int>> availability = nullptr;
+    std::shared_ptr<Configuration<int>> availability {nullptr};
 
     bool session = false;
     char idTag [IDTAG_LEN_MAX + 1] = {'\0'};
-    std::shared_ptr<Configuration<const char *>> sIdTag = nullptr;
-    std::shared_ptr<Configuration<int>> transactionId = nullptr;
+    std::shared_ptr<Configuration<const char *>> sIdTag {nullptr};
+    std::shared_ptr<Configuration<int>> transactionId {nullptr};
     int transactionIdSync = -1;
 
-    std::function<bool()> connectorPluggedSampler = nullptr;
+    std::shared_ptr<Configuration<int>> connectionTimeOut {nullptr}; //in seconds
+    bool connectionTimeOutListen {false};
+    ulong connectionTimeOutTimestamp {0}; //in milliseconds
+
+    std::function<bool()> connectorPluggedSampler {nullptr};
     std::function<bool()> evRequestsEnergySampler {nullptr};
     std::function<bool()> connectorEnergizedSampler {nullptr};
     std::vector<std::function<const char *()>> connectorErrorCodeSamplers;
     const char *getErrorCode();
     OcppEvseState currentStatus = OcppEvseState::NOT_SET;
-    std::function<bool()> onUnlockConnector = nullptr;
+    std::function<bool()> onUnlockConnector {nullptr};
 public:
     ConnectorStatus(OcppModel& context, int connectorId);