Merge branch 'main' of https://github.com/matth-x/MicroOcppSimulator into feature/v201-update

Author: matth-x

src/api.cpp

@@ -83,6 +83,9 @@ int mocpp_api_call(const char *endpoint, MicroOcpp::Method method, const char *b
             if (request.containsKey("evPlugged")) {
                 evse->setEvPlugged(request["evPlugged"]);
             }
+            if (request.containsKey("evsePlugged")) {
+            evse->setEvsePlugged(request["evsePlugged"]);
+            }
             if (request.containsKey("evReady")) {
                 evse->setEvReady(request["evReady"]);
             }
@@ -92,6 +95,7 @@ int mocpp_api_call(const char *endpoint, MicroOcpp::Method method, const char *b
         }
 
         response["evPlugged"] = evse->getEvPlugged();
+        response["evsePlugged"] = evse->getEvsePlugged();
         response["evReady"] = evse->getEvReady();
         response["evseReady"] = evse->getEvseReady();
         response["chargePointStatus"] = evse->getOcppStatus();

src/evse.cpp

@@ -40,6 +40,9 @@ void Evse::setup() {
     snprintf(key, 30, "evPlugged_cId_%u", connectorId);
     trackEvPluggedKey = key;
     trackEvPluggedBool = MicroOcpp::declareConfiguration(trackEvPluggedKey.c_str(), false, SIMULATOR_FN, false, false, false);
+    snprintf(key, 30, "evsePlugged_cId_%u", connectorId);
+    trackEvsePluggedKey = key;
+    trackEvsePluggedBool = MicroOcpp::declareConfiguration(trackEvsePluggedKey.c_str(), false, SIMULATOR_FN, false, false, false);
     snprintf(key, 30, "evReady_cId_%u", connectorId);
     trackEvReadyKey = key;
     trackEvReadyBool = MicroOcpp::declareConfiguration(trackEvReadyKey.c_str(), false, SIMULATOR_FN, false, false, false);
@@ -124,7 +127,7 @@ void Evse::loop() {
         status = MicroOcpp::cstrFromOcppEveState(curStatus);
     }
 
-    bool simulate_isCharging = ocppPermitsCharge(connectorId) && trackEvPluggedBool->getBool() && trackEvReadyBool->getBool() && trackEvseReadyBool->getBool();
+    bool simulate_isCharging = ocppPermitsCharge(connectorId) && trackEvPluggedBool->getBool() && trackEvsePluggedBool->getBool() && trackEvReadyBool->getBool() && trackEvseReadyBool->getBool();
 
     simulate_isCharging &= limit_power >= 720.f; //minimum charging current is 6A (720W for 120V grids) according to J1772
 
@@ -189,6 +192,17 @@ bool Evse::getEvPlugged() {
     return trackEvPluggedBool->getBool();
 }
 
+void Evse::setEvsePlugged(bool plugged) {
+    if (!trackEvsePluggedBool) return;
+    trackEvsePluggedBool->setBool(plugged);
+    MicroOcpp::configuration_save();
+}
+
+bool Evse::getEvsePlugged() {
+    if (!trackEvsePluggedBool) return false;
+    return trackEvsePluggedBool->getBool();
+}
+
 void Evse::setEvReady(bool ready) {
     if (!trackEvReadyBool) return;
     trackEvReadyBool->setBool(ready);

src/evse.h

@@ -17,6 +17,8 @@ class Evse {
 
     std::shared_ptr<MicroOcpp::Configuration> trackEvPluggedBool;
     std::string trackEvPluggedKey;
+    std::shared_ptr<MicroOcpp::Configuration> trackEvsePluggedBool;
+    std::string trackEvsePluggedKey;
     std::shared_ptr<MicroOcpp::Configuration> trackEvReadyBool;
     std::string trackEvReadyKey;
     std::shared_ptr<MicroOcpp::Configuration> trackEvseReadyBool;
@@ -43,6 +45,10 @@ class Evse {
 
     bool getEvPlugged();
 
+    void setEvsePlugged(bool plugged);
+    
+    bool getEvsePlugged();
+
     void setEvReady(bool ready);
 
     bool getEvReady();