init with v201 in C-API directly

Author: matth-x

src/MicroOcpp_c.cpp

@@ -5,6 +5,7 @@
 #include "MicroOcpp_c.h"
 #include "MicroOcpp.h"
 
+#include <MicroOcpp/Version.h>
 #include <MicroOcpp/Model/Certificates/Certificate_c.h>
 #include <MicroOcpp/Core/Context.h>
 #include <MicroOcpp/Model/Model.h>
@@ -15,11 +16,14 @@
 
 MicroOcpp::Connection *ocppSocket = nullptr;
 
-void ocpp_initialize(OCPP_Connection *conn, const char *chargePointModel, const char *chargePointVendor, struct OCPP_FilesystemOpt fsopt, bool autoRecover) {
-    ocpp_initialize_full(conn, ChargerCredentials(chargePointModel, chargePointVendor), fsopt, autoRecover);
+void ocpp_initialize(OCPP_Connection *conn, const char *chargePointModel, const char *chargePointVendor, struct OCPP_FilesystemOpt fsopt, bool autoRecover, bool ocpp201) {
+    ocpp_initialize_full(conn, ocpp201 ?
+                                    ChargerCredentials::v201(chargePointModel, chargePointVendor) :
+                                    ChargerCredentials(chargePointModel, chargePointVendor),
+                               fsopt, autoRecover, ocpp201);
 }
 
-void ocpp_initialize_full(OCPP_Connection *conn, const char *bootNotificationCredentials, struct OCPP_FilesystemOpt fsopt, bool autoRecover) {
+void ocpp_initialize_full(OCPP_Connection *conn, const char *bootNotificationCredentials, struct OCPP_FilesystemOpt fsopt, bool autoRecover, bool ocpp201) {
     if (!conn) {
         MO_DBG_ERR("conn is null");
     }
@@ -28,7 +32,10 @@ void ocpp_initialize_full(OCPP_Connection *conn, const char *bootNotificationCre
 
     MicroOcpp::FilesystemOpt adaptFsopt = fsopt;
 
-    mocpp_initialize(*ocppSocket, bootNotificationCredentials, MicroOcpp::makeDefaultFilesystemAdapter(adaptFsopt), autoRecover, MicroOcpp::ProtocolVersion(1,6));
+    mocpp_initialize(*ocppSocket, bootNotificationCredentials, MicroOcpp::makeDefaultFilesystemAdapter(adaptFsopt), autoRecover,
+            ocpp201 ?
+                MicroOcpp::ProtocolVersion(2,0,1) :
+                MicroOcpp::ProtocolVersion(1,6));
 }
 
 void ocpp_deinitialize() {

src/MicroOcpp_c.h

@@ -60,14 +60,16 @@ void ocpp_initialize(
             const char *chargePointModel,     //model name of this charger (e.g. "My Charger")
             const char *chargePointVendor, //brand name (e.g. "My Company Ltd.")
             struct OCPP_FilesystemOpt fsopt, //If this library should format the flash if necessary. Find further options in ConfigurationOptions.h
-            bool autoRecover); //automatically sanitize the local data store when the lib detects recurring crashes. During development, `false` is recommended
+            bool autoRecover, //automatically sanitize the local data store when the lib detects recurring crashes. During development, `false` is recommended
+            bool ocpp201); //true to select OCPP 2.0.1, false for OCPP 1.6
 
 //same as above, but more fields for the BootNotification
 void ocpp_initialize_full(
             OCPP_Connection *conn,  //WebSocket adapter for MicroOcpp
             const char *bootNotificationCredentials, //e.g. '{"chargePointModel":"Demo Charger","chargePointVendor":"My Company Ltd."}' (refer to OCPP 1.6 Specification - Edition 2 p. 60)
             struct OCPP_FilesystemOpt fsopt, //If this library should format the flash if necessary. Find further options in ConfigurationOptions.h
-            bool autoRecover); //automatically sanitize the local data store when the lib detects recurring crashes. During development, `false` is recommended
+            bool autoRecover, //automatically sanitize the local data store when the lib detects recurring crashes. During development, `false` is recommended
+            bool ocpp201); //true to select OCPP 2.0.1, false for OCPP 1.6
 
 void ocpp_deinitialize();
 

tests/Api.cpp

@@ -195,7 +195,7 @@ TEST_CASE( "C API test" ) {
     fsopt.formatFsOnFail = true;
 
     MicroOcpp::LoopbackConnection loopback;
-    ocpp_initialize(reinterpret_cast<OCPP_Connection*>(&loopback), "test-runner1234", "vendor", fsopt, false);
+    ocpp_initialize(reinterpret_cast<OCPP_Connection*>(&loopback), "test-runner1234", "vendor", fsopt, false, false);
 
     auto context = getOcppContext();
     auto& model = context->getModel();