Merge pull request #154 from c-jimenez/fix/reservation_connector_0

[chargepoint] Change connector 0 state to Available  when previously Reserved and a transaction is started on 1 of the connectors

Author: c-jimenez

src/chargepoint/ChargePoint.cpp

@@ -292,6 +292,7 @@ bool ChargePoint::start()
                                                                          *m_msg_dispatcher,
                                                                          *m_msg_sender,
                                                                          m_requests_fifo,
+                                                                         *m_status_manager,
                                                                          *m_authent_manager,
                                                                          *m_reservation_manager,
                                                                          *m_meter_values_manager,

src/chargepoint/transaction/TransactionManager.cpp

@@ -46,6 +46,7 @@ TransactionManager::TransactionManager(ocpp::config::IOcppConfig&
                                        ocpp::messages::IMessageDispatcher&             msg_dispatcher,
                                        ocpp::messages::GenericMessageSender&           msg_sender,
                                        ocpp::messages::IRequestFifo&                   requests_fifo,
+                                       IStatusManager&                                 status_manager,
                                        IAuthentManager&                                authent_manager,
                                        ReservationManager&                             reservation_manager,
                                        IMeterValuesManager&                            meter_values_manager,
@@ -56,6 +57,7 @@ TransactionManager::TransactionManager(ocpp::config::IOcppConfig&
       m_events_handler(events_handler),
       m_connectors(connectors),
       m_msg_sender(msg_sender),
+      m_status_manager(status_manager),
       m_authent_manager(authent_manager),
       m_reservation_manager(reservation_manager),
       m_meter_values_manager(meter_values_manager),
@@ -121,6 +123,9 @@ ocpp::types::AuthorizationStatus TransactionManager::startTransaction(unsigned i
 
                                 // Clear reservation
                                 m_reservation_manager.clearReservation(connector_id);
+
+                                // Reset charge point status to Available
+                                m_status_manager.updateConnectorStatus(Connectors::CONNECTOR_ID_CHARGE_POINT, ChargePointStatus::Available);
                             }
                         }
                     }

src/chargepoint/transaction/TransactionManager.h

@@ -49,6 +49,7 @@ class ReservationManager;
 class IChargePointEventsHandler;
 class IMeterValuesManager;
 class ISmartChargingManager;
+class IStatusManager;
 
 /** @brief Handle charge point transaction requests */
 class TransactionManager
@@ -64,6 +65,7 @@ class TransactionManager
                        ocpp::messages::IMessageDispatcher&             msg_dispatcher,
                        ocpp::messages::GenericMessageSender&           msg_sender,
                        ocpp::messages::IRequestFifo&                   requests_fifo,
+                       IStatusManager&                                 status_manager,
                        IAuthentManager&                                authent_manager,
                        ReservationManager&                             reservation_manager,
                        IMeterValuesManager&                            meter_values_manager,
@@ -120,6 +122,8 @@ class TransactionManager
     Connectors& m_connectors;
     /** @brief Message sender */
     ocpp::messages::GenericMessageSender& m_msg_sender;
+    /** @brief Status manager */
+    IStatusManager& m_status_manager;
     /** @brief Authentication manager */
     IAuthentManager& m_authent_manager;
     /** @brief Reservation manager */