Merge branch 'release/2.5.1'

Yadoms · Mar 11, 2022 · ca501c8 · ca501c8
2 parents b2ecf81 + ff2c818
commit ca501c8
Show file tree

Hide file tree

Showing 108 changed files with 3,682 additions and 479 deletions.
diff --git a/.github/workflows/generate_binaries.yml b/.github/workflows/generate_binaries.yml
@@ -178,7 +178,7 @@ jobs:
 
   Windows:
     name : Generate for Windows
-    runs-on: windows-latest
+    runs-on: windows-2019
     steps:
     - name: Checkout code
       uses: actions/checkout@v2

diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -69,7 +69,7 @@ jobs:
 
   Windows:
     name : Run Unit tests for Windows
-    runs-on: windows-latest
+    runs-on: windows-2019
     steps:
     - name: Checkout code
       uses: actions/checkout@v2

diff --git a/sources/cmake/mac.cmake b/sources/cmake/mac.cmake
@@ -13,9 +13,10 @@ include(CMakeFindFrameworks)
 cmake_find_frameworks(IOKit)
 cmake_find_frameworks(CoreFoundation)
 cmake_find_frameworks(Carbon)
+cmake_find_frameworks(SystemConfiguration)
 
 if (IOKit_FRAMEWORKS)
-   set(IOKIT_LIBRARY "-framework IOKit -framework CoreFoundation -framework CoreServices" CACHE FILEPATH "IOKit framework" FORCE)
+   set(IOKIT_LIBRARY "-framework IOKit -framework CoreFoundation -framework CoreServices -framework SystemConfiguration" CACHE FILEPATH "IOKit framework" FORCE)
    set(IOKIT_FOUND 1)
 endif (IOKit_FRAMEWORKS)
 

diff --git a/sources/external-libs/curl/CMakeLists.txt b/sources/external-libs/curl/CMakeLists.txt
@@ -89,13 +89,13 @@ if(CMAKE_TOOLCHAIN_FILE)
 endif(CMAKE_TOOLCHAIN_FILE)
 
 ExternalProject_Add(curl_build
-   URL               https://curl.se/download/curl-7.76.1.zip
-   URL_HASH          SHA256=70258d07ac9958fbe228c2f38703061a77a172527114e4efc6aa6501c475d63c
+   GIT_REPOSITORY    https://github.com/curl/curl.git
+   GIT_TAG           curl-7_80_0
+   GIT_CONFIG        advice.detachedHead=false
    PATCH_COMMAND     ${CURL_PATHCMD}
    PREFIX            ${CURL_ROOT}
    CMAKE_ARGS        ${CURL_BUILD_ARGS}
    INSTALL_COMMAND   ""
-   BUILD_ALWAYS      OFF
 )
 
 SET_PROPERTY(TARGET curl_build PROPERTY FOLDER "External Libs")

diff --git a/sources/external-libs/curlpp/CMakeLists.txt b/sources/external-libs/curlpp/CMakeLists.txt
@@ -48,7 +48,7 @@ message("CURLPP : cross compilation (toolchain:${CMAKE_TOOLCHAIN_FILE}, with ${C
       list(APPEND CURLPP_BUILD_ARGS "-DCC_RPI_GXX=${CC_RPI_GXX}")
    endif()
 
-   #append all potentials dependecnies that exteranl project may need (openssl mostly)
+   #append all potentials dependencies that external project may need (openssl mostly)
    if(OPENSSL_ROOT)
       list(APPEND CURLPP_BUILD_ARGS "-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT}")
    endif()
@@ -62,7 +62,7 @@ message("CURLPP : cross compilation (toolchain:${CMAKE_TOOLCHAIN_FILE}, with ${C
       list(APPEND CURLPP_BUILD_ARGS "-DPython2_ROOT=${Python2_ROOT}")
    endif()  
    if(Python3_ROOT)
-      list(APPEND CURLPP_BUILD_ARGS "-DPython2_ROOT=${Python3_ROOT}")
+      list(APPEND CURLPP_BUILD_ARGS "-DPython3_ROOT=${Python3_ROOT}")
    endif()  
 
    list(APPEND CURLPP_BUILD_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}")
@@ -73,13 +73,12 @@ endif(CMAKE_TOOLCHAIN_FILE)
 ExternalProject_Add (curlpp_build
    DEPENDS           curl_build
    GIT_REPOSITORY    https://github.com/jpbarrette/curlpp.git
-   GIT_TAG           02e4a60e7d541bbfd11bf21bbb76bd584863b5df
+   GIT_TAG           e94744a17a872fb7c53d4c266689e21aa813b88f
    GIT_CONFIG        advice.detachedHead=false
    PATCH_COMMAND     ${CURLPP_PATHCMD}   
    PREFIX            ${CURLPP_ROOT}
    CMAKE_ARGS        ${CURLPP_BUILD_ARGS}
    INSTALL_COMMAND   ""
-   BUILD_ALWAYS      OFF
 )
 
 SET_PROPERTY(TARGET curlpp_build PROPERTY FOLDER "External Libs")

diff --git a/sources/plugins/EnOcean/CMakeLists.txt b/sources/plugins/EnOcean/CMakeLists.txt
@@ -357,6 +357,41 @@ set(ENOCEAN_SOURCES ${ENOCEAN_SOURCES}
 
    profiles/hardCoded/Profile_D2_03_0A.cpp
    profiles/hardCoded/Profile_D2_03_0A.h
+
+   profiles/hardCoded/Profile_D2_04_Common.cpp
+   profiles/hardCoded/Profile_D2_04_Common.h
+   profiles/hardCoded/Profile_D2_04_00.cpp
+   profiles/hardCoded/Profile_D2_04_00.h
+   profiles/hardCoded/Profile_D2_04_01.cpp
+   profiles/hardCoded/Profile_D2_04_01.h
+   profiles/hardCoded/Profile_D2_04_02.cpp
+   profiles/hardCoded/Profile_D2_04_02.h
+   profiles/hardCoded/Profile_D2_04_03.cpp
+   profiles/hardCoded/Profile_D2_04_03.h
+   profiles/hardCoded/Profile_D2_04_04.cpp
+   profiles/hardCoded/Profile_D2_04_04.h
+   profiles/hardCoded/Profile_D2_04_05.cpp
+   profiles/hardCoded/Profile_D2_04_05.h
+   profiles/hardCoded/Profile_D2_04_06.cpp
+   profiles/hardCoded/Profile_D2_04_06.h
+   profiles/hardCoded/Profile_D2_04_07.cpp
+   profiles/hardCoded/Profile_D2_04_07.h
+   profiles/hardCoded/Profile_D2_04_08.cpp
+   profiles/hardCoded/Profile_D2_04_08.h
+   profiles/hardCoded/Profile_D2_04_09.cpp
+   profiles/hardCoded/Profile_D2_04_09.h
+   profiles/hardCoded/Profile_D2_04_10.cpp
+   profiles/hardCoded/Profile_D2_04_10.h
+   profiles/hardCoded/Profile_D2_04_1A.cpp
+   profiles/hardCoded/Profile_D2_04_1A.h
+   profiles/hardCoded/Profile_D2_04_1B.cpp
+   profiles/hardCoded/Profile_D2_04_1B.h
+   profiles/hardCoded/Profile_D2_04_1C.cpp
+   profiles/hardCoded/Profile_D2_04_1C.h
+   profiles/hardCoded/Profile_D2_04_1D.cpp
+   profiles/hardCoded/Profile_D2_04_1D.h
+   profiles/hardCoded/Profile_D2_04_1E.cpp
+   profiles/hardCoded/Profile_D2_04_1E.h
 
    profiles/hardCoded/Profile_D2_05_Common.cpp
    profiles/hardCoded/Profile_D2_05_Common.h