v2.0.1 Reset (UCs B11 - B12) (#286)

* implement UCs B11, B12

* add Reset test cases and fixes

Author: matth-x

CHANGELOG.md

@@ -23,6 +23,7 @@
     - Transactions (preview only), UCs E01 - E12 ([#247](https://github.com/matth-x/MicroOcpp/pull/247))
     - StatusNotification compatibility ([#247](https://github.com/matth-x/MicroOcpp/pull/247))
     - ChangeAvailability compatibility ([#285](https://github.com/matth-x/MicroOcpp/pull/285))
+    - Reset compatibility, UCs B11 - B12 ([#286](https://github.com/matth-x/MicroOcpp/pull/286))
 
 ### Fixed
 

CMakeLists.txt

@@ -140,6 +140,7 @@ set(MO_SRC_UNIT
     tests/Metering.cpp
     tests/Configuration.cpp
     tests/Reservation.cpp
+    tests/Reset.cpp
     tests/LocalAuthList.cpp
     tests/Variables.cpp
     tests/Transactions.cpp

README.md

@@ -80,7 +80,8 @@ The following OCPP 2.0.1 use cases are implemented:
 | UC | Description | Note |
 | :--- | :--- | :--- |
 | M03 - M05 | Certificate management | Enable Mbed-TLS to use the built-in certificate store |
-| B05 - B06 | Variables | No persistency yet |
+| B05 - B07 | Variables | No persistency yet |
+| B01 - B04<br>B11 - B12 | Provisioning | Ported from OCPP 1.6 |
 | E01 - E12 | Transactions | |
 | - | Protocol negotiation | The charger can select the OCPP version at runtime |
 

src/MicroOcpp.cpp

@@ -289,8 +289,6 @@ void mocpp_initialize(Connection& connection, const char *bootNotificationCreden
         new AuthorizationService(*context, filesystem)));
     model.setReservationService(std::unique_ptr<ReservationService>(
         new ReservationService(*context, MO_NUMCONNECTORS)));
-    model.setResetService(std::unique_ptr<ResetService>(
-        new ResetService(*context)));
 
 #if MO_ENABLE_V201
     model.setVariableService(std::unique_ptr<VariableService>(
@@ -299,6 +297,18 @@ void mocpp_initialize(Connection& connection, const char *bootNotificationCreden
         new TransactionService(*context)));
 #endif
 
+#if MO_ENABLE_V201
+    if (version.major == 2) {
+        //depends on VariableService
+        model.setResetServiceV201(std::unique_ptr<Ocpp201::ResetService>(
+            new Ocpp201::ResetService(*context)));
+    } else
+#endif
+    {
+        model.setResetService(std::unique_ptr<ResetService>(
+            new ResetService(*context)));
+    }
+
     std::unique_ptr<CertificateStore> certStoreUse;
     if (certStore) {
         certStoreUse = std::move(certStore);
@@ -322,8 +332,7 @@ void mocpp_initialize(Connection& connection, const char *bootNotificationCreden
 #endif //MO_PLATFORM == MO_PLATFORM_ARDUINO && !defined(MO_CUSTOM_UPDATER)
 
 #if MO_PLATFORM == MO_PLATFORM_ARDUINO && (defined(ESP32) || defined(ESP8266))
-    if (!model.getResetService()->getExecuteReset())
-        model.getResetService()->setExecuteReset(makeDefaultResetFn());
+    setOnResetExecute(makeDefaultResetFn());
 #endif
 
     model.getBootService()->setChargePointCredentials(bootNotificationCredentials);
@@ -883,6 +892,15 @@ void setOnResetNotify(std::function<bool(bool)> onResetNotify) {
         return;
     }
 
+#if MO_ENABLE_V201
+    if (context->getVersion().major == 2) {
+        if (auto rService = context->getModel().getResetServiceV201()) {
+            rService->setNotifyReset([onResetNotify] (ResetType) {return onResetNotify(true);});
+        }
+        return;
+    }
+#endif
+
     if (auto rService = context->getModel().getResetService()) {
         rService->setPreReset(onResetNotify);
     }
@@ -894,6 +912,15 @@ void setOnResetExecute(std::function<void(bool)> onResetExecute) {
         return;
     }
 
+#if MO_ENABLE_V201
+    if (context->getVersion().major == 2) {
+        if (auto rService = context->getModel().getResetServiceV201()) {
+            rService->setExecuteReset([onResetExecute] () {onResetExecute(true); return true;});
+        }
+        return;
+    }
+#endif
+
     if (auto rService = context->getModel().getResetService()) {
         rService->setExecuteReset(onResetExecute);
     }

src/MicroOcpp/Model/Model.cpp

@@ -79,6 +79,9 @@ void Model::loop() {
 #if MO_ENABLE_V201
     if (transactionService)
         transactionService->loop();
+    
+    if (resetServiceV201)
+        resetServiceV201->loop();
 #endif
 }
 
@@ -222,6 +225,15 @@ void Model::setTransactionService(std::unique_ptr<TransactionService> ts) {
 TransactionService *Model::getTransactionService() const {
     return transactionService.get();
 }
+
+void Model::setResetServiceV201(std::unique_ptr<Ocpp201::ResetService> rs) {
+    this->resetServiceV201 = std::move(rs);
+    capabilitiesUpdated = true;
+}
+
+Ocpp201::ResetService *Model::getResetServiceV201() const {
+    return resetServiceV201.get();
+}
 #endif
 
 Clock& Model::getClock() {

src/MicroOcpp/Model/Model.h

@@ -29,6 +29,10 @@ class CertificateService;
 #if MO_ENABLE_V201
 class VariableService;
 class TransactionService;
+
+namespace Ocpp201 {
+class ResetService;
+}
 #endif
 
 class Model {
@@ -50,6 +54,7 @@ class Model {
 #if MO_ENABLE_V201
     std::unique_ptr<VariableService> variableService;
     std::unique_ptr<TransactionService> transactionService;
+    std::unique_ptr<Ocpp201::ResetService> resetServiceV201;
 #endif
 
     Clock clock;
@@ -117,6 +122,9 @@ class Model {
 
     void setTransactionService(std::unique_ptr<TransactionService> ts);
     TransactionService *getTransactionService() const;
+
+    void setResetServiceV201(std::unique_ptr<Ocpp201::ResetService> rs);
+    Ocpp201::ResetService *getResetServiceV201() const;
 #endif
 
     Clock &getClock();

src/MicroOcpp/Model/Reset/ResetDefs.h

@@ -0,0 +1,24 @@
+// matth-x/MicroOcpp
+// Copyright Matthias Akstaller 2019 - 2024
+// MIT License
+
+#ifndef MO_RESETDEFS_H
+#define MO_RESETDEFS_H
+
+#include <MicroOcpp/Version.h>
+
+#if MO_ENABLE_V201
+
+typedef enum ResetType {
+    ResetType_Immediate,
+    ResetType_OnIdle
+}   ResetType;
+
+typedef enum ResetStatus {
+    ResetStatus_Accepted,
+    ResetStatus_Rejected,
+    ResetStatus_Scheduled
+}   ResetStatus;
+
+#endif //MO_ENABLE_V201
+#endif