Merge pull request #1099 from stlink-org/develop

Merge branch develop
stlink-org · Mar 11, 2021 · cc9bedd · cc9bedd
2 parents d041614 + 86e6dd0
commit cc9bedd
Show file tree

Hide file tree

Showing 113 changed files with 12,890 additions and 8,026 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -7,17 +7,19 @@ labels: ''
 
 Thank you for giving feedback to the stlink project.
 
-**NOTICE: Please read and follow instructions in #906 before submitting a ticket. This feature request will be deleted without notice when not enough information is provided! So please ensure that all fields are filled out.**
+**NOTICE: Please read and follow instructions in #906 before submitting a ticket.
+This feature request will be deleted without notice when not enough information is provided! So please ensure that all fields are filled out.**
 
 - [ ] I made serious effort to avoid creating duplicate or nearly similar issue
 
-In order to allow developers and other contributors to isolate and target your respective issue, please take some time to select the check boxes below and edit each item individually appropriate to your specific problem.
+In order to allow developers and other contributors to isolate and target your respective issue, please take some time to select the check boxes below
+and fill out each of the following items appropriate to your specific problem.
 
-- [ ] Programmer/board type: (e.g ST-Link/v1, ST-Link/v2, ST-Link/v2-onboard, ST-Link/v3)
-- [ ] Operating system: (e.g Linux, Mac OS X, Windows (with specific version))
-- [ ] Stlink tools version and/or git commit hash: (e.g v1.1.0/git-c722056)
-- [ ] Stlink commandline tool name: (e.g `st-info`, `st-flash`, `st-util`)
-- [ ] Target chip (and optional board): (e.g STM32F402VG (STM32Fxxx Discovery))
+- [ ] Programmer/board type: [enter here] (e.g STLink /V1, /V2, /V2-onboard, /V2-clone, /V3)
+- [ ] Operating system an version: [enter here] (e.g Linux, macOS, Windows)
+- [ ] **Stlink tools version** and/or git commit hash: [enter here] (e.g v1.6.1/git-d0416149)
+- [ ] Stlink commandline tool name: [enter here] (e.g `st-info`, `st-flash`, `st-util`)
+- [ ] Target chip (and board, if applicable): [enter here] (e.g STM32F103C8T6 (NUCLEO-F103RB))
 
 Futher we kindly ask you to describe the detected problem as detailed as possible and to add debug output if available, by using the following template:
 

diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -7,17 +7,19 @@ labels: code/feature-request
 
 Thank you for giving feedback to the stlink project.
 
-**NOTICE: Please read and follow instructions in #906 before submitting a ticket. This feature request will be deleted without notice when not enough information is provided! So please ensure that all fields are filled out.**
+**NOTICE: Please read and follow instructions in #906 before submitting a ticket.
+This feature request will be deleted without notice when not enough information is provided! So please ensure that all fields are filled out.**
 
 - [ ] I made serious effort to avoid creating duplicate or nearly similar issue
 
-In order to allow developers and other contributors to isolate and target your respective issue, please take some time to select the check boxes below and edit each item individually appropriate to your specific request.
+In order to allow developers and other contributors to isolate and target your respective issue, please take some time to select the check boxes below
+and fill out each of the following items appropriate to your specific request.
 
-- [ ] Programmer/board type: (e.g ST-Link/v1, ST-Link/v2, ST-Link/v2-onboard, ST-Link/v3)
-- [ ] Operating system: (e.g Linux, Mac OS X, Windows (with specific version))
-- [ ] Stlink tools version and/or git commit hash: (e.g v1.1.0/git-c722056)
-- [ ] Stlink commandline tool name: (e.g `st-info`, `st-flash`, `st-util`)
-- [ ] Target chip (and optional board): (e.g STM32F402VG (STM32Fxxx Discovery))
+- [ ] Programmer/board type: [enter here] (e.g STLink /V1, /V2, /V2-onboard, /V2-clone, /V3)
+- [ ] Operating system an version: [enter here] (e.g Linux, macOS, Windows)
+- [ ] **Stlink tools version** and/or git commit hash: [enter here] (e.g v1.6.1/git-d0416149)
+- [ ] Stlink commandline tool name: [enter here] (e.g `st-info`, `st-flash`, `st-util`)
+- [ ] Target chip (and board, if applicable): [enter here] (e.g STM32F103C8T6 (NUCLEO-F103RB))
 
 Futher we kindly ask you to describe the detected problem as detailed as possible and to add debug output if available, by using the following template:
 

diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,10 @@
 build
 build-mingw
+
+.project
 .cmake/
 .vscode/
-.project
 
 obj-*
 *.user*
+*.swp
diff --git a/.travis.yml b/.travis.yml
@@ -1,140 +1,153 @@
 language: c
 
 jobs:
-    include:
-        ### 64-bit builds on AMD64 ###
-        - os: linux
-          dist: bionic
-          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-9
-          addons:
-              apt:
-                  sources: ['ubuntu-toolchain-r-test']
-                  packages: ['gcc-9', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
-        - os: linux
-          dist: xenial
-          env: BADGE=linux
-          compiler: clang-3.7
-          addons:
-              apt:
-                  sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-xenial-3.7']
-                  packages: ['clang-3.7', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
-        - os: linux
-          dist: bionic
-          env: BADGE=linux
-          compiler: clang-6.0
-          addons:
-              apt:
-                  sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-bionic-6.0']
-                  packages: ['clang-6.0', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
-        - os: linux
-          dist: bionic
-          env: BADGE=linux
-          compiler: clang-9
-          addons:
-              apt:
-                  sources: ['ubuntu-toolchain-r-test']
-                  packages: ['clang-9', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
+  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"]
+    - 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"]
+    - 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"]
+    - 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"]
 
-        - os: linux
-          dist: bionic
-          env: BADGE=linux-mingw
-          name: linux-mingw
-          compiler: gcc-9
-          addons:
-              apt:
-                  sources: ['ubuntu-toolchain-r-test']
-                  packages: ['gcc-9', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm', 'mingw-w64']
+    ### cross build on AMD64 ###
+    - os: linux
+      dist: focal
+      env: BADGE=linux-mingw
+      name: linux-mingw
+      compiler: gcc-10
+      addons:
+        apt:
+          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: bionic
-          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-9
-          addons:
-              apt:
-                  sources: ['ubuntu-toolchain-r-test']
-                  packages: ['gcc-9', '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-3.7
-          addons:
-              apt:
-                  sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-xenial-3.7']
-                  packages: ['clang-3.7', '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-6.0
-          addons:
-              apt:
-                  sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-bionic-6.0']
-                  packages: ['clang-6.0', '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-9
-          addons:
-              apt:
-                  sources: ['ubuntu-toolchain-r-test']
-                  packages: ['clang-9', 'libusb-1.0.0-dev', 'libgtk-3-dev', 'rpm']
-          before_install:
-            - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
+    ### 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";
 
-
-        ### macOS ###
-        - os: osx
-          env: BADGE=osx
-          compiler: gcc
-          addons:
-            homebrew:
-              packages:
-                - gcc
-                - libusb
-                - gtk+3
-        - os: osx
-          env: BADGE=osx
-          compiler: clang
-          addons:
-            homebrew:
-              packages:
-                - clang
-                - libusb
-                - gtk+3
-
-        ### Windows ###
-#        - os: windows
-#          env: BADGE=windows
-#          compiler: gcc
+    ### macOS ###
+    - os: osx
+      env: BADGE=osx
+      compiler: gcc
+      addons:
+        homebrew:
+          packages:
+            - gcc
+            - libusb
+            - gtk+3
+    - os: osx
+      env: BADGE=osx
+      compiler: clang
+      addons:
+        homebrew:
+          packages:
+            - clang
+            - libusb
+            - gtk+3
 
 script:
   - git fetch --tags
   - printenv
   - cmake --version
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]] || [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./.travis.sh; fi
-#  - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then cmd.exe /C 'mingw64-build.bat'; fi