Skip to content

Commit

Permalink
Merge branch '2.0.x' into Ender.4.SKR.1.4.Turbo
Browse files Browse the repository at this point in the history
* 2.0.x: (237 commits)
  Set "lcd_move_e" index to fix the label (MarlinFirmware#20263)
  Fix bad SET_FAST_PWM_FREQ calls (MarlinFirmware#20227)
  Fix extraneous Linear Advance DIR change (MarlinFirmware#20131)
  Fix bilinear_line_to_destination definition
  Update "Bug Report" template (MarlinFirmware#19906)
  Marlin 2.0.7.2
  Fix SAMD Serial name macro (MarlinFirmware#19765)
  Fix HAL/STM32 FastIO for analog pins (MarlinFirmware#19735)
  Don't define IS_ULTIPANEL empty
  Add NUCLEO-F767ZI dev board (MarlinFirmware#19373)
  If needed, home before G34 (MarlinFirmware#19713)
  TFT followup fixes (MarlinFirmware#19710)
  Watchdog Refresh for LVGL Asset Load (MarlinFirmware#19724)
  Fix mega2560ext environment (MarlinFirmware#19730)
  [cron] Bump distribution date (2020-10-15)
  [cron] Bump distribution date (2020-10-14)
  Fix SET_SOFT_ENDSTOP_LOOSE w/out soft endstops (MarlinFirmware#19734)
  Simple bool in soft_endstops_t
  [cron] Bump distribution date (2020-10-13)
  [cron] Bump distribution date (2020-10-12)
  ...

# Conflicts:
#	Marlin/Configuration.h
#	Marlin/Configuration_adv.h
#	platformio.ini
  • Loading branch information
davidveg committed Nov 29, 2020
2 parents d5c125a + 5a3573c commit 96ec735
Show file tree
Hide file tree
Showing 835 changed files with 53,251 additions and 18,068 deletions.
36 changes: 26 additions & 10 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,51 @@ assignees: ''

<!--
Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md
Please follow the instructions below. Failure to do so may result in your issue being closed.
Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use one of the support links at https://github.com/MarlinFirmware/Marlin/issues/new/choose
### Before Reporting a Bug
Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
1. Test with the `bugfix-2.0.x` branch to see whether the issue still exists.
2. Get troubleshooting help from the Marlin community to confirm it's a bug and not just a configuration error. Links at https://github.com/MarlinFirmware/Marlin/issues/new/choose
### Instructions
1. Fill out every section of the template below.
2. Always attach configuration files, regardless of whether you think they are involved.
3. Read and understand Marlin's Code of Conduct. By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md
-->

### Bug Description

<!-- Description of the bug -->
<!-- Describe the bug in this section. (You can remove this invisible comment.) -->

### Configuration Files

### My Configurations
**Required:** Include a ZIP file containing `Configuration.h` and `Configuration_adv.h`.

**Required:** Please include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
If you've made any other modifications describe them in detail here.

### Steps to Reproduce

<!-- Please describe the steps needed to reproduce the issue -->
<!-- Describe the steps needed to reproduce the issue. (You can remove this invisible comment.) -->

1. [First Step]
2. [Second Step]
3. [and so on...]

**Expected behavior:** [What you expect to happen]
**Expected behavior:**

<!-- Describe what you expected to happen here. (You can remove this invisible comment.) -->

**Actual behavior:**

**Actual behavior:** [What actually happens]
<!-- Describe what actually happens here. (You can remove this invisible comment.) -->

#### Additional Information

* Provide pictures or links to videos that clearly demonstrate the issue.
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.
* See [Contributing to Marlin](https://github.com/MarlinFirmware/Marlin/blob/2.0.x/.github/contributing.md) for additional guidelines.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Feature request
about: Request a Feature
title: "[FR] (feature request title)"
labels: ''
labels: 'T: Feature Request'
assignees: ''

---
Expand Down
30 changes: 3 additions & 27 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,11 @@
<!--
# NO SUPPORT REQUESTS PLEASE

Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/code_of_conduct.md
Do you want to ask a question? Are you looking for support? Please don't post here. Support Requests posted here will be automatically closed!

Do you want to ask a question? Are you looking for support? Please don't post here. Instead use one of the following options:
Instead use one of the following options:

- The Marlin Firmware forum at https://reprap.org/forum/list.php?415
- The MarlinFirmware Facebook Group at https://www.facebook.com/groups/1049718498464482/
- The MarlinFirmware Discord Server at https://discord.gg/n5NJ59y.

Before filing an issue be sure to test the latest "bugfix" branch to see whether the issue is already addressed.
-->

### Description

<!-- Description of the bug or requested feature -->

### Steps to Reproduce

<!-- If this is a Bug Report, please describe the steps needed to reproduce the issue -->

1. [First Step]
2. [Second Step]
3. [and so on...]

**Expected behavior:** [What you expect to happen]

**Actual behavior:** [What actually happens]

#### Additional Information

* Include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
* Provide pictures or links to videos that clearly demonstrate the issue.
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.
7 changes: 0 additions & 7 deletions .github/workflows/bad-target.md

This file was deleted.

3 changes: 2 additions & 1 deletion .github/workflows/bump-date.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ on:

jobs:
bump_date:
name: Bump Distribution Date
if: github.repository == 'MarlinFirmware/Marlin'

runs-on: ubuntu-latest

Expand All @@ -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}" && \
Expand Down
24 changes: 15 additions & 9 deletions .github/workflows/check-pr.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -14,14 +14,20 @@ on:

jobs:
bad_target:

name: PR Bad Target
if: github.repository == 'MarlinFirmware/Marlin'

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.
27 changes: 27 additions & 0 deletions .github/workflows/close-stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#
# close-stale.yml
# Close open issues after a period of inactivity
#

name: Close Stale Issues

on:
schedule:
- cron: "22 1 * * *"

jobs:
stale:
name: Close Stale Issues
if: github.repository == 'MarlinFirmware/Marlin'

runs-on: ubuntu-latest

steps:
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue has had no activity in the last 30 days. Please add a reply if you want to keep this issue active, otherwise it will be automatically closed within 7 days.'
days-before-stale: 30
days-before-close: 7
stale-issue-label: 'stale-closing-soon'
exempt-issue-labels: 'T: Feature Request'
32 changes: 32 additions & 0 deletions .github/workflows/lock-closed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#
# lock-closed.yml
# Lock closed issues after a period of inactivity
#

name: Lock Closed Issues

on:
schedule:
- cron: '0 1/13 * * *'

jobs:
lock:
name: Lock Closed Issues
if: github.repository == 'MarlinFirmware/Marlin'

runs-on: ubuntu-latest

steps:
- uses: dessant/lock-threads@v2
with:
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: ''
1 change: 1 addition & 0 deletions .github/workflows/test-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:
- mega2560
- teensy31
- teensy35
- teensy41
- SAMD51_grandcentral_m4

# Extended AVR Environments
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/unlock-reopened.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#
# unlock-reopened.yml
# Unlock an issue whenever it is re-opened
#

name: "Unlock reopened issue"

on:
issues:
types: [reopened]

jobs:
unlock:
name: Unlock Reopened
if: github.repository == 'MarlinFirmware/Marlin'

runs-on: ubuntu-latest

steps:
- uses: OSDKDev/unlock-issues@v1.1
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
Loading

0 comments on commit 96ec735

Please sign in to comment.