From eebcb1acc8a29a156276852eb730e961883a9e71 Mon Sep 17 00:00:00 2001
From: nightwalker-87 <15526941+Nightwalker-87@users.noreply.github.com>
Date: Fri, 2 Apr 2021 18:34:31 +0200
Subject: [PATCH 1/3] Revert "Updated libusb to v1.0.24"

This reverts commit d10a4f8def8189d4b14fad20b25b75bcf010e563.
---
 cmake/modules/Findlibusb.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/modules/Findlibusb.cmake b/cmake/modules/Findlibusb.cmake
index b3e5c7e2b..bc613779d 100644
--- a/cmake/modules/Findlibusb.cmake
+++ b/cmake/modules/Findlibusb.cmake
@@ -75,7 +75,7 @@ elseif (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW))
 
     if (NOT LIBUSB_FOUND)
         # Preparations for installing libusb library
-        set(LIBUSB_WIN_VERSION 1.0.24)          # set libusb version
+        set(LIBUSB_WIN_VERSION 1.0.23)          # set libusb version
         set(LIBUSB_WIN_ARCHIVE libusb-${LIBUSB_WIN_VERSION}.7z)
         if (WIN32 AND NOT EXISTS "/etc/debian_version") # ... on native Windows systems
             set(LIBUSB_WIN_ARCHIVE_PATH ${CMAKE_BINARY_DIR}/${LIBUSB_WIN_ARCHIVE})
@@ -92,7 +92,7 @@ elseif (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW))
             message(STATUS "downloading libusb ${LIBUSB_WIN_VERSION}")
             file(DOWNLOAD
                 https://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-${LIBUSB_WIN_VERSION}/libusb-${LIBUSB_WIN_VERSION}.7z/download
-                ${LIBUSB_WIN_ARCHIVE_PATH} EXPECTED_MD5 5c944b1c8aa9d43e026a94302d0f8ac4
+                ${LIBUSB_WIN_ARCHIVE_PATH} EXPECTED_MD5 cf3d38d2ff053ef343d10c0b8b0950c2
                 )
         endif ()
 

From e0f7552fc1a13990f70da863c5fdaa1f64be649f Mon Sep 17 00:00:00 2001
From: nightwalker-87 <15526941+Nightwalker-87@users.noreply.github.com>
Date: Sat, 3 Apr 2021 14:53:16 +0200
Subject: [PATCH 2/3] Updated CI build configuration

- Ensure clean build system for all build targets
- Rearranged & renamed build jobs
- Completed set of 32-bit & 64-bit builds
- Updated notifications for MinGW cross build
- Added macOS 10.14 build environment for Travis CI
---
 .github/workflows/c-cpp.yml    | 387 +++++++++++++++++++--------------
 .travis.sh                     |   4 +-
 .travis.yml                    | 177 +++++----------
 cmake/modules/Findlibusb.cmake |   2 +
 4 files changed, 281 insertions(+), 289 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index b42d001af..4769450ae 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -7,95 +7,145 @@ on:
     branches: [master, develop, testing]
 
 jobs:
-  job_linux_1a:
-    name: ubuntu-20.04 gcc
-    runs-on: ubuntu-20.04
+
+# Linux
+
+  job_linux_16_04_64_gcc:
+    name: ubuntu-16.04 gcc
+    runs-on: ubuntu-16.04
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
+        run: sudo apt-get install gcc-5 libusb-1.0.0-dev libgtk-3-dev rpm
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
 
-  job_linux_2a:
-    name: ubuntu-18.04 gcc
-    runs-on: ubuntu-18.04
+  job_linux_16_04_32_gcc:
+    name: ubuntu-16.04 gcc 32-bit
+    runs-on: ubuntu-16.04
     steps:
       - uses: actions/checkout@v2
-      - name: install dependencies
-        run: sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: Install dependencies
+        run: sudo apt-get install gcc-5 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: Set compiler flags
+        run: |
+          CFLAGS="$CFLAGS -m32"
+          CXXFLAGS="$CXXFLAGS -m32"
+          LDFLAGS="$LDFLAGS -m32"
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
 
-  job_linux_3a:
-    name: ubuntu-16.04 gcc
+  job_linux_16_04_64_clang:
+    name: ubuntu-16.04 clang
     runs-on: ubuntu-16.04
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: sudo apt-get install gcc-5 libusb-1.0.0-dev libgtk-3-dev rpm
+        run: sudo apt-get install clang-3.5 libusb-1.0.0-dev libgtk-3-dev rpm
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
 
-  job_linux_1b:
-    name: ubuntu-20.04 clang
-    runs-on: ubuntu-20.04
+  job_linux_16_04_32_clang:
+    name: ubuntu-16.04 clang 32-bit
+    runs-on: ubuntu-16.04
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
+        run: sudo apt-get install clang-3.5 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: Set compiler flags
+        run: |
+          CFLAGS="$CFLAGS -m32"
+          CXXFLAGS="$CXXFLAGS -m32"
+          LDFLAGS="$LDFLAGS -m32"
+      - name: make debug
+        run: sudo make clean && make debug
+      - name: make test
+        run: sudo make clean && make test
+      - name: make release
+        run: sudo make clean && make release
+      - name: sudo make install
+        run: sudo make clean && sudo make install
+      - name: sudo make package
+        run: sudo make package
+      - name: sudo make uninstall
+        run: sudo make uninstall && sudo make clean
+
+  job_linux_18_04_64_gcc:
+    name: ubuntu-18.04 gcc
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: install dependencies
+        run: sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
 
-  job_linux_2b:
+  job_linux_18_04_32_gcc:
+    name: ubuntu-18.04 gcc 32-bit
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: install dependencies
+        run: sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: Set compiler flags
+        run: |
+          CFLAGS="$CFLAGS -m32"
+          CXXFLAGS="$CXXFLAGS -m32"
+          LDFLAGS="$LDFLAGS -m32"
+      - name: make debug
+        run: sudo make clean && make debug
+      - name: make test
+        run: sudo make clean && make test
+      - name: make release
+        run: sudo make clean && make release
+      - name: sudo make install
+        run: sudo make clean && sudo make install
+      - name: sudo make package
+        run: sudo make package
+      - name: sudo make uninstall
+        run: sudo make uninstall && sudo make clean
+  
+  job_linux_18_04_64_clang:
     name: ubuntu-18.04 clang
     runs-on: ubuntu-18.04
     steps:
@@ -103,43 +153,64 @@ jobs:
       - name: install dependencies
         run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
 
-  job_linux_3b:
-    name: ubuntu-16.04 clang
-    runs-on: ubuntu-16.04
+  job_linux_18_04_32_clang:
+    name: ubuntu-18.04 clang 32-bit
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: Set compiler flags
+        run: |
+          CFLAGS="$CFLAGS -m32"
+          CXXFLAGS="$CXXFLAGS -m32"
+          LDFLAGS="$LDFLAGS -m32"
+      - name: make debug
+        run: sudo make clean && make debug
+      - name: make test
+        run: sudo make clean && make test
+      - name: make release
+        run: sudo make clean && make release
+      - name: sudo make install
+        run: sudo make clean && sudo make install
+      - name: sudo make package
+        run: sudo make package
+      - name: sudo make uninstall
+        run: sudo make uninstall && sudo make clean
+
+  job_linux_20_04_64_gcc:
+    name: ubuntu-20.04 gcc
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: sudo apt-get install clang libusb-1.0.0-dev libgtk-3-dev rpm
+        run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
 
-  job_linux_1c:
+  job_linux_20_04_32_gcc:
     name: ubuntu-20.04 gcc 32-bit
     runs-on: ubuntu-20.04
     steps:
@@ -152,97 +223,106 @@ jobs:
           CXXFLAGS="$CXXFLAGS -m32"
           LDFLAGS="$LDFLAGS -m32"
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
 
-  job_linux_2c:
-    name: ubuntu-18.04 gcc 32-bit
-    runs-on: ubuntu-18.04
+  job_linux_20_04_64_clang:
+    name: ubuntu-20.04 clang
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - name: install dependencies
-        run: sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
-      - name: Set compiler flags
-        run: |
-          CFLAGS="$CFLAGS -m32"
-          CXXFLAGS="$CXXFLAGS -m32"
-          LDFLAGS="$LDFLAGS -m32"
+      - name: Install dependencies
+        run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
 
-  job_linux_3c:
-    name: ubuntu-16.04 gcc 32-bit
-    runs-on: ubuntu-16.04
+  job_linux_20_04_32_clang:
+    name: ubuntu-20.04 clang 32-bit
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: sudo apt-get install gcc-5 libusb-1.0.0-dev libgtk-3-dev rpm
+        run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
       - name: Set compiler flags
         run: |
           CFLAGS="$CFLAGS -m32"
           CXXFLAGS="$CXXFLAGS -m32"
           LDFLAGS="$LDFLAGS -m32"
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
 
-  job_linux_4:
-    name: ubuntu-20.04 mingw64
-    runs-on: ubuntu-20.04
+# macOS
+
+  job_macos_10_15_gcc:
+    name: macos-10.15 gcc
+    runs-on: macos-10.15
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: brew install gcc libusb gtk+3
+      - name: make debug
+        run: sudo make clean && make debug
+      - name: make test
+        run: sudo make clean && make test
+      - name: make release
+        run: sudo make clean && make release
+      - name: sudo make install
+        run: sudo make clean && sudo make install
+      - name: sudo make package
+        run: sudo make package
+      - name: sudo make uninstall
+        run: sudo make uninstall && sudo make clean
+
+  job_macos_10_15_clang:
+    name: macos-10.15 clang
+    runs-on: macos-10.15
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm mingw-w64
+        run: brew install llvm libusb gtk+3
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
 
-  # job_macos_1a:
+  # job_macos_11_gcc:
   #   name: macos-11.0 gcc
   #   runs-on: macos-11.0
   #   steps:
@@ -250,43 +330,19 @@ jobs:
   #     - name: Install dependencies
   #       run: brew install gcc libusb gtk+3
   #     - name: make debug
-  #       run: make debug
+  #       run: sudo make clean && make debug
   #     - name: make test
-  #       run: make test
+  #       run: sudo make clean && make test
   #     - name: make release
-  #       run: make release
+  #       run: sudo make clean && make release
   #     - name: sudo make install
-  #       run: sudo make install
+  #       run: sudo make clean && sudo make install
   #     - name: sudo make package
   #       run: sudo make package
   #     - name: sudo make uninstall
-  #       run: sudo make uninstall
-  #     - name: sudo make clean
-  #       run: sudo make clean
+  #       run: sudo make uninstall && sudo make clean
 
-  job_macos_2a:
-    name: macos-10.15 gcc
-    runs-on: macos-10.15
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: brew install gcc libusb gtk+3
-      - name: make debug
-        run: make debug
-      - name: make test
-        run: make test
-      - name: make release
-        run: make release
-      - name: sudo make install
-        run: sudo make install
-      - name: sudo make package
-        run: sudo make package
-      - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
-
-  # job_macos_1b:
+  # job_macos_11_clang:
   #   name: macos-11.0 clang
   #   runs-on: macos-11.0
   #   steps:
@@ -294,38 +350,31 @@ jobs:
   #     - name: Install dependencies
   #       run: brew install llvm libusb gtk+3
   #     - name: make debug
-  #       run: make debug
+  #       run: sudo make clean && make debug
   #     - name: make test
-  #       run: make test
+  #       run: sudo make clean && make test
   #     - name: make release
-  #       run: make release
+  #       run: sudo make clean && make release
   #     - name: sudo make install
-  #       run: sudo make install
+  #       run: sudo make clean && sudo make install
   #     - name: sudo make package
   #       run: sudo make package
   #     - name: sudo make uninstall
-  #       run: sudo make uninstall
-  #     - name: sudo make clean
-  #       run: sudo make clean
+  #       run: sudo make uninstall && sudo make clean
 
-  job_macos_2b:
-    name: macos-10.15 clang
-    runs-on: macos-10.15
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: brew install llvm libusb gtk+3
-      - name: make debug
-        run: make debug
-      - name: make test
-        run: make test
-      - name: make release
-        run: make release
-      - name: sudo make install
-        run: sudo make install
-      - name: sudo make package
-        run: sudo make package
-      - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+# Linux MinGW cross compliation
+
+  # job_linux_20_04_cross:
+  #   name: ubuntu-20.04 mingw64
+  #   runs-on: ubuntu-20.04
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - name: Install dependencies
+  #       run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm mingw-w64
+  #     - name: Building Release for Windows (x86-64) ...
+  #       run: sudo mkdir -p build-mingw && cd build-mingw && sudo cmake \
+  #         -DCMAKE_SYSTEM_NAME=Windows \
+  #         -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
+  #         -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake \
+  #         -DCMAKE_INSTALL_PREFIX=$PWD/install $PWD && \
+  #         sudo make && sudo rm -rf build-mingw && cd -
diff --git a/.travis.sh b/.travis.sh
index 7683af001..de2a42372 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -9,13 +9,13 @@ echo "WORK DIR:$DIR"
 DIR=$PWD
 
 if [ "$TRAVIS_JOB_NAME" == "linux-mingw" ]; then
-    echo "--> Building Release for Windows (x86-64) ..."
+    echo "--> Building for Windows (x86-64) ..."
     mkdir -p build-mingw && cd build-mingw
     cmake -DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
           -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
     make && rm -rf build-mingw && cd -
 
-    echo "--> Building Release for Windows (i686) ..."
+    echo "--> Building for Windows (i686) ..."
     mkdir -p build-mingw && cd build-mingw
     cmake -DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=i686-w64-mingw32 \
           -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
diff --git a/.travis.yml b/.travis.yml
index e866cc6ab..2a788fd69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,23 +2,7 @@ language: c
 
 jobs:
   include:
-    ### 64-bit builds on AMD64 ###
-    - os: linux
-      dist: xenial
-      env: BADGE=linux
-      compiler: gcc-5
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["gcc-5", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-    - os: linux
-      dist: bionic
-      env: BADGE=linux
-      compiler: gcc-6
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["gcc-6", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
+    ### 64-bit build on AMD64 ###
     - os: linux
       dist: focal
       env: BADGE=linux
@@ -27,30 +11,18 @@ jobs:
         apt:
           sources: ["ubuntu-toolchain-r-test"]
           packages: ["gcc-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-    - os: linux
-      dist: xenial
-      env: BADGE=linux
-      compiler: clang
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-    - os: linux
-      dist: bionic
-      env: BADGE=linux
-      compiler: clang-10
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["clang-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
+
+    ### 32-bit build on AMD64 ###
     - os: linux
       dist: focal
       env: BADGE=linux
-      compiler: clang-10
+      compiler: gcc-10
       addons:
         apt:
           sources: ["ubuntu-toolchain-r-test"]
-          packages: ["clang-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
+          packages: ["gcc-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
+      before_install:
+        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
 
     ### cross build on AMD64 ###
     - os: linux
@@ -63,92 +35,61 @@ jobs:
           sources: ["ubuntu-toolchain-r-test"]
           packages:
             ["gcc-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm", "mingw-w64"]
-
-    ### 32-bit builds on AMD64 ###
-    - os: linux
-      dist: xenial
-      env: BADGE=linux
-      compiler: gcc-5
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["gcc-5", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-      before_install:
-        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
-    - os: linux
-      dist: bionic
-      env: BADGE=linux
-      compiler: gcc-6
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["gcc-6", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-      before_install:
-        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
-    - os: linux
-      dist: focal
-      env: BADGE=linux
-      compiler: gcc-10
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["gcc-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-      before_install:
-        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
-    - os: linux
-      dist: xenial
-      env: BADGE=linux
-      compiler: clang
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
       before_install:
-        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
-    - os: linux
-      dist: bionic
-      env: BADGE=linux
-      compiler: clang-10
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["clang-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-      before_install:
-        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
-    - os: linux
-      dist: focal
-      env: BADGE=linux
-      compiler: clang-10
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["clang-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-      before_install:
-        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
+        - LDFLAGS="$LDFLAGS -NDEBUG";
 
     ### macOS ###
-    - os: osx
-      env: BADGE=osx
-      osx_image: xcode12.2
-      name: macOS 10.15.7
-      compiler: gcc
-      addons:
-        homebrew:
-          packages:
-            - gcc
-            - libusb
-            - gtk+3
-    - os: osx
-      env: BADGE=osx
-      osx_image: xcode12.2
-      name: macOS 10.15.7
-      compiler: clang
-      addons:
-        homebrew:
-          packages:
-            - llvm
-            - libusb
-            - gtk+3
+    # - os: osx
+    #   env: BADGE=osx
+    #   osx_image: xcode11.3
+    #   name: macOS 10.14.6 gcc
+    #   compiler: gcc
+    #   addons:
+    #     homebrew:
+    #       packages:
+    #         - gcc
+    #         - libusb
+    #         - gtk+3
+
+    # - os: osx
+    #   env: BADGE=osx
+    #   osx_image: xcode11.3
+    #   name: macOS 10.14.6 gcc 32-bit
+    #   compiler: gcc
+    #   addons:
+    #     homebrew:
+    #       packages:
+    #         - gcc
+    #         - libusb
+    #         - gtk+3
+    #   before_install:
+    #     - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
+
+    # - os: osx
+    #   env: BADGE=osx
+    #   osx_image: xcode11.3
+    #   name: macOS 10.14.6 clang
+    #   compiler: clang
+    #   addons:
+    #     homebrew:
+    #       packages:
+    #         - llvm
+    #         - libusb
+    #         - gtk+3
+
+    # - os: osx
+    #   env: BADGE=osx
+    #   osx_image: xcode11.3
+    #   name: macOS 10.14.6 clang 32-bit
+    #   compiler: clang
+    #   addons:
+    #     homebrew:
+    #       packages:
+    #         - llvm
+    #         - libusb
+    #         - gtk+3
+    #   before_install:
+    #     - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
 
 script:
   - git fetch --tags
diff --git a/cmake/modules/Findlibusb.cmake b/cmake/modules/Findlibusb.cmake
index bc613779d..3082a9509 100644
--- a/cmake/modules/Findlibusb.cmake
+++ b/cmake/modules/Findlibusb.cmake
@@ -46,8 +46,10 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 elseif (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW))                      # Windows or MinGW-toolchain on Debian
     # for MinGW/MSYS/MSVC: 64-bit or 32-bit?
     if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+        message(STATUS "=== Building for Windows (x86-64) ===")
         set(ARCH 64)
     else ()
+        message(STATUS "=== Building for Windowsm (i686) ===")
         set(ARCH 32)
     endif ()
 

From a3b1247d141592bd87fdb1f0aeec879e1b061eef Mon Sep 17 00:00:00 2001
From: nightwalker-87 <15526941+Nightwalker-87@users.noreply.github.com>
Date: Sun, 4 Apr 2021 23:40:10 +0200
Subject: [PATCH 3/3] General Project Update

- Updated CHANGELOG.md
- Added STLINK-V3E to supported programmers
---
 CHANGELOG.md | 22 ++++++++++++++--------
 README.md    |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee46901e7..57426342a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,14 @@
-# stlink ChangeLog
+# stlink Changelog
 
 # v1.6.2
 
-Release date: (planned Q2/2021)
+Release date: 2020-04-xx
+
+This release drops support for the STLINK/V1 programmer on macOS 10.13.
 
 Features:
 
-- Extended support for STM32H7 & rework of software reset ([#532](https://github.com/stlink-org/stlink/pull/532), [#1059](https://github.com/stlink-org/stlink/pull/1059), [#1063](https://github.com/stlink-org/stlink/pull/1063), [#1071](https://github.com/stlink-org/stlink/pull/1071))
+- Extended support for STM32H7 & rework of software reset ([#532](https://github.com/stlink-org/stlink/pull/532), [#868](https://github.com/stlink-org/stlink/pull/868), [#1059](https://github.com/stlink-org/stlink/pull/1059), [#1063](https://github.com/stlink-org/stlink/pull/1063), [#1071](https://github.com/stlink-org/stlink/pull/1071))
 - Added support for STM32H742/743/753 ([#671](https://github.com/stlink-org/stlink/pull/671), [#793](https://github.com/stlink-org/stlink/pull/793), [#823](https://github.com/stlink-org/stlink/pull/823), [#998](https://github.com/stlink-org/stlink/pull/998), [#1052](https://github.com/stlink-org/stlink/pull/1052))
 - Official support for STLINK-V3 programmers (commit [#5e0a502](https://github.com/stlink-org/stlink/commit/5e0a502df812495bfa96fa9116a19f1306152b17), [#820](https://github.com/stlink-org/stlink/pull/820), [#1022](https://github.com/stlink-org/stlink/pull/1022), [#1025](https://github.com/stlink-org/stlink/pull/1025))
 - Added preliminary support for STM32L5x2 ([#904](https://github.com/stlink-org/stlink/pull/904), [#999](https://github.com/stlink-org/stlink/pull/999))
@@ -18,6 +20,7 @@ Features:
 - Link for WIN32 & APPLE with stlink-static ([#1069](https://github.com/stlink-org/stlink/pull/1069))
 - ITM functionality for STLink/V2 and STM32Fxx chipsets ([#136](https://github.com/stlink-org/stlink/pull/136), [#179](https://github.com/stlink-org/stlink/pull/179), [#815](https://github.com/stlink-org/stlink/pull/815), [#1072](https://github.com/stlink-org/stlink/pull/1072))
 - Included ITM functionality for building with MSVC ([#1080](https://github.com/stlink-org/stlink/pull/1080))
+- Update for CI integration (commit [#0eebc9a](https://github.com/stlink-org/stlink/commit/0eebc9a74506e84d5c460ec325ae98064a81885e), [#1118](https://github.com/stlink-org/stlink/pull/1118))
 
 Updates & changes:
 
@@ -32,10 +35,11 @@ Updates & changes:
 - [doc] Added example for output of `st-info --probe` ([#1007](https://github.com/stlink-org/stlink/pull/1007), [#1049](https://github.com/stlink-org/stlink/pull/1049))
 - [refactoring] Correctly handle endianness without reference to host platform ([#1081](https://github.com/stlink-org/stlink/pull/1081))
 - Check format string for log messages ([#1093](https://github.com/stlink-org/stlink/pull/1093))
+- Removed abort() from stlink-lib ([#1116](https://github.com/stlink-org/stlink/pull/1116))
 
 Fixes:
 
-- Flash loader rework ([#356](https://github.com/stlink-org/stlink/pull/356), [#556](https://github.com/stlink-org/stlink/pull/556), [#593](https://github.com/stlink-org/stlink/pull/593), [#597](https://github.com/stlink-org/stlink/pull/597), [#607](https://github.com/stlink-org/stlink/pull/607), [#612](https://github.com/stlink-org/stlink/pull/612), [#638](https://github.com/stlink-org/stlink/pull/638), [#661](https://github.com/stlink-org/stlink/pull/661), [#690](https://github.com/stlink-org/stlink/pull/690), [#818](https://github.com/stlink-org/stlink/pull/818), [#854](https://github.com/stlink-org/stlink/pull/854), [#967](https://github.com/stlink-org/stlink/pull/967), [#979](https://github.com/stlink-org/stlink/pull/979), [#1043](https://github.com/stlink-org/stlink/pull/1043), [#1054](https://github.com/stlink-org/stlink/pull/1054), [#1092](https://github.com/stlink-org/stlink/pull/1092), [#1105](https://github.com/stlink-org/stlink/pull/1105), [#1113](https://github.com/stlink-org/stlink/pull/1113))
+- Flash loader rework ([#356](https://github.com/stlink-org/stlink/pull/356), [#556](https://github.com/stlink-org/stlink/pull/556), [#593](https://github.com/stlink-org/stlink/pull/593), [#597](https://github.com/stlink-org/stlink/pull/597), [#607](https://github.com/stlink-org/stlink/pull/607), [#612](https://github.com/stlink-org/stlink/pull/612), [#638](https://github.com/stlink-org/stlink/pull/638), [#661](https://github.com/stlink-org/stlink/pull/661), [#690](https://github.com/stlink-org/stlink/pull/690), [#818](https://github.com/stlink-org/stlink/pull/818), [#854](https://github.com/stlink-org/stlink/pull/854), [#868](https://github.com/stlink-org/stlink/pull/868), [#967](https://github.com/stlink-org/stlink/pull/967), [#979](https://github.com/stlink-org/stlink/pull/979), [#1043](https://github.com/stlink-org/stlink/pull/1043), [#1054](https://github.com/stlink-org/stlink/pull/1054), [#1092](https://github.com/stlink-org/stlink/pull/1092), [#1105](https://github.com/stlink-org/stlink/pull/1105), [#1113](https://github.com/stlink-org/stlink/pull/1113))
 - Fixed old DFU serial number for STLINK programmers ([#417](https://github.com/stlink-org/stlink/pull/417), [#494](https://github.com/stlink-org/stlink/pull/494), [#1106](https://github.com/stlink-org/stlink/pull/1106))
 - Use vl flashloader for all STM32F1 series ([#769](https://github.com/stlink-org/stlink/pull/769), [#1041](https://github.com/stlink-org/stlink/pull/1041), [#1044](https://github.com/stlink-org/stlink/pull/1044))
 - [regression] Changed timeout on flash write ([#787](https://github.com/stlink-org/stlink/pull/787), [#981](https://github.com/stlink-org/stlink/pull/981), [#987](https://github.com/stlink-org/stlink/pull/987))
@@ -60,6 +64,8 @@ Fixes:
 - Fixed support for writing option bytes ([#1102](https://github.com/stlink-org/stlink/pull/1102))
 - [doc] Corrected spelling mistake in bug report template ([#1103](https://github.com/stlink-org/stlink/pull/1103))
 - Fixed STM32WB55 reading DEBUG IDCODE from the wrong address ([#1100](https://github.com/stlink-org/stlink/pull/1100), [#1101](https://github.com/stlink-org/stlink/pull/1101))
+- Applied missing changes to tests ([#1119](https://github.com/stlink-org/stlink/pull/1119))
+- Improvements for Chip_ID read ([#1120](https://github.com/stlink-org/stlink/pull/1120))
 
 # v1.6.1
 
@@ -216,7 +222,7 @@ Release date: 2018-09-13
 
 Major changes and added features:
 
-- Added reset through `AIRCR` ([#540](https://github.com/stlink-org/stlink/pull/540), [#712](https://github.com/stlink-org/stlink/pull/712))
+- Added reset through `AIRCR` ([#254](https://github.com/stlink-org/stlink/pull/254), [#540](https://github.com/stlink-org/stlink/pull/540), [#712](https://github.com/stlink-org/stlink/pull/712))
 - Added creation of icons for `.desktop` file ([#684](https://github.com/stlink-org/stlink/pull/684), [#708](https://github.com/stlink-org/stlink/pull/708))
 - Added desktop file for linux ([#688](https://github.com/stlink-org/stlink/pull/688))
 - Added button to export STM32 flash memory to a file ([#691](https://github.com/stlink-org/stlink/pull/691))
@@ -279,7 +285,6 @@ Major changes and added features:
 
 Updates and fixes:
 
-- Fixed gdb-server: STM32L0xx has no `FP_CTRL` register for breakpoints ([#273](https://github.com/stlink-org/stlink/pull/273))
 - Added `--flash=n[k][m]` command line option to override device model ([#305](https://github.com/stlink-org/stlink/pull/305), [#516](https://github.com/stlink-org/stlink/pull/516), [#576](https://github.com/stlink-org/stlink/pull/576))
 - Updated `libusb` to 1.0.21 for Windows ([#562](https://github.com/stlink-org/stlink/pull/562))
 - Fixed low-voltage flashing on STM32F7 devices ([#566](https://github.com/stlink-org/stlink/pull/566), [#567](https://github.com/stlink-org/stlink/pull/567))
@@ -324,11 +329,11 @@ Major changes and added features:
 - Added manpages (generated with `pandoc` from Markdown) ([#208](https://github.com/stlink-org/stlink/pull/208), [#464](https://github.com/stlink-org/stlink/pull/464), [#466](https://github.com/stlink-org/stlink/pull/466), [#467](https://github.com/stlink-org/stlink/pull/467))
 - Removal of undocumented `st-term` utility, which is now replaced by `st-util` ARM semihosting feature ([#228](https://github.com/stlink-org/stlink/pull/228), [#507](https://github.com/stlink-org/stlink/pull/507), commit [#3fd0f09](https://github.com/stlink-org/stlink/commit/3fd0f099782506532198473b24f643a3f68d5ff9))
 - Support serial numbers argument for `st-util` and `st-flash` to probe and control multiple connected programmers ([#318](https://github.com/stlink-org/stlink/pull/318), [#398](https://github.com/stlink-org/stlink/pull/398), [#541](https://github.com/stlink-org/stlink/pull/541))
+- Added 'k' (kill) command to gdb-server, which resets the connection ([#358](https://github.com/stlink-org/stlink/pull/358), [#525](https://github.com/stlink-org/stlink/pull/525), [#527](https://github.com/stlink-org/stlink/pull/527), [#528](https://github.com/stlink-org/stlink/pull/528))
 - Merge `st-probe` tool into `st-info` ([#398](https://github.com/stlink-org/stlink/pull/398))
 - Added support for native debian packaging ([#444](https://github.com/stlink-org/stlink/pull/444), [#472](https://github.com/stlink-org/stlink/pull/472), [#473](https://github.com/stlink-org/stlink/pull/473), [#482](https://github.com/stlink-org/stlink/pull/482), [#483](https://github.com/stlink-org/stlink/pull/483), [#484](https://github.com/stlink-org/stlink/pull/484), [#485](https://github.com/stlink-org/stlink/pull/485))
 - Rewritten commandline parsing for `st-flash` ([#459](https://github.com/stlink-org/stlink/pull/459))
 - Added `--reset` command to `st-flash` ([#505](https://github.com/stlink-org/stlink/pull/505))
-- st-util should detect when USB commands fail ([#525](https://github.com/stlink-org/stlink/pull/525), [#527](https://github.com/stlink-org/stlink/pull/527), [#528](https://github.com/stlink-org/stlink/pull/528))
 
 Chip support added for:
 
@@ -344,12 +349,12 @@ Chip support added for:
 
 Updates and fixes:
 
+- Do a JTAG reset prior to reading CPU information when processor is in deep sleep ([#291](https://github.com/stlink-org/stlink/pull/291), [#428](https://github.com/stlink-org/stlink/pull/428), [#430](https://github.com/stlink-org/stlink/pull/430), [#451](https://github.com/stlink-org/stlink/pull/451))
 - Fixed `unaligned addr or size` when trying to write a program in RAM ([#323](https://github.com/stlink-org/stlink/pull/323))
 - Fixed flashing on `STM32_F3_SMALL` ([#325](https://github.com/stlink-org/stlink/pull/325))
 - Fixed STM32L-problem with flash loader ([#390](https://github.com/stlink-org/stlink/pull/390), [#407](https://github.com/stlink-org/stlink/pull/407), [#408](https://github.com/stlink-org/stlink/pull/408))
 - Don't read the target voltage on startup, because it crashes STM32F100 ([#423](https://github.com/stlink-org/stlink/pull/423), [#424](https://github.com/stlink-org/stlink/pull/424))
 - Added a useful error message instead of `[!] send_recv` ([#425](https://github.com/stlink-org/stlink/pull/425), [#426](https://github.com/stlink-org/stlink/pull/426))
-- Do a JTAG reset prior to reading CPU information when processor is in deep sleep ([#428](https://github.com/stlink-org/stlink/pull/428), [#430](https://github.com/stlink-org/stlink/pull/430), [#451](https://github.com/stlink-org/stlink/pull/451))
 - Fixed STM32F030 erase error ([#442](https://github.com/stlink-org/stlink/pull/442))
 - Fixed memory map for STM32F7xx ([#453](https://github.com/stlink-org/stlink/pull/453), [#456](https://github.com/stlink-org/stlink/pull/456))
 - Redesign of `st-flash` commandline options parsing ([#459](https://github.com/stlink-org/stlink/pull/459))
@@ -392,6 +397,7 @@ Updates and fixes:
 - Modified determination of erased byte pattern when flashing ([#193](https://github.com/stlink-org/stlink/pull/193), [#377](https://github.com/stlink-org/stlink/pull/377))
 - Use libusb synchronous api ([#194](https://github.com/stlink-org/stlink/pull/194), [#225](https://github.com/stlink-org/stlink/pull/225), [#374](https://github.com/stlink-org/stlink/pull/374))
 - Fixed segfault when programmer is already busy and `NULL` pointers are in the list ([#256](https://github.com/stlink-org/stlink/pull/256), [#394](https://github.com/stlink-org/stlink/pull/394))
+- Fixed gdb-server: Cortex M0 chips have no `FP_CTRL` register for breakpoints ([#266](https://github.com/stlink-org/stlink/pull/266), [#273](https://github.com/stlink-org/stlink/pull/273), [#341](https://github.com/stlink-org/stlink/pull/341))
 - Fixed issue where "unknown chip id!" was seen every other time ([#352](https://github.com/stlink-org/stlink/pull/352), [#367](https://github.com/stlink-org/stlink/pull/367), [#381](https://github.com/stlink-org/stlink/pull/381))
 - Send F4 memory-map and features for STM32F429 ([#188](https://github.com/stlink-org/stlink/pull/188), [#196](https://github.com/stlink-org/stlink/pull/196), [#250](https://github.com/stlink-org/stlink/pull/250), [#251](https://github.com/stlink-org/stlink/pull/251)) (Release v1.1.0)
 - Added AHB3 Peripherals definition for STM32F4 ([#218](https://github.com/stlink-org/stlink/pull/218), [#288](https://github.com/stlink-org/stlink/pull/288)) (Release v1.1.0)
diff --git a/README.md b/README.md
index 644c3fd86..93994db49 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ It supports several so called STLINK programmer boards (and clones thereof) whic
 - **STLINK-V3**
   - transport layer: raw USB commands
   - stand-alone programmer (STLINK-V3SET, STLINK-V3MINI, STLINK-V3MODS)
-  - on-board on some STM32 Nucleo boards
+  - on-board on some STM32 Nucleo boards (STLINK-V3E)
 
 _\*)_ **Note: Support for the STLINK/V1 on macOS is limited to 10.14 - 10.15. Due to the deprecation and removal of macOS Kernel Extensions (KEXT) there will be no support for this programmer on macOS 11 or any later version.**