Merge pull request #201 from c-jimenez/dev/get_composite_schedule

Dev/get composite schedule

Author: c-jimenez

src/chargepoint/reservation/ReservationManager.cpp

@@ -185,8 +185,8 @@ bool ReservationManager::handleMessage(const ocpp::messages::ReserveNowReq& requ
     if (connector)
     {
         // Check if reservation is allowed on connector
-         if (((request.connectorId != 0) || ((request.connectorId == 0) && m_ocpp_config.reserveConnectorZeroSupported()))
-            &&( m_ocpp_config.supportedFeatureProfiles().find("Reservation")!= std::string::npos) )
+        if (((request.connectorId != 0) || ((request.connectorId == 0) && m_ocpp_config.reserveConnectorZeroSupported())) &&
+            (m_ocpp_config.supportedFeatureProfiles().find("Reservation") != std::string::npos))
         {
             std::lock_guard<std::mutex> lock(connector->mutex);
 

src/chargepoint/smartcharging/SmartChargingManager.cpp

@@ -356,9 +356,26 @@ bool SmartChargingManager::handleMessage(const ocpp::messages::GetCompositeSched
     (void)error_code;
     (void)error_message;
 
+    ocpp::types::ChargingRateUnitType charging_rate_unit;
+    if (!request.chargingRateUnit.isSet())
+    {
+        if (m_ocpp_config.chargingScheduleAllowedChargingRateUnit().find("Power") != std::string::npos)
+        {
+            charging_rate_unit = types::ChargingRateUnitType::W;
+        }
+        else
+        {
+            charging_rate_unit = types::ChargingRateUnitType::A;
+        }
+    }
+    else
+    {
+        charging_rate_unit = request.chargingRateUnit.value();
+    }
+
     LOG_INFO << "GetCompositeSchedule requested : connectorId = " << request.connectorId << " - duration = " << request.duration
-             << " - chargingRateUnit = "
-             << (request.chargingRateUnit.isSet() ? ChargingRateUnitTypeHelper.toString(request.chargingRateUnit) : "not set");
+             << " - chargingRateUnit = " << ChargingRateUnitTypeHelper.toString(charging_rate_unit)
+             << (!request.chargingRateUnit.isSet() ? " (from allowed charging unit)" : "");
 
     // Lock profiles
     std::lock_guard<std::mutex> lock(m_mutex);
@@ -442,14 +459,8 @@ bool SmartChargingManager::handleMessage(const ocpp::messages::GetCompositeSched
 
             ChargingSchedule& schedule = response.chargingSchedule.value();
             schedule.duration          = 0;
-            if (request.chargingRateUnit.isSet())
-            {
-                schedule.chargingRateUnit = request.chargingRateUnit;
-            }
-            else
-            {
-                schedule.chargingRateUnit = ChargingRateUnitType::A;
-            }
+            schedule.chargingRateUnit  = charging_rate_unit;
+
             // Adjust start if needed since first period must start at 0
             time_t offset          = periods[0].start;
             schedule.startSchedule = DateTime(now.timestamp() + offset);

src/websockets/libwebsockets/LibWebsocketClientPool.cpp

@@ -147,7 +147,7 @@ void LibWebsocketClientPool::process()
 
     // Dummy vhost to handle context related events
     struct lws_protocols             protocols[] = {{"LibWebsocketClientPool", &LibWebsocketClientPool::eventCallback, 0, 0, 0, this, 0},
-                                                    LWS_PROTOCOL_LIST_TERM};
+                                        LWS_PROTOCOL_LIST_TERM};
     struct lws_context_creation_info vhost_info;
     memset(&vhost_info, 0, sizeof(vhost_info));
     vhost_info.protocols = protocols;