From 0518dec60d0931745efa2812fa388f33d68cfa29 Mon Sep 17 00:00:00 2001 From: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com> Date: Wed, 1 Apr 2020 12:16:01 -0700 Subject: [PATCH 01/16] Correct link to Configurations (#17370) --- config/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/README.md b/config/README.md index 284a856215da..f4dfd9aedfe9 100644 --- a/config/README.md +++ b/config/README.md @@ -1,3 +1,3 @@ # Where have all the configurations gone? -## https://github.com/MarlinFirmware/Configurations/archive/release-2.0.5.2.zip +## https://github.com/MarlinFirmware/Configurations/archive/release-2.0.5.zip From e4d8336175ee09b28d23220f446d07451ca3de43 Mon Sep 17 00:00:00 2001 From: Mathias Gartner <36887952+MathiasGartner@users.noreply.github.com> Date: Sat, 2 May 2020 23:15:49 +0200 Subject: [PATCH 02/16] Fix XYZ types multiplication/division (#17826) --- Marlin/src/core/types.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h index 1212eb5ba299..6bcd4bd489ea 100644 --- a/Marlin/src/core/types.h +++ b/Marlin/src/core/types.h @@ -347,14 +347,14 @@ struct XYZval { FI XYZval operator* (const XYZEval &rs) { XYZval ls = *this; ls.x *= rs.x; ls.y *= rs.y; ls.z *= rs.z; return ls; } FI XYZval operator/ (const XYZEval &rs) const { XYZval ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; return ls; } FI XYZval operator/ (const XYZEval &rs) { XYZval ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; return ls; } - FI XYZval operator* (const float &v) const { XYZval ls = *this; ls.x *= v; ls.y *= v; ls.z *= z; return ls; } - FI XYZval operator* (const float &v) { XYZval ls = *this; ls.x *= v; ls.y *= v; ls.z *= z; return ls; } - FI XYZval operator* (const int &v) const { XYZval ls = *this; ls.x *= v; ls.y *= v; ls.z *= z; return ls; } - FI XYZval operator* (const int &v) { XYZval ls = *this; ls.x *= v; ls.y *= v; ls.z *= z; return ls; } - FI XYZval operator/ (const float &v) const { XYZval ls = *this; ls.x /= v; ls.y /= v; ls.z /= z; return ls; } - FI XYZval operator/ (const float &v) { XYZval ls = *this; ls.x /= v; ls.y /= v; ls.z /= z; return ls; } - FI XYZval operator/ (const int &v) const { XYZval ls = *this; ls.x /= v; ls.y /= v; ls.z /= z; return ls; } - FI XYZval operator/ (const int &v) { XYZval ls = *this; ls.x /= v; ls.y /= v; ls.z /= z; return ls; } + FI XYZval operator* (const float &v) const { XYZval ls = *this; ls.x *= v; ls.y *= v; ls.z *= v; return ls; } + FI XYZval operator* (const float &v) { XYZval ls = *this; ls.x *= v; ls.y *= v; ls.z *= v; return ls; } + FI XYZval operator* (const int &v) const { XYZval ls = *this; ls.x *= v; ls.y *= v; ls.z *= v; return ls; } + FI XYZval operator* (const int &v) { XYZval ls = *this; ls.x *= v; ls.y *= v; ls.z *= v; return ls; } + FI XYZval operator/ (const float &v) const { XYZval ls = *this; ls.x /= v; ls.y /= v; ls.z /= v; return ls; } + FI XYZval operator/ (const float &v) { XYZval ls = *this; ls.x /= v; ls.y /= v; ls.z /= v; return ls; } + FI XYZval operator/ (const int &v) const { XYZval ls = *this; ls.x /= v; ls.y /= v; ls.z /= v; return ls; } + FI XYZval operator/ (const int &v) { XYZval ls = *this; ls.x /= v; ls.y /= v; ls.z /= v; return ls; } FI XYZval operator>>(const int &v) const { XYZval ls = *this; _RS(ls.x); _RS(ls.y); _RS(ls.z); return ls; } FI XYZval operator>>(const int &v) { XYZval ls = *this; _RS(ls.x); _RS(ls.y); _RS(ls.z); return ls; } FI XYZval operator<<(const int &v) const { XYZval ls = *this; _LS(ls.x); _LS(ls.y); _LS(ls.z); return ls; } From c352aeb32ea80f628755f2d28ad6fde6f1cb7be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Al=C3=A9xis?= Date: Tue, 9 Jun 2020 21:27:57 +0100 Subject: [PATCH 03/16] Remove "dev" branch reference (for now) (#18242) --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 5ec9452ddb26..0ff486589bd3 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,6 @@ To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino ## Submitting Changes - Submit **Bug Fixes** as Pull Requests to the ([bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x)) branch. -- Submit **New Features** to the ([dev-2.1.x](https://github.com/MarlinFirmware/Marlin/tree/dev-2.1.x)) branch. - Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers. - Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues). From a73e61078de06599b3bd58a4b1f705c7b6f72b24 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 23 Jun 2020 19:58:00 -0500 Subject: [PATCH 04/16] Add Close / Lock actions --- .github/lock.yml | 40 +++++++++++++++++++++++++++++++ .github/workflows/close-stale.yml | 22 +++++++++++++++++ .github/workflows/lock-closed.yml | 18 ++++++++++++++ .github/workflows/test-builds.yml | 1 - 4 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 .github/lock.yml create mode 100644 .github/workflows/close-stale.yml create mode 100644 .github/workflows/lock-closed.yml diff --git a/.github/lock.yml b/.github/lock.yml new file mode 100644 index 000000000000..c5ceff66b0a7 --- /dev/null +++ b/.github/lock.yml @@ -0,0 +1,40 @@ +# +# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app +# + +# Number of days of inactivity before a closed issue or pull request is locked +daysUntilLock: 60 + +# Skip issues and pull requests created before a given timestamp. Timestamp must +# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable +skipCreatedBefore: false + +# Issues and pull requests with these labels will be ignored. Set to `[]` to disable +exemptLabels: [ 'no-locking' ] + +# Label to add before locking, such as `outdated`. Set to `false` to disable +lockLabel: false + +# Comment to post before locking. Set to `false` to disable +lockComment: > + This thread has been automatically locked since there has not been + any recent activity after it was closed. Please open a new issue for + related bugs. + +# Assign `resolved` as the reason for locking. Set to `false` to disable +setLockReason: true + +# Limit to only `issues` or `pulls` +# only: issues + +# Optionally, specify configuration settings just for `issues` or `pulls` +# issues: +# exemptLabels: +# - help-wanted +# lockLabel: outdated + +# pulls: +# daysUntilLock: 30 + +# Repository to extend settings from +# _extends: repo diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml new file mode 100644 index 000000000000..65604afa9186 --- /dev/null +++ b/.github/workflows/close-stale.yml @@ -0,0 +1,22 @@ +# +# close-stale.yml +# Close open issues after a period of inactivity +# + +name: "Close stale issues" + +on: + schedule: + - cron: "0 1 * * *" + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - uses: actions/stale@v3 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label / comment or this will be closed in 5 days.' + days-before-stale: 30 + days-before-close: 5 + stale-issue-label: 'stale-closing-soon' diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml new file mode 100644 index 000000000000..e3303e8c6e2b --- /dev/null +++ b/.github/workflows/lock-closed.yml @@ -0,0 +1,18 @@ +# +# lock-closed.yml +# Lock closed issues after a period of inactivity +# + +name: "Lock closed issue" + +on: + issues: + types: [closed] + +jobs: + lock: + runs-on: ubuntu-latest + steps: + - uses: OSDKDev/lock-issues@v1.1 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml index b92b01528781..ebdd60b2d18d 100644 --- a/.github/workflows/test-builds.yml +++ b/.github/workflows/test-builds.yml @@ -9,7 +9,6 @@ on: pull_request: branches: - bugfix-2.0.x - - dev-2.1.x paths-ignore: - config/** - data/** From 842dea4bd5c35a5b2774f2687c8a021bb81f6ac9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 30 Jun 2020 18:18:58 -0500 Subject: [PATCH 05/16] Updated lock / unlock actions --- .github/lock.yml | 40 --------------------------- .github/workflows/close-stale.yml | 3 +- .github/workflows/lock-closed.yml | 20 ++++++++++---- .github/workflows/unlock-reopened.yml | 18 ++++++++++++ 4 files changed, 35 insertions(+), 46 deletions(-) delete mode 100644 .github/lock.yml create mode 100644 .github/workflows/unlock-reopened.yml diff --git a/.github/lock.yml b/.github/lock.yml deleted file mode 100644 index c5ceff66b0a7..000000000000 --- a/.github/lock.yml +++ /dev/null @@ -1,40 +0,0 @@ -# -# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app -# - -# Number of days of inactivity before a closed issue or pull request is locked -daysUntilLock: 60 - -# Skip issues and pull requests created before a given timestamp. Timestamp must -# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable -skipCreatedBefore: false - -# Issues and pull requests with these labels will be ignored. Set to `[]` to disable -exemptLabels: [ 'no-locking' ] - -# Label to add before locking, such as `outdated`. Set to `false` to disable -lockLabel: false - -# Comment to post before locking. Set to `false` to disable -lockComment: > - This thread has been automatically locked since there has not been - any recent activity after it was closed. Please open a new issue for - related bugs. - -# Assign `resolved` as the reason for locking. Set to `false` to disable -setLockReason: true - -# Limit to only `issues` or `pulls` -# only: issues - -# Optionally, specify configuration settings just for `issues` or `pulls` -# issues: -# exemptLabels: -# - help-wanted -# lockLabel: outdated - -# pulls: -# daysUntilLock: 30 - -# Repository to extend settings from -# _extends: repo diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml index 65604afa9186..fae13f3a93b3 100644 --- a/.github/workflows/close-stale.yml +++ b/.github/workflows/close-stale.yml @@ -7,7 +7,7 @@ name: "Close stale issues" on: schedule: - - cron: "0 1 * * *" + - cron: "22 1 * * *" jobs: stale: @@ -20,3 +20,4 @@ jobs: days-before-stale: 30 days-before-close: 5 stale-issue-label: 'stale-closing-soon' + exempt-issue-labels: 'T: Feature Request' diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml index e3303e8c6e2b..a57e63d2a81e 100644 --- a/.github/workflows/lock-closed.yml +++ b/.github/workflows/lock-closed.yml @@ -3,16 +3,26 @@ # Lock closed issues after a period of inactivity # -name: "Lock closed issue" +name: 'Lock threads' on: - issues: - types: [closed] + schedule: + - cron: '59 * * * *' jobs: lock: runs-on: ubuntu-latest steps: - - uses: OSDKDev/lock-issues@v1.1 + - uses: dessant/lock-threads@v2 with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" + github-token: ${{ github.token }} + process-only: 'issues' + issue-lock-inactive-days: '60' + issue-exclude-created-before: '' + issue-exclude-labels: 'no-locking' + issue-lock-labels: '' + issue-lock-comment: > + This issue has been automatically locked since there + has not been any recent activity after it was closed. + Please open a new issue for related bugs. + issue-lock-reason: '' diff --git a/.github/workflows/unlock-reopened.yml b/.github/workflows/unlock-reopened.yml new file mode 100644 index 000000000000..45e4d713e8d9 --- /dev/null +++ b/.github/workflows/unlock-reopened.yml @@ -0,0 +1,18 @@ +# +# unlock-reopened.yml +# Unlock an issue whenever it is re-opened +# + +name: "Unlock reopened issue" + +on: + issues: + types: [reopened] + +jobs: + lock: + runs-on: ubuntu-latest + steps: + - uses: OSDKDev/unlock-issues@v1.1 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" From ed7110838e60379835d537e620006020fbae2513 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 2 Jul 2020 18:10:33 -0500 Subject: [PATCH 06/16] Patch Bad PR action --- .github/workflows/bad-target.md | 7 ------- .github/workflows/check-pr.yml | 21 +++++++++++++-------- 2 files changed, 13 insertions(+), 15 deletions(-) delete mode 100644 .github/workflows/bad-target.md diff --git a/.github/workflows/bad-target.md b/.github/workflows/bad-target.md deleted file mode 100644 index 048e56cfd189..000000000000 --- a/.github/workflows/bad-target.md +++ /dev/null @@ -1,7 +0,0 @@ -Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases. - -Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR. - -It may help to set your fork's default branch to `bugfix-2.0.x`. - -See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions. diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml index a6246a3786f5..744bdd20cf79 100644 --- a/.github/workflows/check-pr.yml +++ b/.github/workflows/check-pr.yml @@ -1,6 +1,6 @@ # -# comment-pr.yml -# Add a comment to any PR directed to a release branch +# check-pr.yml +# Close PRs directed at release branches # name: PR Bad Target @@ -19,9 +19,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - uses: harupy/comment-on-pr@master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - filename: bad-target.md + - uses: peter-evans/close-pull@v1 + with: + delete-branch: false + comment: > + Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases. + + Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR. + + It may help to set your fork's default branch to `bugfix-2.0.x`. + + See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions. From 7bf89f2b9f9e55b518d6b18841a860321711aaf1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 4 Jul 2020 17:28:23 -0500 Subject: [PATCH 07/16] Two lock-closed per day --- .github/workflows/lock-closed.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml index a57e63d2a81e..e500e9e8d272 100644 --- a/.github/workflows/lock-closed.yml +++ b/.github/workflows/lock-closed.yml @@ -7,7 +7,7 @@ name: 'Lock threads' on: schedule: - - cron: '59 * * * *' + - cron: '* */12 * * *' jobs: lock: From 481b8ff2d91d8c1fb66ed3975a3a054c81b77425 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 5 Jul 2020 15:23:07 -0500 Subject: [PATCH 08/16] Limit actions to main --- .github/workflows/bump-date.yml | 3 ++- .github/workflows/check-pr.yml | 3 ++- .github/workflows/close-stale.yml | 6 +++++- .github/workflows/lock-closed.yml | 6 +++++- .github/workflows/test-builds.yml | 2 ++ .github/workflows/unlock-reopened.yml | 6 +++++- 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bump-date.yml b/.github/workflows/bump-date.yml index ecf4a4f0ecba..54902da8c908 100644 --- a/.github/workflows/bump-date.yml +++ b/.github/workflows/bump-date.yml @@ -11,6 +11,8 @@ on: jobs: bump_date: + name: Bump Distribution Date + if: github.repository == 'MarlinFirmware/Marlin' runs-on: ubuntu-latest @@ -24,7 +26,6 @@ jobs: - name: Bump Distribution Date run: | # Inline Bump Script - [[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0 DIST=$( date +"%Y-%m-%d" ) eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \ git config user.name "${GITHUB_ACTOR}" && \ diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml index 744bdd20cf79..aa4a2c59c9a4 100644 --- a/.github/workflows/check-pr.yml +++ b/.github/workflows/check-pr.yml @@ -14,8 +14,9 @@ on: jobs: bad_target: - name: PR Bad Target + if: github.repository == 'MarlinFirmware/Marlin' + runs-on: ubuntu-latest steps: diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml index fae13f3a93b3..083e844e9040 100644 --- a/.github/workflows/close-stale.yml +++ b/.github/workflows/close-stale.yml @@ -3,7 +3,7 @@ # Close open issues after a period of inactivity # -name: "Close stale issues" +name: Close Stale Issues on: schedule: @@ -11,7 +11,11 @@ on: jobs: stale: + name: Close Stale Issues + if: github.repository == 'MarlinFirmware/Marlin' + runs-on: ubuntu-latest + steps: - uses: actions/stale@v3 with: diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml index e500e9e8d272..8420fdc0e4d7 100644 --- a/.github/workflows/lock-closed.yml +++ b/.github/workflows/lock-closed.yml @@ -3,7 +3,7 @@ # Lock closed issues after a period of inactivity # -name: 'Lock threads' +name: Lock Closed Issues on: schedule: @@ -11,7 +11,11 @@ on: jobs: lock: + name: Lock Closed Issues + if: github.repository == 'MarlinFirmware/Marlin' + runs-on: ubuntu-latest + steps: - uses: dessant/lock-threads@v2 with: diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml index ebdd60b2d18d..60f9a48c5b59 100644 --- a/.github/workflows/test-builds.yml +++ b/.github/workflows/test-builds.yml @@ -17,6 +17,8 @@ on: jobs: test_builds: + name: Run All Tests + if: github.repository == 'MarlinFirmware/Marlin' runs-on: ubuntu-latest diff --git a/.github/workflows/unlock-reopened.yml b/.github/workflows/unlock-reopened.yml index 45e4d713e8d9..614ef3fab297 100644 --- a/.github/workflows/unlock-reopened.yml +++ b/.github/workflows/unlock-reopened.yml @@ -10,8 +10,12 @@ on: types: [reopened] jobs: - lock: + unlock: + name: Unlock Reopened + if: github.repository == 'MarlinFirmware/Marlin' + runs-on: ubuntu-latest + steps: - uses: OSDKDev/unlock-issues@v1.1 with: From 697ef2636e561f89d941b5c1e1f6a76c7868eabf Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 5 Jul 2020 15:45:14 -0500 Subject: [PATCH 09/16] Add CI for pushed commits Co-Authored-By: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com> --- .github/workflows/test-builds.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml index 60f9a48c5b59..54c0de98ee46 100644 --- a/.github/workflows/test-builds.yml +++ b/.github/workflows/test-builds.yml @@ -14,6 +14,14 @@ on: - data/** - docs/** - '**/*.md' + push: + branches: + - bugfix-2.0.x + paths-ignore: + - config/** + - data/** + - docs/** + - '**/*.md' jobs: test_builds: From ee4910c5d7e1ef66afb5a99eb9f1a6b6f6255a9a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 5 Jul 2020 19:56:33 -0500 Subject: [PATCH 10/16] Temporarily use patched lock-threads --- .github/workflows/lock-closed.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml index 8420fdc0e4d7..f5992d520baa 100644 --- a/.github/workflows/lock-closed.yml +++ b/.github/workflows/lock-closed.yml @@ -7,7 +7,7 @@ name: Lock Closed Issues on: schedule: - - cron: '* */12 * * *' + - cron: '0 1/13 * * *' jobs: lock: @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: dessant/lock-threads@v2 + - uses: netniV/lock-threads@patch-1 with: github-token: ${{ github.token }} process-only: 'issues' From 354a9e5970c4a873a5b32d825da177d072df6b61 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 8 Jul 2020 04:38:35 -0500 Subject: [PATCH 11/16] Lock threads updated --- .github/workflows/lock-closed.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml index f5992d520baa..8cdcd7a8369e 100644 --- a/.github/workflows/lock-closed.yml +++ b/.github/workflows/lock-closed.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: netniV/lock-threads@patch-1 + - uses: dessant/lock-threads@v2 with: github-token: ${{ github.token }} process-only: 'issues' From 5513e67512481024e0d571d84487f7c636996803 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 8 Jul 2020 19:36:09 -0500 Subject: [PATCH 12/16] 2.0.5.4 : Use ststm32 < 6.2 --- Marlin/Version.h | 4 +-- Marlin/src/inc/Version.h | 4 +-- platformio.ini | 62 ++++++++++++++++++++-------------------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Marlin/Version.h b/Marlin/Version.h index b4e51841b38c..1f65f4d49c28 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -//#define SHORT_BUILD_VERSION "2.0.5.3" +//#define SHORT_BUILD_VERSION "2.0.5.4" /** * Verbose version identifier which should contain a reference to the location @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2020-01-31" +//#define STRING_DISTRIBUTION_DATE "2020-07-09" /** * Defines a generic printer name to be output to the LCD after booting Marlin. diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index a5960c16b21c..33d867acac09 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -25,7 +25,7 @@ * Release version. Leave the Marlin version or apply a custom scheme. */ #ifndef SHORT_BUILD_VERSION - #define SHORT_BUILD_VERSION "2.0.5.3" + #define SHORT_BUILD_VERSION "2.0.5.4" #endif /** @@ -42,7 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2020-03-31" + #define STRING_DISTRIBUTION_DATE "2020-07-09" #endif /** diff --git a/platformio.ini b/platformio.ini index f578ff8646a8..9e41afa326d7 100644 --- a/platformio.ini +++ b/platformio.ini @@ -249,7 +249,7 @@ lib_deps = Servo # STM32F103RC # [env:STM32F103RC] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103RC platform_packages = tool-stm32duino build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py @@ -265,7 +265,7 @@ monitor_speed = 115200 # STM32F103RC_fysetc # [env:STM32F103RC_fysetc] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103RC #board_build.core = maple platform_packages = tool-stm32duino @@ -291,7 +291,7 @@ upload_protocol = serial # [env:STM32F103RC_btt] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103RC platform_packages = tool-stm32duino build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py @@ -306,7 +306,7 @@ lib_ignore = Adafruit NeoPixel, SPI monitor_speed = 115200 [env:STM32F103RC_btt_USB] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103RC platform_packages = tool-stm32duino build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py @@ -321,7 +321,7 @@ lib_ignore = Adafruit NeoPixel, SPI monitor_speed = 115200 [env:STM32F103RC_btt_512K] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103RC board_upload.maximum_size=524288 platform_packages = tool-stm32duino @@ -337,7 +337,7 @@ lib_ignore = Adafruit NeoPixel, SPI monitor_speed = 115200 [env:STM32F103RC_btt_512K_USB] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103RC board_upload.maximum_size=524288 platform_packages = tool-stm32duino @@ -356,7 +356,7 @@ monitor_speed = 115200 # STM32F103RE # [env:STM32F103RE] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103RE platform_packages = tool-stm32duino build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py @@ -373,7 +373,7 @@ monitor_speed = 115200 # STM32F103RE_btt_USB ......... RET6 (USB mass storage) # [env:STM32F103RE_btt] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103RE platform_packages = tool-stm32duino build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py @@ -389,7 +389,7 @@ upload_protocol = stlink monitor_speed = 115200 [env:STM32F103RE_btt_USB] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103RE platform_packages = tool-stm32duino build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py @@ -408,7 +408,7 @@ monitor_speed = 115200 # STM32F4 with STM32GENERIC # [env:STM32F4] -platform = ststm32 +platform = ststm32@<6.2.0 board = disco_f407vg build_flags = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F4 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED lib_ignore = Adafruit NeoPixel, TMCStepper @@ -418,7 +418,7 @@ src_filter = ${common.default_src_filter} + - - # Geeetech GTM32 (STM32F103VET6) # [env:STM32F103VE_GTM32] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103VE build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py ${common.build_flags} -DDEBUG_LEVEL=DEBUG_NONE -std=gnu++14 -MMD -ffunction-sections -fdata-sections -nostdlib @@ -456,7 +456,7 @@ upload_protocol = serial # Longer 3D board in Alfawise U20 (STM32F103VET6) # [env:STM32F103VE_longer] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103VE build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py ${common.build_flags} -std=gnu++14 -USERIAL_USB @@ -470,7 +470,7 @@ lib_ignore = Adafruit NeoPixel, LiquidTWI2, SPI # MKS Robin Mini (STM32F103VET6) # [env:mks_robin_mini] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103VE build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py ${common.build_flags} -std=gnu++14 @@ -483,7 +483,7 @@ lib_ignore = Adafruit NeoPixel, SPI # MKS Robin Nano (STM32F103VET6) # [env:mks_robin_nano] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103VE platform_packages = tool-stm32duino build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py @@ -499,7 +499,7 @@ lib_ignore = Adafruit NeoPixel, SPI # MKS Robin (STM32F103ZET6) # [env:mks_robin] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103ZE build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_XL_DENSITY @@ -514,7 +514,7 @@ lib_ignore = Adafruit NeoPixel, SPI # MKS Robin Pro (STM32F103ZET6) # [env:mks_robin_pro] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103ZE extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_pro.py build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py @@ -528,7 +528,7 @@ lib_ignore = Adafruit NeoPixel, SPI, TMCStepper # MKS Robin Lite/Lite2 (STM32F103RCT6) # [env:mks_robin_lite] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103RC build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py ${common.build_flags} -std=gnu++14 @@ -541,7 +541,7 @@ lib_ignore = Adafruit NeoPixel, SPI # MKS ROBIN LITE3 (STM32F103RCT6) # [env:mks_robin_lite3] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103RC extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite3.py build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py @@ -555,7 +555,7 @@ lib_ignore = Adafruit NeoPixel, SPI # JGAurora A5S A1 (STM32F103ZET6) # [env:jgaurora_a5s_a1] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103ZE build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY @@ -568,7 +568,7 @@ lib_ignore = Adafruit NeoPixel, SPI # Malyan M200 (STM32F103CB) # [env:STM32F103CB_malyan] -platform = ststm32 +platform = ststm32@<6.2.0 board = malyanM200 build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__ @@ -579,7 +579,7 @@ lib_ignore = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-H # Chitu boards like Tronxy X5s (STM32F103ZET6) # [env:chitu_f103] -platform = ststm32 +platform = ststm32@<6.2.0 board = genericSTM32F103ZE build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY @@ -593,7 +593,7 @@ lib_ignore = Adafruit NeoPixel # 'STEVAL-3DP001V1' STM32F401VE board - https://www.st.com/en/evaluation-tools/steval-3dp001v1.html # [env:STM32F401VE_STEVAL] -platform = ststm32 +platform = ststm32@<6.2.0 board = STEVAL_STM32F401VE platform_packages = framework-arduinoststm32@>=3.107,<4 build_flags = ${common.build_flags} @@ -611,7 +611,7 @@ src_filter = ${common.default_src_filter} + # FLYF407ZG # [env:FLYF407ZG] -platform = ststm32 +platform = ststm32@<6.2.0 board = FLYF407ZG platform_packages = framework-arduinoststm32@>=3.107,<4 build_flags = ${common.build_flags} @@ -628,7 +628,7 @@ src_filter = ${common.default_src_filter} + # FYSETC S6 (STM32F446VET6 ARM Cortex-M4) # [env:FYSETC_S6] -platform = ststm32 +platform = ststm32@<6.2.0 board = fysetc_s6 platform_packages = tool-stm32duino @@ -651,7 +651,7 @@ upload_protocol = serial # Shield - https://github.com/jmz52/Hardware # [env:STM32F407VE_black] -platform = ststm32 +platform = ststm32@<6.2.0 board = blackSTM32F407VET6 platform_packages = framework-arduinoststm32@>=3.107,<4 build_flags = ${common.build_flags} @@ -667,7 +667,7 @@ src_filter = ${common.default_src_filter} + # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4) # [env:BIGTREE_SKR_PRO] -platform = ststm32 +platform = ststm32@<6.2.0 board = BigTree_SKR_Pro platform_packages = framework-arduinoststm32@>=3.107,<4 build_flags = ${common.build_flags} @@ -687,7 +687,7 @@ debug_init_break = # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4) # [env:BIGTREE_GTR_V1_0] -platform = ststm32@>=5.7.0 +platform = ststm32@>=5.7.0,<6.2.0 framework = arduino platform_packages = framework-arduinoststm32@>=3.107,<4 board = BigTree_SKR_Pro @@ -799,7 +799,7 @@ debug_tool = jlink # RUMBA32 # [env:rumba32_f446ve] -platform = ststm32 +platform = ststm32@<6.2.0 board = rumba32_f446ve build_flags = ${common.build_flags} -DSTM32F4xx @@ -825,7 +825,7 @@ upload_protocol = dfu # MKS RUMBA32 (adds TMC2208/2209 UART interface and AUX-1) # [env:rumba32_mks] -platform = ststm32 +platform = ststm32@<6.2.0 board = rumba32_f446ve build_flags = ${common.build_flags} -DSTM32F4xx -DARDUINO_RUMBA32_F446VE -DARDUINO_ARCH_STM32 "-DBOARD_NAME=\"RUMBA32_F446VE\"" From 5e0958edbf8abab0588ed9db866952f67c2dd4fc Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 11 Jul 2020 07:14:54 -0500 Subject: [PATCH 13/16] Fix pid_debug_flag --- Marlin/src/module/temperature.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp index 4018c7586c74..dfb905bc062c 100644 --- a/Marlin/src/module/temperature.cpp +++ b/Marlin/src/module/temperature.cpp @@ -831,7 +831,7 @@ void Temperature::min_temp_error(const heater_ind_t heater) { #if HOTENDS #if ENABLED(PID_DEBUG) - extern bool PID_Debug_Flag; + extern bool pid_debug_flag; #endif float Temperature::get_pid_output_hotend(const uint8_t E_NAME) { @@ -914,7 +914,7 @@ void Temperature::min_temp_error(const heater_ind_t heater) { #endif // PID_OPENLOOP #if ENABLED(PID_DEBUG) - if (ee == active_extruder && PID_Debug_Flag) { + if (ee == active_extruder && pid_debug_flag) { SERIAL_ECHO_START(); SERIAL_ECHOPAIR(STR_PID_DEBUG, ee, STR_PID_DEBUG_INPUT, temp_hotend[ee].celsius, STR_PID_DEBUG_OUTPUT, pid_output); #if DISABLED(PID_OPENLOOP) From c1b237920430c0944df9db6c9050977211745820 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 11 Jul 2020 07:38:19 -0500 Subject: [PATCH 14/16] Specify supported library versions --- platformio.ini | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/platformio.ini b/platformio.ini index 9e41afa326d7..eb24dff43188 100644 --- a/platformio.ini +++ b/platformio.ini @@ -25,16 +25,16 @@ default_src_filter = + - - + extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants lib_deps = - LiquidCrystal - TMCStepper@>=0.6.2,<1.0.0 - Adafruit NeoPixel - U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip - Adafruit_MAX31865=https://github.com/adafruit/Adafruit_MAX31865/archive/master.zip - LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip - Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/0.8.0.zip + LiquidCrystal@1.5.0 + TMCStepper@~0.7.1 + Adafruit NeoPixel@1.5.0 + U8glib-HAL@0.4.1 + Adafruit MAX31865 library@~1.1.0 + LiquidTWI2@1.2.7 + Arduino-L6470@0.8.0 + SlowSoftI2CMaster SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip SailfishRGB_LED=https://github.com/mikeshub/SailfishRGB_LED/archive/master.zip - SlowSoftI2CMaster=https://github.com/mikeshub/SlowSoftI2CMaster/archive/master.zip # Globally defined properties # inherited by all environments @@ -221,10 +221,10 @@ lib_compat_mode = strict extra_scripts = Marlin/src/HAL/LPC1768/upload_extra_script.py src_filter = ${common.default_src_filter} + lib_deps = Servo - LiquidCrystal - U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip - TMCStepper@>=0.6.1,<1.0.0 - Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/release.zip + LiquidCrystal@1.5.0 + U8glib-HAL@0.4.1 + TMCStepper@~0.7.1 + Adafruit NeoPixel@1.5.0 SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip [env:LPC1769] @@ -239,10 +239,10 @@ lib_compat_mode = strict extra_scripts = Marlin/src/HAL/LPC1768/upload_extra_script.py src_filter = ${common.default_src_filter} + lib_deps = Servo - LiquidCrystal - U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip - TMCStepper@>=0.6.1,<1.0.0 - Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/release.zip + LiquidCrystal@1.5.0 + U8glib-HAL@0.4.1 + TMCStepper@~0.7.1 + Adafruit NeoPixel@1.5.0 SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip # @@ -697,12 +697,12 @@ build_flags = ${common.build_flags} -DTARGET_STM32F4 -DSTM32F407IX -DVECT_TAB_OFFSET=0x8000 -IMarlin/src/HAL/STM32 lib_deps = - U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip - LiquidCrystal - TMCStepper@>=0.5.2,<1.0.0 - Adafruit NeoPixel - LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip - Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/0.7.0.zip + U8glib-HAL@0.4.1 + LiquidCrystal@1.5.0 + TMCStepper@~0.7.1 + Adafruit NeoPixel@1.5.0 + LiquidTWI2@1.2.7 + Arduino-L6470@0.8.0 lib_ignore = SoftwareSerial, SoftwareSerialM src_filter = ${common.default_src_filter} + monitor_speed = 250000 From 7ed66d06a086d326c77fa4ae968167dda5ec5e17 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 12 Jul 2020 22:35:13 -0500 Subject: [PATCH 15/16] LiquidCrystal@1.0.0 for LPC --- platformio.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio.ini b/platformio.ini index eb24dff43188..1c00060e9dec 100644 --- a/platformio.ini +++ b/platformio.ini @@ -221,7 +221,7 @@ lib_compat_mode = strict extra_scripts = Marlin/src/HAL/LPC1768/upload_extra_script.py src_filter = ${common.default_src_filter} + lib_deps = Servo - LiquidCrystal@1.5.0 + LiquidCrystal@1.0.0 U8glib-HAL@0.4.1 TMCStepper@~0.7.1 Adafruit NeoPixel@1.5.0 @@ -239,7 +239,7 @@ lib_compat_mode = strict extra_scripts = Marlin/src/HAL/LPC1768/upload_extra_script.py src_filter = ${common.default_src_filter} + lib_deps = Servo - LiquidCrystal@1.5.0 + LiquidCrystal@1.0.0 U8glib-HAL@0.4.1 TMCStepper@~0.7.1 Adafruit NeoPixel@1.5.0 From b73ac40fa3abde7a10eb9d2708cd8d01b83d9de3 Mon Sep 17 00:00:00 2001 From: Chris Pepper Date: Tue, 14 Jul 2020 15:15:19 +0100 Subject: [PATCH 16/16] LPC fix NeoPixel fork --- platformio.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platformio.ini b/platformio.ini index 1c00060e9dec..702f52db0024 100644 --- a/platformio.ini +++ b/platformio.ini @@ -224,7 +224,7 @@ lib_deps = Servo LiquidCrystal@1.0.0 U8glib-HAL@0.4.1 TMCStepper@~0.7.1 - Adafruit NeoPixel@1.5.0 + Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip [env:LPC1769] @@ -242,7 +242,7 @@ lib_deps = Servo LiquidCrystal@1.0.0 U8glib-HAL@0.4.1 TMCStepper@~0.7.1 - Adafruit NeoPixel@1.5.0 + Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip #