From 52e50353ecca25708c225d56b56644daf8775b2b Mon Sep 17 00:00:00 2001
From: Ake <akhe@grodansparadis.com>
Date: Wed, 23 Feb 2022 18:20:34 +0100
Subject: [PATCH 01/26] Now require C++14

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3c6cc9..cfe28bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,8 +75,8 @@ endif()
 
 option(USE_SSL "Use SSL" TRUE)
 
-## --- C++11 build flags ---
-set(CMAKE_CXX_STANDARD 11)
+## --- C++14 build flags ---
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS ON)
 
@@ -418,4 +418,4 @@ else()
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})        
 endif()
 
- 
\ No newline at end of file
+ 

From 7b3fe1e1637a9a4bf0ba1db45a5a1e473a9845e7 Mon Sep 17 00:00:00 2001
From: Ake <akhe@grodansparadis.com>
Date: Wed, 23 Feb 2022 20:20:57 +0100
Subject: [PATCH 02/26] Updated windows action

---
 .github/workflows/msbuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index 46f408c..2b58133 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -66,7 +66,7 @@ jobs:
       run: |
           mkdir build
           cd build
-          cmake .. -G "Visual Studio 16 2019" -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=D:/a/vscp-helper-lib/vscp-helper-lib/vcpkg/scripts/buildsystems/vcpkg.cmake  -DVSCP_PATH=vscp
+          cmake .. -G "Visual Studio 16 2019" -A x64 -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=D:/a/vscp-helper-lib/vscp-helper-lib/vcpkg/scripts/buildsystems/vcpkg.cmake  -DVSCP_PATH=vscp
           msbuild libvscphelper.sln /p:Configuration=Release
           cpack .
 

From 3e02aacde36490438654339547d106ec4a60924a Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Mon, 9 Jan 2023 13:38:51 +0100
Subject: [PATCH 03/26] Updated copyright year

---
 CMakeLists.txt        | 2 +-
 src/vscphelperlib.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfe28bc..9eaddd4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # Build instructions for VSCP Works.
 #
-# Copyright (c) 2000-2022 Åke Hedman, the VSCP Project
+# Copyright (C) 2000-2023 Åke Hedman, the VSCP Project
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/src/vscphelperlib.cpp b/src/vscphelperlib.cpp
index 9bcd7b6..4febd22 100644
--- a/src/vscphelperlib.cpp
+++ b/src/vscphelperlib.cpp
@@ -4,7 +4,7 @@
 //
 // The MIT License (MIT)
 //
-// Copyright (C) 2000-2022 Åke Hedman, The VSCP Project,
+// Copyright (C) 2000-2023 Åke Hedman, The VSCP Project,
 // <akhe@vscp.org>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

From fb325405637774ed29a21b3f8b0e47b382db7d74 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Mon, 9 Jan 2023 13:40:25 +0100
Subject: [PATCH 04/26] Updated copyright year

---
 src/vscphelperlib.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vscphelperlib.h b/src/vscphelperlib.h
index b65721d..7524579 100644
--- a/src/vscphelperlib.h
+++ b/src/vscphelperlib.h
@@ -5,7 +5,7 @@
 //
 // The MIT License (MIT)
 //
-// Copyright © 2000-2022 Ake Hedman, The VSCP Project, 
+// Copyright (C) 2000-2023 Åke Hedman, The VSCP Project, 
 // <akhe@vscp.org>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

From ac58e50f15474e54ae7196c138eeb2021c0c1699 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 14:15:49 +0200
Subject: [PATCH 05/26] Moved dependencies to submodules

---
 .gitmodules            | 12 ++++++++++++
 CMakeLists.txt         | 34 ++++++++++++++++------------------
 third_party/fastpbkdf2 |  1 +
 third_party/mustache   |  1 +
 third_party/nlohmann   |  1 +
 third_party/spdlog     |  1 +
 6 files changed, 32 insertions(+), 18 deletions(-)
 create mode 160000 third_party/fastpbkdf2
 create mode 160000 third_party/mustache
 create mode 160000 third_party/nlohmann
 create mode 160000 third_party/spdlog

diff --git a/.gitmodules b/.gitmodules
index e69de29..2d6b724 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "third_party/mustache"]
+	path = third_party/mustache
+	url = https://github.com/kainjow/Mustache.git
+[submodule "third_party/spdlog"]
+	path = third_party/spdlog
+	url = https://github.com/gabime/spdlog.git
+[submodule "third_party/fastpbkdf2"]
+	path = third_party/fastpbkdf2
+	url = https://github.com/ctz/fastpbkdf2.git
+[submodule "third_party/nlohmann"]
+	path = third_party/nlohmann
+	url = https://github.com/nlohmann/json.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9eaddd4..318c3dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,8 +226,10 @@ add_library(libvscphelper SHARED
     ./src/vscphelperlib.cpp
     ./windows/libvscphelper.h
     ./windows/libvscphelper.cpp
-    ${VSCP_PATH}/src/common/third_party/mustache.hpp
-    ${VSCP_PATH}/src/common/third_party/spdlog-1.9.2/include    
+    ./third_party/mustache/mustache.hpp
+    ./spdlog/include    
+    ./third_party/fastpbkdf2/fastpbkdf2.h
+    ./third_party/fastpbkdf2/fastpbkdf2.c
     ${VSCP_PATH}/src/vscp/common/vscp.h
     ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.h
     ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.cpp
@@ -235,8 +237,6 @@ add_library(libvscphelper SHARED
     ${VSCP_PATH}/src/vscp/common/vscpdatetime.cpp
     ${VSCP_PATH}/src/vscp/common/guid.h
     ${VSCP_PATH}/src/vscp/common/guid.cpp
-#    ${VSCP_PATH}/src/vscp/common/mdf.h
-#    ${VSCP_PATH}/src/vscp/common/mdf.cpp
     ${VSCP_PATH}/src/vscp/common/vscphelper.h
     ${VSCP_PATH}/src/vscp/common/vscphelper.cpp
     ${VSCP_PATH}/src/vscp/common/canal.h
@@ -251,9 +251,7 @@ add_library(libvscphelper SHARED
     ${VSCP_PATH}/src/common/crc8.h
     ${VSCP_PATH}/src/common/crc8.c
     ${VSCP_PATH}/src/common/vscpmd5.h
-    ${VSCP_PATH}/src/common/vscpmd5.c
-    ${VSCP_PATH}/src/common/fastpbkdf2.h
-    ${VSCP_PATH}/src/common/fastpbkdf2.c   
+    ${VSCP_PATH}/src/common/vscpmd5.c       
   ) 
 else()
   add_library(libvscphelper SHARED   
@@ -261,8 +259,10 @@ else()
     ./src/vscphelperlib.cpp 
     ./linux/libvscphelper.h
     ./linux/libvscphelper.cpp
-    ${VSCP_PATH}/src/common/third_party/mustache.hpp
-    ${VSCP_PATH}/src/common/third_party/spdlog-1.9.2/include    
+    ./third_party/mustache/mustache.hpp
+    ./third_party/spdlog/include    
+    ./third_party/fastpbkdf2/fastpbkdf2.h
+    ./third_party/fastpbkdf2/fastpbkdf2.c 
     ${VSCP_PATH}/src/vscp/common/vscp.h
     ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.h
     ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.cpp
@@ -270,8 +270,6 @@ else()
     ${VSCP_PATH}/src/vscp/common/vscpdatetime.cpp
     ${VSCP_PATH}/src/vscp/common/guid.h
     ${VSCP_PATH}/src/vscp/common/guid.cpp
-#    ${VSCP_PATH}/src/vscp/common/mdf.h
-#    ${VSCP_PATH}/src/vscp/common/mdf.cpp
     ${VSCP_PATH}/src/vscp/common/vscphelper.h
     ${VSCP_PATH}/src/vscp/common/vscphelper.cpp
     ${VSCP_PATH}/src/vscp/common/canal.h
@@ -286,9 +284,7 @@ else()
     ${VSCP_PATH}/src/common/crc8.h
     ${VSCP_PATH}/src/common/crc8.c
     ${VSCP_PATH}/src/common/vscpmd5.h
-    ${VSCP_PATH}/src/common/vscpmd5.c
-    ${VSCP_PATH}/src/common/fastpbkdf2.h
-    ${VSCP_PATH}/src/common/fastpbkdf2.c    
+    ${VSCP_PATH}/src/common/vscpmd5.c       
   ) 
 endif()
 
@@ -323,8 +319,9 @@ if (WIN32)
         ${VSCP_PATH}/src/vscp/common/
         ${VSCP_PATH}/src/common
         ${VSCP_PATH}/src/common/third_party
-        ${VSCP_PATH}/src/common/third_party/nlohmann
-        ${VSCP_PATH}/src/common/third_party/spdlog-1.9.2/include
+        ./third_party/nlohmann/include/
+        ./third_party/spdlog/include
+        ./third_party/fastpbkdf2/
         ${PThreads4W_INCLUDE_DIR}
         ${CMAKE_BINARY_DIR}
         ${OPENSSL_INCLUDE_DIR}
@@ -335,8 +332,9 @@ else()
         ${VSCP_PATH}/src/vscp/common/
         ${VSCP_PATH}/src/common
         ${VSCP_PATH}/src/common/third_party
-        ${VSCP_PATH}/src/common/third_party/nlohmann
-        ${VSCP_PATH}/src/common/third_party/spdlog-1.9.2/include
+        ./third_party/nlohmann/include/
+        ./third_party/spdlog/include/
+        ./third_party/fastpbkdf2/
         ${CMAKE_BINARY_DIR}
         ${OPENSSL_INCLUDE_DIR}
         ${LOCAL_SYSLOG_INCLUDE} )
diff --git a/third_party/fastpbkdf2 b/third_party/fastpbkdf2
new file mode 160000
index 0000000..3c56895
--- /dev/null
+++ b/third_party/fastpbkdf2
@@ -0,0 +1 @@
+Subproject commit 3c568957de1d26a3811deba4a0ce1895731ce9a4
diff --git a/third_party/mustache b/third_party/mustache
new file mode 160000
index 0000000..04277d5
--- /dev/null
+++ b/third_party/mustache
@@ -0,0 +1 @@
+Subproject commit 04277d5552c6e46bee41a946b7d175a660ea1b3d
diff --git a/third_party/nlohmann b/third_party/nlohmann
new file mode 160000
index 0000000..a0c1318
--- /dev/null
+++ b/third_party/nlohmann
@@ -0,0 +1 @@
+Subproject commit a0c1318830519eac027a31edec1a99ce1ae5670e
diff --git a/third_party/spdlog b/third_party/spdlog
new file mode 160000
index 0000000..32bab0e
--- /dev/null
+++ b/third_party/spdlog
@@ -0,0 +1 @@
+Subproject commit 32bab0e1030aa92c6e64fe9da7ea75531cfd9c6c

From e2a43fa80e9334b858a1db42b30d0d0b26653acd Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 14:31:45 +0200
Subject: [PATCH 06/26] Added mongoose to third party

---
 .gitmodules          | 3 +++
 CMakeLists.txt       | 4 +++-
 third_party/mongoose | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 160000 third_party/mongoose

diff --git a/.gitmodules b/.gitmodules
index 2d6b724..b4f3398 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "third_party/nlohmann"]
 	path = third_party/nlohmann
 	url = https://github.com/nlohmann/json.git
+[submodule "third_party/mongoose"]
+	path = third_party/mongoose
+	url = https://github.com/cesanta/mongoose.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 318c3dc..c4ade9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,8 @@ if(NOT DEFINED PATCH_VERSION)
     SET(PATCH_VERSION "2")
 endif()
 
+add_subdirectory(./third_party/spdlog/)
+
 SET(CPACK_PACKAGE_DESCRIPTION "VSCP Helper library")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Helper functionality for VSCP applications")
 SET(CPACK_PACKAGE_VENDOR "the VSCP Project")
@@ -251,7 +253,7 @@ add_library(libvscphelper SHARED
     ${VSCP_PATH}/src/common/crc8.h
     ${VSCP_PATH}/src/common/crc8.c
     ${VSCP_PATH}/src/common/vscpmd5.h
-    ${VSCP_PATH}/src/common/vscpmd5.c       
+    ${VSCP_PATH}/src/common/vscpmd5.c 
   ) 
 else()
   add_library(libvscphelper SHARED   
diff --git a/third_party/mongoose b/third_party/mongoose
new file mode 160000
index 0000000..7f3d450
--- /dev/null
+++ b/third_party/mongoose
@@ -0,0 +1 @@
+Subproject commit 7f3d450b3287297c61943f20f386c80877e244b8

From d3fa2de0e403e12f14fd32a09b30401e15627f2f Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 15:07:59 +0200
Subject: [PATCH 07/26] Windows action build

---
 .github/workflows/msbuild.yml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index 2b58133..00c83e0 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -5,6 +5,7 @@ on: [push]
 env:
   # Path to the solution file relative to the root of the project.
   SOLUTION_FILE_PATH: .
+  VSCP_PATH: '${{ github.workspace }}/vscp'
 
   # Configuration type to build.
   # You can convert this to a build matrix if you need coverage of multiple configuration types.
@@ -17,17 +18,21 @@ env:
 
 jobs:
   build:
+    name: Windows x64
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: ilammy/msvc-dev-cmd@v1
+
+    - name: Install ms-dev environment
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: x64
 
     - name: Clone
-      uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Checkout vscp repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         repository: grodansparadis/vscp
         path: vscp
@@ -41,11 +46,16 @@ jobs:
       uses: microsoft/setup-msbuild@v1.0.3  
 
     - name: Checkout vcpkg repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         repository: microsoft/vcpkg
         path: vcpkg
 
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v1.1
+      with:
+        msbuild-architecture: x64
+
     - name: Setup vcpkg
       run: |
           cd vcpkg

From 8ee735dd6b47f86326353167d77b675ef112fd79 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 15:10:06 +0200
Subject: [PATCH 08/26] Fixed syntax error in action file for msbuild

---
 .github/workflows/msbuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index 00c83e0..eac93ba 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -29,7 +29,7 @@ jobs:
         arch: x64
 
     - name: Clone
-    - uses: actions/checkout@v3
+      uses: actions/checkout@v3
 
     - name: Checkout vscp repo
       uses: actions/checkout@v3

From 8e62a01632433f3934872a29cae484406804d4ca Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 16:00:20 +0200
Subject: [PATCH 09/26] Changed generators

---
 .github/workflows/msbuild.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index eac93ba..d3f4ff4 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -6,15 +6,16 @@ env:
   # Path to the solution file relative to the root of the project.
   SOLUTION_FILE_PATH: .
   VSCP_PATH: '${{ github.workspace }}/vscp'
+  ENVIRONMENT_SCRIPT: "C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
+  GENERATORS: "Visual Studio 17 2022"
+  BUILD_CONFIGURATION: Release
 
   # Configuration type to build.
   # You can convert this to a build matrix if you need coverage of multiple configuration types.
   # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
   #
   # https://github.com/marketplace/actions/run-vcpkg
-  # https://github.com/ilammy/msvc-dev-cmd
-
-  BUILD_CONFIGURATION: Release
+  # https://github.com/ilammy/msvc-dev-cmd  
 
 jobs:
   build:
@@ -42,8 +43,6 @@ jobs:
       # Using 'latest' branch, the most recent CMake and ninja are installed.
       uses: lukka/get-cmake@latest 
 
-    - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.3  
 
     - name: Checkout vcpkg repo
       uses: actions/checkout@v3
@@ -75,9 +74,10 @@ jobs:
     - name: Build
       run: |
           mkdir build
-          cd build
-          cmake .. -G "Visual Studio 16 2019" -A x64 -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=D:/a/vscp-helper-lib/vscp-helper-lib/vcpkg/scripts/buildsystems/vcpkg.cmake  -DVSCP_PATH=vscp
-          msbuild libvscphelper.sln /p:Configuration=Release
+          cd build 
+          cmake .. -G "${{ env GENERATORS }}"  -A x64 -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_BUILD_TYPE=${{ env BUILD_CONFIGURATION }} -DCMAKE_TOOLCHAIN_FILE=D:/a/vscp-helper-lib/vscp-helper-lib/vcpkg/scripts/buildsystems/vcpkg.cmake  -DVSCP_PATH=vscp
+          cmake --build --config ${{ env BUILD_CONFIGURATION }} .
+          #msbuild libvscphelper.sln /p:Configuration=Release
           cpack .
 
       # Save artifacts    

From 6c89c2ae55865c5b24892b9238a2f0573af157f2 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 16:05:16 +0200
Subject: [PATCH 10/26] Removed yaml syntax error

---
 .github/workflows/msbuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index d3f4ff4..dbf513b 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -6,7 +6,7 @@ env:
   # Path to the solution file relative to the root of the project.
   SOLUTION_FILE_PATH: .
   VSCP_PATH: '${{ github.workspace }}/vscp'
-  ENVIRONMENT_SCRIPT: "C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
+  ENVIRONMENT_SCRIPT: "C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
   GENERATORS: "Visual Studio 17 2022"
   BUILD_CONFIGURATION: Release
 

From 7f63af63d40c0cafebcb01e1b0b924d8d34f5017 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 16:16:52 +0200
Subject: [PATCH 11/26] Fixed environment var notation

---
 .github/workflows/msbuild.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index dbf513b..2da375b 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -31,6 +31,8 @@ jobs:
 
     - name: Clone
       uses: actions/checkout@v3
+      with:
+        submodules: 'recursive'
 
     - name: Checkout vscp repo
       uses: actions/checkout@v3
@@ -38,6 +40,7 @@ jobs:
         repository: grodansparadis/vscp
         path: vscp
         ref: development  
+        submodules: 'recursive'
 
     - name: Get latest CMake and ninja
       # Using 'latest' branch, the most recent CMake and ninja are installed.
@@ -75,8 +78,8 @@ jobs:
       run: |
           mkdir build
           cd build 
-          cmake .. -G "${{ env GENERATORS }}"  -A x64 -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_BUILD_TYPE=${{ env BUILD_CONFIGURATION }} -DCMAKE_TOOLCHAIN_FILE=D:/a/vscp-helper-lib/vscp-helper-lib/vcpkg/scripts/buildsystems/vcpkg.cmake  -DVSCP_PATH=vscp
-          cmake --build --config ${{ env BUILD_CONFIGURATION }} .
+          cmake .. -G "${{ env.GENERATORS }}"  -A x64 -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_BUILD_TYPE=${{ env.BUILD_CONFIGURATION }} -DCMAKE_TOOLCHAIN_FILE=D:/a/vscp-helper-lib/vscp-helper-lib/vcpkg/scripts/buildsystems/vcpkg.cmake  -DVSCP_PATH=vscp
+          cmake --build --config ${{ env.BUILD_CONFIGURATION }} .
           #msbuild libvscphelper.sln /p:Configuration=Release
           cpack .
 

From 858a012ac71953b39b440b80e592b9d469919a8b Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 16:35:34 +0200
Subject: [PATCH 12/26] Testing dev branch

---
 .github/workflows/msbuild.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index 2da375b..cdc477e 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -32,7 +32,8 @@ jobs:
     - name: Clone
       uses: actions/checkout@v3
       with:
-        submodules: 'recursive'
+        ref: development 
+        submodules: recursive
 
     - name: Checkout vscp repo
       uses: actions/checkout@v3
@@ -40,7 +41,7 @@ jobs:
         repository: grodansparadis/vscp
         path: vscp
         ref: development  
-        submodules: 'recursive'
+        submodules: recursive
 
     - name: Get latest CMake and ninja
       # Using 'latest' branch, the most recent CMake and ninja are installed.

From 604e261090bfbe7825561e459989409352d6d50b Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 16:41:33 +0200
Subject: [PATCH 13/26] Linux build now also on develeoment branch

---
 .github/workflows/build.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b7f0a56..1b2de4d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,14 +11,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:  
       matrix:
-        os: [ubuntu-18.04, ubuntu-latest]
+        os: [ubuntu-20.04, ubuntu-latest]
 
     steps:
     # https://github.com/actions/checkout  
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+      with:
+        ref: development 
+        submodules: recursive
 
     - name: Checkout vscp repo
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         repository: grodansparadis/vscp
         path: vscp
@@ -64,7 +67,7 @@ jobs:
         sudo cpack -G DEB 
         sudo make install DESTDIR=AppDir
     # Save artifact    
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: ${{ matrix.os }}_libvscphelper_15.0.2.deb
         path: /home/runner/work/vscp-helper-lib/vscp-helper-lib/build/libvscphelper_15.0.2.deb

From 70827ac17a03ddf824fd430401e0fc2037902ab2 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 16:51:41 +0200
Subject: [PATCH 14/26] Fixed path

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4ade9b..a2062b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,7 +229,7 @@ add_library(libvscphelper SHARED
     ./windows/libvscphelper.h
     ./windows/libvscphelper.cpp
     ./third_party/mustache/mustache.hpp
-    ./spdlog/include    
+    ./third_party/spdlog/include    
     ./third_party/fastpbkdf2/fastpbkdf2.h
     ./third_party/fastpbkdf2/fastpbkdf2.c
     ${VSCP_PATH}/src/vscp/common/vscp.h

From f119f7c0885d03cad621f2be317b07cffdf4c2c8 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 17:05:21 +0200
Subject: [PATCH 15/26] Checking out development instead of master

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1b2de4d..59a5b77 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
       with:
         repository: grodansparadis/vscp
         path: vscp
-        ref: master
+        ref: development
      
     - name: Checkout google test repo
       run: sudo apt-get install libgtest-dev && cd /usr/src/gtest && sudo mkdir build && cd build && sudo cmake .. && sudo make DESTDIR=/usr/lib

From de0e3638fba1fa08e61aa796c8b506a09504f583 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 17:19:23 +0200
Subject: [PATCH 16/26] Removed build config switch

---
 .github/workflows/msbuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index cdc477e..44cafa3 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -80,7 +80,7 @@ jobs:
           mkdir build
           cd build 
           cmake .. -G "${{ env.GENERATORS }}"  -A x64 -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_BUILD_TYPE=${{ env.BUILD_CONFIGURATION }} -DCMAKE_TOOLCHAIN_FILE=D:/a/vscp-helper-lib/vscp-helper-lib/vcpkg/scripts/buildsystems/vcpkg.cmake  -DVSCP_PATH=vscp
-          cmake --build --config ${{ env.BUILD_CONFIGURATION }} .
+          cmake --build  .
           #msbuild libvscphelper.sln /p:Configuration=Release
           cpack .
 

From 5ad6e84a892a4eb6e22c9ef12a14ea08e02842c2 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 17:43:56 +0200
Subject: [PATCH 17/26] Build should be release

---
 .github/workflows/msbuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index 44cafa3..4df67d6 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -80,7 +80,7 @@ jobs:
           mkdir build
           cd build 
           cmake .. -G "${{ env.GENERATORS }}"  -A x64 -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_BUILD_TYPE=${{ env.BUILD_CONFIGURATION }} -DCMAKE_TOOLCHAIN_FILE=D:/a/vscp-helper-lib/vscp-helper-lib/vcpkg/scripts/buildsystems/vcpkg.cmake  -DVSCP_PATH=vscp
-          cmake --build  .
+          cmake --build . --coonfig ${{ env.BUILD_CONFIGURATION }}
           #msbuild libvscphelper.sln /p:Configuration=Release
           cpack .
 

From e80425fac3878c21d0241e0c0af0822e4367d12a Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 17:58:23 +0200
Subject: [PATCH 18/26] Added info on buildtype on windows to readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5803031..588270f 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ The two projects should be cloned on the same directory level. vscp-helper-lib i
   cd vscp-helper-lib
   mkdir build
   cd build
-  cmake .. -G "Visual Studio 16 2019" -DVCPKG_TARGET_TRIPLET=x64-windows  -DCMAKE_TOOLCHAIN_FILE=C:\Users\Administrator\Desktop\Development\vcpkg\scripts\buildsystems\vcpkg.cmake
+  cmake .. -G "Visual Studio 16 2019" -DVCPKG_TARGET_TRIPLET=x64-windows  -D CMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=C:\Users\Administrator\Desktop\Development\vcpkg\scripts\buildsystems\vcpkg.cmake
 ```
 
 The path to the vspkg build script is obviously different in your case.
@@ -131,7 +131,7 @@ The path to the vspkg build script is obviously different in your case.
 Now use
 
 ```bash
-  cmake --build .
+  cmake --build . --config Release
 ```
 
 to build the dynamic library. An alternative is to use

From 5a56bc836e6fec50d7ffe9afea76733df557c886 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 18:04:52 +0200
Subject: [PATCH 19/26] Fixed spelling error for parameter

---
 .github/workflows/msbuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index 4df67d6..6aea567 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -80,7 +80,7 @@ jobs:
           mkdir build
           cd build 
           cmake .. -G "${{ env.GENERATORS }}"  -A x64 -DVCPKG_TARGET_TRIPLET=x64-windows -DCMAKE_BUILD_TYPE=${{ env.BUILD_CONFIGURATION }} -DCMAKE_TOOLCHAIN_FILE=D:/a/vscp-helper-lib/vscp-helper-lib/vcpkg/scripts/buildsystems/vcpkg.cmake  -DVSCP_PATH=vscp
-          cmake --build . --coonfig ${{ env.BUILD_CONFIGURATION }}
+          cmake --build . --config ${{ env.BUILD_CONFIGURATION }}
           #msbuild libvscphelper.sln /p:Configuration=Release
           cpack .
 

From 2649906736399fa3dfa7c026159b6c47ca22eb44 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 7 Jun 2023 23:03:19 +0200
Subject: [PATCH 20/26] Fixed openssl build defines

---
 .gitmodules    |  2 +-
 CMakeLists.txt | 31 +++++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index b4f3398..ade6cdc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,7 @@
 	url = https://github.com/gabime/spdlog.git
 [submodule "third_party/fastpbkdf2"]
 	path = third_party/fastpbkdf2
-	url = https://github.com/ctz/fastpbkdf2.git
+	url = https://github.com/danpashin/fastpbkdf2.git
 [submodule "third_party/nlohmann"]
 	path = third_party/nlohmann
 	url = https://github.com/nlohmann/json.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2062b1..967ad62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -210,11 +210,34 @@ endif(WIN32)
 
 # Set sockettcp build flags
 add_definitions(-DUSE_IPV6)
-string(FIND "${OPENSSL_VERSION}" "1.1." SSL_VER_POS)
+
+set(OPENSSL_VER "OPENSSL_API_${OPENSSL_VERSION_MAJOR}_${OPENSSL_VERSION_MINOR}")
+message(STATUS "OPENSSL Version: ${OPENSSL_VER}")
+add_definitions(-D${OPENSSL_VER}) 
+
+# 1.1.0 / 1.1.1 / 3.0.0 / 3.1.0
+string(FIND "${OPENSSL_VERSION}" "1.0" SSL_VER_POS)
 if(${SSL_VER_POS})
-    add_definitions(-DOPENSSL_API_1_0)
-else()
-    add_definitions(-DOPENSSL_API_1_1)
+  #set(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -DOPENSSL_API_1_0")
+  #add_definitions(-DOPENSSL_API_1_0)
+endif()    
+
+string(FIND "${OPENSSL_VERSION}" "1.1" SSL_VER_POS)
+if(${SSL_VER_POS})
+  #set(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -DOPENSSL_API_1_1")
+  #add_definitions(-DOPENSSL_API_1_1)
+endif()
+
+string(FIND "${OPENSSL_VERSION}" "3.0" SSL_VER_POS)
+if(NOT SSL_VER_POS EQUAL -1)
+  #add_definitions(-DOPENSSL_API_3_0)
+  message(STATUS "openssl test ${SSL_VER_POS}")
+endif()  
+
+string(FIND "${OPENSSL_VERSION}" "3.1" SSL_VER_POS)
+if(NOT SSL_VER_POS EQUAL -1)
+  add_definitions(-DOPENSSL_API_3_0)
+  message(STATUS "Open ssl version is 3.1 but set to 3.0 ${SSL_VER_POS} fir Civetweb. That is OK")
 endif()
 
 set(RESOURCE_FILES

From 49bfe0b670114c79250dc9c7aba74de95fd7074f Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Mon, 8 Jan 2024 21:09:49 +0100
Subject: [PATCH 21/26] Updated copyright year

---
 .vscode/settings.json | 2 +-
 CMakeLists.txt        | 2 +-
 src/vscphelperlib.cpp | 2 +-
 src/vscphelperlib.h   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 42610b7..ea1b74d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -18,7 +18,7 @@
     // Controls how suggestions are pre-selected when showing the suggest list
     "editor.suggestSelection": "recentlyUsed",
     // Enable word based suggestions
-    "editor.wordBasedSuggestions": true,
+    "editor.wordBasedSuggestions": "matchingDocuments",
     // Enable parameter hints
     "editor.parameterHints.enabled": true,
     "files.associations": {
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 967ad62..f332574 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # Build instructions for VSCP Works.
 #
-# Copyright (C) 2000-2023 Åke Hedman, the VSCP Project
+# Copyright (C) 2000-2024 Åke Hedman, the VSCP Project
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/src/vscphelperlib.cpp b/src/vscphelperlib.cpp
index 4febd22..8982a74 100644
--- a/src/vscphelperlib.cpp
+++ b/src/vscphelperlib.cpp
@@ -4,7 +4,7 @@
 //
 // The MIT License (MIT)
 //
-// Copyright (C) 2000-2023 Åke Hedman, The VSCP Project,
+// Copyright (C) 2000-2024 Åke Hedman, The VSCP Project,
 // <akhe@vscp.org>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/vscphelperlib.h b/src/vscphelperlib.h
index 7524579..ead3c07 100644
--- a/src/vscphelperlib.h
+++ b/src/vscphelperlib.h
@@ -5,7 +5,7 @@
 //
 // The MIT License (MIT)
 //
-// Copyright (C) 2000-2023 Åke Hedman, The VSCP Project, 
+// Copyright (C) 2000-2024 Åke Hedman, The VSCP Project, 
 // <akhe@vscp.org>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy

From 8a6ca4cff5e30d9dc44504415d56620d9a84ab4b Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Sun, 5 May 2024 21:01:14 +0200
Subject: [PATCH 22/26] removed fastpbkdf2 dependency

---
 .github/workflows/build.yml |  2 +-
 CMakeLists.txt              | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 59a5b77..5dda252 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
     # https://github.com/actions/checkout  
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         ref: development 
         submodules: recursive
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f332574..9339a32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,13 +32,13 @@ set(PACKAGE_AUTHOR "Ake Hedman, the VSCP Project")
 
 # Version settings
 if(NOT DEFINED MAJOR_VERSION)
-    SET(MAJOR_VERSION "15")
+    SET(MAJOR_VERSION "16")
 endif()
 if(NOT DEFINED MINOR_VERSION)
     SET(MINOR_VERSION "0")
 endif()
 if(NOT DEFINED PATCH_VERSION)
-    SET(PATCH_VERSION "2")
+    SET(PATCH_VERSION "0")
 endif()
 
 add_subdirectory(./third_party/spdlog/)
@@ -253,8 +253,6 @@ add_library(libvscphelper SHARED
     ./windows/libvscphelper.cpp
     ./third_party/mustache/mustache.hpp
     ./third_party/spdlog/include    
-    ./third_party/fastpbkdf2/fastpbkdf2.h
-    ./third_party/fastpbkdf2/fastpbkdf2.c
     ${VSCP_PATH}/src/vscp/common/vscp.h
     ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.h
     ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.cpp
@@ -286,8 +284,6 @@ else()
     ./linux/libvscphelper.cpp
     ./third_party/mustache/mustache.hpp
     ./third_party/spdlog/include    
-    ./third_party/fastpbkdf2/fastpbkdf2.h
-    ./third_party/fastpbkdf2/fastpbkdf2.c 
     ${VSCP_PATH}/src/vscp/common/vscp.h
     ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.h
     ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.cpp
@@ -346,7 +342,6 @@ if (WIN32)
         ${VSCP_PATH}/src/common/third_party
         ./third_party/nlohmann/include/
         ./third_party/spdlog/include
-        ./third_party/fastpbkdf2/
         ${PThreads4W_INCLUDE_DIR}
         ${CMAKE_BINARY_DIR}
         ${OPENSSL_INCLUDE_DIR}
@@ -359,7 +354,6 @@ else()
         ${VSCP_PATH}/src/common/third_party
         ./third_party/nlohmann/include/
         ./third_party/spdlog/include/
-        ./third_party/fastpbkdf2/
         ${CMAKE_BINARY_DIR}
         ${OPENSSL_INCLUDE_DIR}
         ${LOCAL_SYSLOG_INCLUDE} )

From 60381f4404d010efc5908c390a8f3f6125735e79 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Mon, 6 May 2024 09:47:51 +0200
Subject: [PATCH 23/26] Now using environment variable to find VSCP root

---
 CMakeLists.txt | 116 ++++++++++++++++++++++++-------------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9339a32..fb81448 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -253,28 +253,28 @@ add_library(libvscphelper SHARED
     ./windows/libvscphelper.cpp
     ./third_party/mustache/mustache.hpp
     ./third_party/spdlog/include    
-    ${VSCP_PATH}/src/vscp/common/vscp.h
-    ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.h
-    ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.cpp
-    ${VSCP_PATH}/src/vscp/common/vscpdatetime.h
-    ${VSCP_PATH}/src/vscp/common/vscpdatetime.cpp
-    ${VSCP_PATH}/src/vscp/common/guid.h
-    ${VSCP_PATH}/src/vscp/common/guid.cpp
-    ${VSCP_PATH}/src/vscp/common/vscphelper.h
-    ${VSCP_PATH}/src/vscp/common/vscphelper.cpp
-    ${VSCP_PATH}/src/vscp/common/canal.h
-    ${VSCP_PATH}/src/common/sockettcp.h
-    ${VSCP_PATH}/src/common/sockettcp.c
-    ${VSCP_PATH}/src/common/vscpbase64.h
-    ${VSCP_PATH}/src/common/vscpbase64.c
-    ${VSCP_PATH}/src/common/vscp_aes.h
-    ${VSCP_PATH}/src/common/vscp_aes.c
-    ${VSCP_PATH}/src/common/crc.h
-    ${VSCP_PATH}/src/common/crc.c
-    ${VSCP_PATH}/src/common/crc8.h
-    ${VSCP_PATH}/src/common/crc8.c
-    ${VSCP_PATH}/src/common/vscpmd5.h
-    ${VSCP_PATH}/src/common/vscpmd5.c 
+    $ENV{VSCP_ROOT}/src/vscp/common/vscp.h
+    $ENV{VSCP_ROOT}/src/vscp/common/vscpremotetcpif.h
+    $ENV{VSCP_ROOT}/src/vscp/common/vscpremotetcpif.cpp
+    $ENV{VSCP_ROOT}/src/vscp/common/vscpdatetime.h
+    $ENV{VSCP_ROOT}/src/vscp/common/vscpdatetime.cpp
+    $ENV{VSCP_ROOT}/src/vscp/common/guid.h
+    $ENV{VSCP_ROOT}/src/vscp/common/guid.cpp
+    $ENV{VSCP_ROOT}/src/vscp/common/vscphelper.h
+    $ENV{VSCP_ROOT}/src/vscp/common/vscphelper.cpp
+    $ENV{VSCP_ROOT}/src/vscp/common/canal.h
+    $ENV{VSCP_ROOT}/src/common/sockettcp.h
+    $ENV{VSCP_ROOT}/src/common/sockettcp.c
+    $ENV{VSCP_ROOT}/src/common/vscpbase64.h
+    $ENV{VSCP_ROOT}/src/common/vscpbase64.c
+    $ENV{VSCP_ROOT}/src/common/vscp_aes.h
+    $ENV{VSCP_ROOT}/src/common/vscp_aes.c
+    $ENV{VSCP_ROOT}/src/common/crc.h
+    $ENV{VSCP_ROOT}/src/common/crc.c
+    $ENV{VSCP_ROOT}/src/common/crc8.h
+    $ENV{VSCP_ROOT}/src/common/crc8.c
+    $ENV{VSCP_ROOT}/src/common/vscpmd5.h
+    $ENV{VSCP_ROOT}/src/common/vscpmd5.c 
   ) 
 else()
   add_library(libvscphelper SHARED   
@@ -284,28 +284,28 @@ else()
     ./linux/libvscphelper.cpp
     ./third_party/mustache/mustache.hpp
     ./third_party/spdlog/include    
-    ${VSCP_PATH}/src/vscp/common/vscp.h
-    ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.h
-    ${VSCP_PATH}/src/vscp/common/vscpremotetcpif.cpp
-    ${VSCP_PATH}/src/vscp/common/vscpdatetime.h
-    ${VSCP_PATH}/src/vscp/common/vscpdatetime.cpp
-    ${VSCP_PATH}/src/vscp/common/guid.h
-    ${VSCP_PATH}/src/vscp/common/guid.cpp
-    ${VSCP_PATH}/src/vscp/common/vscphelper.h
-    ${VSCP_PATH}/src/vscp/common/vscphelper.cpp
-    ${VSCP_PATH}/src/vscp/common/canal.h
-    ${VSCP_PATH}/src/common/sockettcp.h
-    ${VSCP_PATH}/src/common/sockettcp.c
-    ${VSCP_PATH}/src/common/vscpbase64.h
-    ${VSCP_PATH}/src/common/vscpbase64.c
-    ${VSCP_PATH}/src/common/vscp_aes.h
-    ${VSCP_PATH}/src/common/vscp_aes.c
-    ${VSCP_PATH}/src/common/crc.h
-    ${VSCP_PATH}/src/common/crc.c
-    ${VSCP_PATH}/src/common/crc8.h
-    ${VSCP_PATH}/src/common/crc8.c
-    ${VSCP_PATH}/src/common/vscpmd5.h
-    ${VSCP_PATH}/src/common/vscpmd5.c       
+    $ENV{VSCP_ROOT}/src/vscp/common/vscp.h
+    $ENV{VSCP_ROOT}/src/vscp/common/vscpremotetcpif.h
+    $ENV{VSCP_ROOT}/src/vscp/common/vscpremotetcpif.cpp
+    $ENV{VSCP_ROOT}/src/vscp/common/vscpdatetime.h
+    $ENV{VSCP_ROOT}/src/vscp/common/vscpdatetime.cpp
+    $ENV{VSCP_ROOT}/src/vscp/common/guid.h
+    $ENV{VSCP_ROOT}/src/vscp/common/guid.cpp
+    $ENV{VSCP_ROOT}/src/vscp/common/vscphelper.h
+    $ENV{VSCP_ROOT}/src/vscp/common/vscphelper.cpp
+    $ENV{VSCP_ROOT}/src/vscp/common/canal.h
+    $ENV{VSCP_ROOT}/src/common/sockettcp.h
+    $ENV{VSCP_ROOT}/src/common/sockettcp.c
+    $ENV{VSCP_ROOT}/src/common/vscpbase64.h
+    $ENV{VSCP_ROOT}/src/common/vscpbase64.c
+    $ENV{VSCP_ROOT}/src/common/vscp_aes.h
+    $ENV{VSCP_ROOT}/src/common/vscp_aes.c
+    $ENV{VSCP_ROOT}/src/common/crc.h
+    $ENV{VSCP_ROOT}/src/common/crc.c
+    $ENV{VSCP_ROOT}/src/common/crc8.h
+    $ENV{VSCP_ROOT}/src/common/crc8.c
+    $ENV{VSCP_ROOT}/src/common/vscpmd5.h
+    $ENV{VSCP_ROOT}/src/common/vscpmd5.c       
   ) 
 endif()
 
@@ -337,9 +337,9 @@ if (WIN32)
 
     include_directories( PUBLIC src/
         ./windows/
-        ${VSCP_PATH}/src/vscp/common/
-        ${VSCP_PATH}/src/common
-        ${VSCP_PATH}/src/common/third_party
+        $ENV{VSCP_ROOT}/src/vscp/common/
+        $ENV{VSCP_ROOT}/src/common
+        $ENV{VSCP_ROOT}/src/common/third_party
         ./third_party/nlohmann/include/
         ./third_party/spdlog/include
         ${PThreads4W_INCLUDE_DIR}
@@ -349,9 +349,9 @@ if (WIN32)
         ${LOCAL_SYSLOG_INCLUDE} )
 else()
     include_directories( PUBLIC src/
-        ${VSCP_PATH}/src/vscp/common/
-        ${VSCP_PATH}/src/common
-        ${VSCP_PATH}/src/common/third_party
+        $ENV{VSCP_ROOT}/src/vscp/common/
+        $ENV{VSCP_ROOT}/src/common
+        $ENV{VSCP_ROOT}/src/common/third_party
         ./third_party/nlohmann/include/
         ./third_party/spdlog/include/
         ${CMAKE_BINARY_DIR}
@@ -408,11 +408,11 @@ if(WIN32)
             DESTINATION ${CMAKE_INSTALL_BINDIR}/..)
 
     # Headers
-    INSTALL( FILES "${VSCP_PATH}/src/vscp/common/vscp.h"
+    INSTALL( FILES "$ENV{VSCP_ROOT}/src/vscp/common/vscp.h"
             "${CMAKE_SOURCE_DIR}/src/vscphelperlib.h" 
-            "${VSCP_PATH}/src/vscp/common/canal.h"
-            "${VSCP_PATH}/src/vscp/common/vscp_class.h"
-            "${VSCP_PATH}/src/vscp/common/vscp_type.h"
+            "$ENV{VSCP_ROOT}/src/vscp/common/canal.h"
+            "$ENV{VSCP_ROOT}/src/vscp/common/vscp_class.h"
+            "$ENV{VSCP_ROOT}/src/vscp/common/vscp_type.h"
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})  
 
 else()
@@ -427,11 +427,11 @@ else()
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)      
 
     # Headers        
-    INSTALL(FILES "${VSCP_PATH}/src/vscp/common/vscp.h"
+    INSTALL(FILES "$ENV{VSCP_ROOT}/src/vscp/common/vscp.h"
             "${PROJECT_SOURCE_DIR}/src/vscphelperlib.h" 
-            "${VSCP_PATH}/src/vscp/common/canal.h"
-            "${VSCP_PATH}/src/vscp/common/vscp_class.h"
-            "${VSCP_PATH}/src/vscp/common/vscp_type.h"
+            "$ENV{VSCP_ROOT}/src/vscp/common/canal.h"
+            "$ENV{VSCP_ROOT}/src/vscp/common/vscp_class.h"
+            "$ENV{VSCP_ROOT}/src/vscp/common/vscp_type.h"
             DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})        
 endif()
 

From 19164fbc51eafb07ede84731a82b306bc64fb42e Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Mon, 13 May 2024 14:32:37 +0200
Subject: [PATCH 24/26] Fixed compile after name changes

---
 CMakeLists.txt          | 2 +-
 linux/libvscphelper.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb81448..471a47d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ if(NOT DEFINED PATCH_VERSION)
     SET(PATCH_VERSION "0")
 endif()
 
-add_subdirectory(./third_party/spdlog/)
+#add_subdirectory(./third_party/spdlog/)
 
 SET(CPACK_PACKAGE_DESCRIPTION "VSCP Helper library")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Helper functionality for VSCP applications")
diff --git a/linux/libvscphelper.cpp b/linux/libvscphelper.cpp
index 0be6cdd..206dcf3 100644
--- a/linux/libvscphelper.cpp
+++ b/linux/libvscphelper.cpp
@@ -46,7 +46,7 @@
 #include <syslog.h>
 
 #include <canal.h>
-#include <canal_macro.h>
+#include <canal-macro.h>
 #include <vscpremotetcpif.h>
 
 #include "libvscphelper.h"

From 4812a8bf0f059eaa3d3770f4a4cbd9fb96e3316e Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Mon, 13 May 2024 16:27:11 +0200
Subject: [PATCH 25/26] Fixed error in path

---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 471a47d..6abfc70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -267,8 +267,8 @@ add_library(libvscphelper SHARED
     $ENV{VSCP_ROOT}/src/common/sockettcp.c
     $ENV{VSCP_ROOT}/src/common/vscpbase64.h
     $ENV{VSCP_ROOT}/src/common/vscpbase64.c
-    $ENV{VSCP_ROOT}/src/common/vscp_aes.h
-    $ENV{VSCP_ROOT}/src/common/vscp_aes.c
+    $ENV{VSCP_ROOT}/src/common/vscp-aes.h
+    $ENV{VSCP_ROOT}/src/common/vscp-aes.c
     $ENV{VSCP_ROOT}/src/common/crc.h
     $ENV{VSCP_ROOT}/src/common/crc.c
     $ENV{VSCP_ROOT}/src/common/crc8.h
@@ -298,8 +298,8 @@ else()
     $ENV{VSCP_ROOT}/src/common/sockettcp.c
     $ENV{VSCP_ROOT}/src/common/vscpbase64.h
     $ENV{VSCP_ROOT}/src/common/vscpbase64.c
-    $ENV{VSCP_ROOT}/src/common/vscp_aes.h
-    $ENV{VSCP_ROOT}/src/common/vscp_aes.c
+    $ENV{VSCP_ROOT}/src/common/vscp-aes.h
+    $ENV{VSCP_ROOT}/src/common/vscp-aes.c
     $ENV{VSCP_ROOT}/src/common/crc.h
     $ENV{VSCP_ROOT}/src/common/crc.c
     $ENV{VSCP_ROOT}/src/common/crc8.h

From ff3472590c4d4df4c4614f3471670c5c3aa34c92 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Tue, 24 Sep 2024 17:53:19 +0200
Subject: [PATCH 26/26] Removed fastpbkdf2

---
 .gitmodules    | 3 ---
 CMakeLists.txt | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index ade6cdc..cb79d30 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "third_party/spdlog"]
 	path = third_party/spdlog
 	url = https://github.com/gabime/spdlog.git
-[submodule "third_party/fastpbkdf2"]
-	path = third_party/fastpbkdf2
-	url = https://github.com/danpashin/fastpbkdf2.git
 [submodule "third_party/nlohmann"]
 	path = third_party/nlohmann
 	url = https://github.com/nlohmann/json.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6abfc70..f59600f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -252,7 +252,7 @@ add_library(libvscphelper SHARED
     ./windows/libvscphelper.h
     ./windows/libvscphelper.cpp
     ./third_party/mustache/mustache.hpp
-    ./third_party/spdlog/include    
+    ./third_party/spdlog/include
     $ENV{VSCP_ROOT}/src/vscp/common/vscp.h
     $ENV{VSCP_ROOT}/src/vscp/common/vscpremotetcpif.h
     $ENV{VSCP_ROOT}/src/vscp/common/vscpremotetcpif.cpp