Merge pull request #191 from c-jimenez/integ/dev_mahdidadashi65

Allow to send infos in status notifications messages even if their are no errors + fix decimal precision to 1 digit

Author: c-jimenez

examples/common/DefaultChargePointEventsHandler.cpp

@@ -169,15 +169,15 @@ bool DefaultChargePointEventsHandler::remoteStartTransactionRequested(unsigned i
     bool ret = false;
     cout << "Remote start transaction : " << connector_id << " - " << id_tag << endl;
 
-    if(connector_id > m_config.ocppConfig().numberOfConnectors() || connector_id == 0)
+    if (connector_id > m_config.ocppConfig().numberOfConnectors() || connector_id == 0)
     {
-        ret=false;
+        ret = false;
     }
     else
     {
         m_remote_start_pending[connector_id - 1u] = true;
         m_remote_start_id_tag[connector_id - 1u]  = id_tag;
-        ret=true;
+        ret                                       = true;
     }
     return ret;
 }

examples/common/config/OcppConfig.cpp

@@ -207,8 +207,8 @@ ocpp::types::ConfigurationStatus OcppConfig::setConfiguration(const std::string&
                 }
             }
 
-             if (ret != ConfigurationStatus::Rejected)
-             {
+            if (ret != ConfigurationStatus::Rejected)
+            {
                 if ((it->second & PARAM_OCPP) != 0)
                 {
                     m_config.set(OCPP_PARAMS, key, value);
@@ -225,7 +225,7 @@ ocpp::types::ConfigurationStatus OcppConfig::setConfiguration(const std::string&
                 {
                     ret = ConfigurationStatus::Accepted;
                 }
-             }
+            }
         }
         else
         {

src/chargepoint/smartcharging/ProfileDatabase.cpp

@@ -362,6 +362,7 @@ std::string ProfileDatabase::serialize(const ocpp::types::ChargingProfile& profi
 
     rapidjson::StringBuffer                    buffer;
     rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+    writer.SetMaxDecimalPlaces(1); // OCPP decimals have 1 digit precision
     profile_json.Accept(writer);
     profile_str = buffer.GetString();
     return profile_str;

src/chargepoint/smartcharging/SmartChargingManager.cpp

@@ -303,7 +303,7 @@ bool SmartChargingManager::handleMessage(const ocpp::messages::SetChargingProfil
                         }
                         else
                         {
-                            ret = false;
+                            ret           = false;
                             error_message = "Recurring profiles must have a start schedule and a duration";
                         }
                     }

src/messages/IMessageConverter.h

@@ -94,6 +94,17 @@ class IMessageConverter
         json.AddMember(rapidjson::StringRef(name), rapidjson::Value(value), *allocator);
     }
 
+    /**
+     * @brief Helper function to fill a floating point value in a JSON object
+     * @param json JSON object to fill
+     * @param field Name of the field to fill
+     * @param value Floating point value to fill
+     */
+    void fill(rapidjson::Value& json, const char* name, const double value)
+    {
+        json.AddMember(rapidjson::StringRef(name), rapidjson::Value(value), *allocator);
+    }
+
     /**
      * @brief Helper function to fill a string value in a JSON object
      * @param json JSON object to fill

src/messages/StatusNotification.cpp

@@ -71,8 +71,8 @@ bool StatusNotificationReqConverter::fromJson(const rapidjson::Value& json,
     extract(json, "info", data.info);
     data.status = ChargePointStatusHelper.fromString(json["status"].GetString());
     ret         = ret && extract(json, "timestamp", data.timestamp, error_message);
-    extract(json, "info", data.vendorId);
-    extract(json, "info", data.vendorErrorCode);
+    extract(json, "vendorId", data.vendorId);
+    extract(json, "vendorErrorCode", data.vendorErrorCode);
     if (!ret)
     {
         error_code = ocpp::rpc::IRpc::RPC_ERROR_TYPE_CONSTRAINT_VIOLATION;
@@ -87,12 +87,12 @@ bool StatusNotificationReqConverter::toJson(const StatusNotificationReq& data, r
     fill(json, "errorCode", ChargePointErrorCodeHelper.toString(data.errorCode));
     fill(json, "status", ChargePointStatusHelper.toString(data.status));
     fill(json, "timestamp", data.timestamp);
-    if (data.errorCode != ChargePointErrorCode::NoError)
-    {
+    if (data.info.isSet())
         fill(json, "info", data.info);
+    if (data.vendorId.isSet())
         fill(json, "vendorId", data.vendorId);
+    if (data.vendorErrorCode.isSet())
         fill(json, "vendorErrorCode", data.vendorErrorCode);
-    }
     return true;
 }
 

src/rpc/RpcBase.cpp

@@ -75,6 +75,7 @@ bool RpcBase::call(const std::string&         action,
         // Serialize message
         rapidjson::StringBuffer                    buffer;
         rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        writer.SetMaxDecimalPlaces(1); // OCPP decimals have 1 digit precision
         payload.Accept(writer);
 
         std::stringstream serialized_message;
@@ -186,6 +187,7 @@ void RpcBase::processIncomingRequest(std::shared_ptr<RpcMessage>& rpc_message)
         // Serialize message
         rapidjson::StringBuffer                    buffer;
         rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        writer.SetMaxDecimalPlaces(1); // OCPP decimals have 1 digit precision
         response.Accept(writer);
 
         std::stringstream serialized_message;

src/websockets/libwebsockets/LibWebsocketClientPool.cpp

@@ -144,7 +144,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;