Merge pull request #4 from c-jimenez/dev/force_faulted

add MQTT topic to force cp status to faulted

Author: c-jimenez

README.md

@@ -330,7 +330,7 @@ The expected command payload is :
  }
  ```
 
- Each connector of the simulated Charge Point are listening to the following topic to simulate interaction with a user resenting an RFID card : **cp_simu/cps/simu_cp_XXX/connectors/N/id_tag** where **N** stands for the connector number.
+Each connector of the simulated Charge Point are listening to the following topic to simulate interaction with a user resenting an RFID card : **cp_simu/cps/simu_cp_XXX/connectors/N/id_tag** where **N** stands for the connector number.
 
 The expected command payload is :
 
@@ -339,3 +339,13 @@ The expected command payload is :
     "id": "ID_TAG"
  }
  ```
+
+Each connector of the simulated Charge Point are listening to the following topic to force the Charge Point in faulted status : **cp_simu/cps/simu_cp_XXX/connectors/N/faulted** where **N** stands for the connector number.
+
+The expected command payload is :
+
+ ```
+ {
+    "faulted": false
+ }
+ ```

makefile

@@ -108,7 +108,7 @@ docker-build-cp-simulator:
 
 
 run-simu:
-	docker run $(DOCKER_INTERACTIVE) --rm  --network=host --name ocpp-simu $(DOCKER_SIMULATOR_IMAGE)
+	docker run $(DOCKER_INTERACTIVE) --rm  --network=host --name ocpp-simu $(DOCKER_SIMULATOR_IMAGE) -c test_ocpp
 
 run-launcher:
 	docker run $(DOCKER_INTERACTIVE) --rm  --network=host --name ocpp-launcher --entrypoint /cp_simulator/launcher $(DOCKER_SIMULATOR_IMAGE)

src/chargepoint/mqtt/MqttManager.cpp

@@ -157,7 +157,7 @@ void MqttManager::mqttMessageReceived(const char* topic, const std::string& mess
                         }
                     }
                 }
-                else
+                else if (topic_path.filename().compare("id_tag") == 0)
                 {
                     if (payload.HasMember("id"))
                     {
@@ -168,6 +168,17 @@ void MqttManager::mqttMessageReceived(const char* topic, const std::string& mess
                         }
                     }
                 }
+                else if (topic_path.filename().compare("faulted") == 0)
+                {
+                    if (payload.HasMember("faulted"))
+                    {
+                        rapidjson::Value& faulted = payload["faulted"];
+                        if (faulted.IsBool())
+                        {
+                            connector_data.fault_pending = faulted.GetBool();
+                        }
+                    }
+                }
             }
             else
             {
@@ -184,11 +195,12 @@ void MqttManager::start(unsigned int nb_phases, unsigned int max_charge_point_cu
     std::string chargepoint_topic(CHARGE_POINTS_TOPIC);
     chargepoint_topic += m_config.stackConfig().chargePointIdentifier() + "/";
 
-    std::string chargepoint_cmd_topic  = chargepoint_topic + "cmd";
-    std::string chargepoint_car_topics = chargepoint_topic + "connectors/+/car";
-    std::string chargepoint_tag_topics = chargepoint_topic + "connectors/+/id_tag";
-    m_status_topic                     = chargepoint_topic + "status";
-    m_connectors_topic                 = chargepoint_topic + "connectors/";
+    std::string chargepoint_cmd_topic      = chargepoint_topic + "cmd";
+    std::string chargepoint_car_topics     = chargepoint_topic + "connectors/+/car";
+    std::string chargepoint_tag_topics     = chargepoint_topic + "connectors/+/id_tag";
+    std::string chargepoint_faulted_topics = chargepoint_topic + "connectors/+/faulted";
+    m_status_topic                         = chargepoint_topic + "status";
+    m_connectors_topic                     = chargepoint_topic + "connectors/";
 
     // MQTT client
     m_mqtt = IMqttClient::create(m_config.stackConfig().chargePointIdentifier());
@@ -208,8 +220,8 @@ void MqttManager::start(unsigned int nb_phases, unsigned int max_charge_point_cu
             std::cout << "Subscribing to charge point's command topic: " << chargepoint_cmd_topic << std::endl;
             if (m_mqtt->subscribe(chargepoint_cmd_topic))
             {
-                std::cout << "Subscribing to charge point's connector topics: " << chargepoint_car_topics << " and " << chargepoint_tag_topics << std::endl;
-                if (m_mqtt->subscribe(chargepoint_car_topics) && m_mqtt->subscribe(chargepoint_tag_topics))
+                std::cout << "Subscribing to charge point's connector topics: " << chargepoint_car_topics << " and " << chargepoint_tag_topics << " and " << chargepoint_faulted_topics << std::endl;
+                if (m_mqtt->subscribe(chargepoint_car_topics) && m_mqtt->subscribe(chargepoint_tag_topics) && m_mqtt->subscribe(chargepoint_faulted_topics))
                 {
                     // Wait for disconnection or end of application
                     std::cout << "Ready!" << std::endl;