Merge pull request #218 from c-jimenez/dev/ocpp20

Added support of OCPP 2.0.1

Author: c-jimenez

.vscode/launch.json

@@ -1,14 +1,20 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
         {
             "type": "gdb",
             "request": "launch",
             "name": "x86 CP debug",
-            "target": "${workspaceRoot}/bin/gcc_native/quick_start_chargepoint",
+            "target": "${workspaceRoot}/bin/gcc_native/quick_start_chargepoint20",
+            "cwd": "${workspaceRoot}/bin/gcc_native/",
+            "arguments": "-r",
+            "valuesFormatting": "parseText"
+        },
+        {
+            "type": "gdb",
+            "request": "launch",
+            "name": "x86 Basic CP debug",
+            "target": "${workspaceRoot}/bin/gcc_native/quick_start_basicchargepoint20",
             "cwd": "${workspaceRoot}/bin/gcc_native/",
             "arguments": "-r",
             "valuesFormatting": "parseText"
@@ -17,7 +23,7 @@
             "type": "gdb",
             "request": "launch",
             "name": "x86 CS debug",
-            "target": "${workspaceRoot}/bin/gcc_native/quick_start_centralsystem",
+            "target": "${workspaceRoot}/bin/gcc_native/quick_start_centralsystem20",
             "cwd": "${workspaceRoot}/bin/gcc_native/",
             "arguments": "-r",
             "valuesFormatting": "parseText"
@@ -26,7 +32,7 @@
             "type": "gdb",
             "request": "launch",
             "name": "x86 LC debug",
-            "target": "${workspaceRoot}/bin/gcc_native/quick_start_localcontroller",
+            "target": "${workspaceRoot}/bin/gcc_native/quick_start_localcontroller20",
             "cwd": "${workspaceRoot}/bin/gcc_native/",
             "arguments": "-r",
             "valuesFormatting": "parseText"
@@ -58,6 +64,13 @@
                     "ignoreFailures": true
                 }
             ]
+        },
+        {
+            "name": "json2cpp",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceRoot}/tools/json2cpp/json2cpp.py",
+            "args": ["-i", "${workspaceRoot}/schemas/ocpp20", "-o", "${workspaceRoot}/out", "-t", "${workspaceRoot}/tools/json2cpp/templates", "-v", "ocpp20"]
         }
     ]
 }

CMakeLists.txt

@@ -4,8 +4,8 @@
 
 cmake_minimum_required(VERSION 3.13)
 
-project(OpenOCPP DESCRIPTION "Open Source C++ implementation of the OCPP 1.6 protocol"
-                 VERSION 1.5.8
+project(OpenOCPP DESCRIPTION "Open Source C++ implementation of the OCPP 1.6 and 2.0.1 protocols"
+                 VERSION 2.0.0
 )
 
 # Definitions for Version.h file
@@ -72,9 +72,15 @@ if(${BUILD_STATIC_LIBRARY})
         centralsystem
         chargepoint
         localcontroller
+        centralsystem20
+        chargepoint20
+        localcontroller20
         config
         database
         messages
+        messages16
+        messages20
+        types20
         rpc
         helpers
         log
@@ -96,9 +102,15 @@ if (${BUILD_SHARED_LIBRARY})
         centralsystem
         chargepoint
         localcontroller
+        centralsystem20
+        chargepoint20
+        localcontroller20
         config
         database
         messages
+        messages16
+        messages20
+        types20
         rpc
         helpers
         log
@@ -121,16 +133,19 @@ include(GNUInstallDirs)
 
 file(GLOB_RECURSE PUBLIC_HEADERS
      LIST_DIRECTORIES false RELATIVE ${CMAKE_SOURCE_DIR} "${CMAKE_SOURCE_DIR}/src/*.h")
-file(GLOB OCPP_SCHEMAS
-     LIST_DIRECTORIES false RELATIVE ${CMAKE_SOURCE_DIR} "${CMAKE_SOURCE_DIR}/schemas/*.json")
+file(GLOB OCPP16_SCHEMAS
+     LIST_DIRECTORIES false RELATIVE ${CMAKE_SOURCE_DIR} "${CMAKE_SOURCE_DIR}/schemas/ocpp16/*.json")
+file(GLOB OCPP20_SCHEMAS
+     LIST_DIRECTORIES false RELATIVE ${CMAKE_SOURCE_DIR} "${CMAKE_SOURCE_DIR}/schemas/ocpp20/*.json")
 
 install(TARGETS ${OPEN_OCPP_SHARED_TARGET} ${OPEN_OCPP_STATIC_TARGET}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openocpp)
-install(FILES ${OCPP_SCHEMAS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openocpp/schemas)
+install(FILES ${OCPP16_SCHEMAS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openocpp/schemas/ocpp16)
+install(FILES ${OCPP20_SCHEMAS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openocpp/schemas/ocpp20)
 
 if(${INSTALL_RAPID_JSON})
     file(GLOB RAPIDJSON_HEADERS