[chargepoint] Handle change availability requests

Author: Cédric Jimenez

src/chargepoint/ConnectorData.h

@@ -75,6 +75,8 @@ struct ConnectorData
     std::chrono::steady_clock::time_point preparing_start;
     /** @brief Indicate that a fault occured */
     bool fault_pending;
+    /** @brief Indicate that an unavailable request has be scheduled */
+    bool unavailable_pending;
     /** @brief Meter */
     MeterSimulator* meter;
 };

src/chargepoint/SimulatedChargePoint.cpp

@@ -185,6 +185,7 @@ void SimulatedChargePoint::loop(MqttManager&                     mqtt,
                         // Clear any id tag
                         connector.id_tag        = "";
                         connector.parent_id_tag = "";
+                        mqtt.resetIdTagPending(connector.id);
                     }
                     break;
 
@@ -235,6 +236,11 @@ void SimulatedChargePoint::loop(MqttManager&                     mqtt,
                     {
                         charge_point.statusNotification(connector.id, ChargePointStatus::Faulted);
                     }
+                    // If unavailable request pending => Unavailable
+                    else if (connector.unavailable_pending)
+                    {
+                        charge_point.statusNotification(connector.id, ChargePointStatus::Unavailable);
+                    }
                     else
                     {
                         // Stay in current state
@@ -411,6 +417,11 @@ void SimulatedChargePoint::loop(MqttManager&                     mqtt,
                     {
                         charge_point.statusNotification(connector.id, ChargePointStatus::Faulted);
                     }
+                    // If unavailable request pending => Unavailable
+                    else if (connector.unavailable_pending)
+                    {
+                        charge_point.statusNotification(connector.id, ChargePointStatus::Unavailable);
+                    }
                     else
                     {
                         // Stay in current state
@@ -431,6 +442,15 @@ void SimulatedChargePoint::loop(MqttManager&                     mqtt,
                     {
                         charge_point.statusNotification(connector.id, ChargePointStatus::Available);
                     }
+                    // If unavailable request pending => Unavailable
+                    else if (connector.unavailable_pending)
+                    {
+                        charge_point.statusNotification(connector.id, ChargePointStatus::Unavailable);
+                    }
+                    else
+                    {
+                        // Stay in current state
+                    }
                 }
                 break;
 

src/chargepoint/ocpp/ChargePointEventsHandler.cpp

@@ -89,8 +89,24 @@ void ChargePointEventsHandler::datetimeReceived(const ocpp::types::DateTime& dat
 ocpp::types::AvailabilityStatus ChargePointEventsHandler::changeAvailabilityRequested(unsigned int                  connector_id,
                                                                                       ocpp::types::AvailabilityType availability)
 {
+    AvailabilityStatus ret = AvailabilityStatus::Accepted;
     cout << "Change availability requested : " << connector_id << " - " << AvailabilityTypeHelper.toString(availability) << endl;
-    return AvailabilityStatus::Accepted;
+    ConnectorData& connector = m_connectors->at(connector_id - 1u);
+    if (availability == AvailabilityType::Inoperative)
+    {
+        if ((connector.status != ChargePointStatus::Available) && (connector.status != ChargePointStatus::Reserved) &&
+            (connector.status != ChargePointStatus::Faulted))
+        {
+            connector.unavailable_pending = true;
+            ret                           = AvailabilityStatus::Scheduled;
+        }
+    }
+    else
+    {
+        connector.unavailable_pending = false;
+    }
+
+    return ret;
 }
 
 /** @copydoc unsigned int IChargePointEventsHandler::getTxStartStopMeterValue(unsigned int) */