andrey1s
2 years ago
1886 changed files with 181032 additions and 92287 deletions
@ -1,3 +0,0 @@ |
|||
github: [thinkyhead] |
|||
patreon: thinkyhead |
|||
custom: ["https://www.thinkyhead.com/donate-to-marlin"] |
|||
@ -1,157 +0,0 @@ |
|||
name: 🪲 Report a bug |
|||
description: Create a bug report to help improve Marlin Firmware |
|||
title: "[BUG] (bug summary)" |
|||
body: |
|||
- type: markdown |
|||
attributes: |
|||
value: > |
|||
Do you want to ask a question? Are you looking for support? Please use one of the [support links](https://github.com/MarlinFirmware/Marlin/issues/new/choose). |
|||
|
|||
- type: markdown |
|||
attributes: |
|||
value: | |
|||
**Thank you for reporting a bug in Marlin Firmware!** |
|||
|
|||
## Before Reporting a Bug |
|||
|
|||
- Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect. |
|||
|
|||
- Test with the [`bugfix-2.0.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip) to see whether the issue still exists. |
|||
|
|||
## Instructions |
|||
|
|||
Please follow the instructions below. Failure to do so may result in your issue being closed. See [Contributing to Marlin](https://github.com/MarlinFirmware/Marlin/blob/2.0.x/.github/contributing.md) for additional guidelines. |
|||
|
|||
1. Provide a good title starting with [BUG]. |
|||
2. Fill out all sections of this bug report form. |
|||
3. Always attach configuration files so we can build and test your setup. |
|||
|
|||
- type: dropdown |
|||
attributes: |
|||
label: Did you test the latest `bugfix-2.0.x` code? |
|||
description: >- |
|||
Always try the latest code to make sure the issue you are reporting is not already fixed. To download |
|||
the latest code just [click this link](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip). |
|||
options: |
|||
- Yes, and the problem still exists. |
|||
- No, but I will test it now! |
|||
validations: |
|||
required: true |
|||
|
|||
- type: markdown |
|||
attributes: |
|||
value: | |
|||
# Bug Details |
|||
|
|||
- type: textarea |
|||
attributes: |
|||
label: Bug Description |
|||
description: >- |
|||
Describe the bug in this section. Tell us what you were trying to do and what |
|||
happened that you did not expect. Provide a clear and concise description of the |
|||
problem and include as many details as possible. |
|||
placeholder: | |
|||
Marlin doesn't work. |
|||
validations: |
|||
required: true |
|||
|
|||
- type: input |
|||
attributes: |
|||
label: Bug Timeline |
|||
description: Is this a new bug or an old issue? When did it first start? |
|||
|
|||
- type: textarea |
|||
attributes: |
|||
label: Expected behavior |
|||
description: >- |
|||
What did you expect to happen? |
|||
placeholder: I expected it to move left. |
|||
|
|||
- type: textarea |
|||
attributes: |
|||
label: Actual behavior |
|||
description: What actually happened instead? |
|||
placeholder: It moved right instead of left. |
|||
|
|||
- type: textarea |
|||
attributes: |
|||
label: Steps to Reproduce |
|||
description: >- |
|||
Please describe the steps needed to reproduce the issue. |
|||
placeholder: | |
|||
1. [First Step] ... |
|||
2. [Second Step] ... |
|||
3. [and so on] ... |
|||
|
|||
- type: markdown |
|||
attributes: |
|||
value: | |
|||
# Your Setup |
|||
|
|||
- type: input |
|||
attributes: |
|||
label: Version of Marlin Firmware |
|||
description: "See the About Menu on the LCD or the output of `M115`. NOTE: For older releases we only patch critical bugs." |
|||
validations: |
|||
required: true |
|||
|
|||
- type: input |
|||
attributes: |
|||
label: Printer model |
|||
description: Creality Ender 3, Prusa mini, or Kossel Delta? |
|||
|
|||
- type: input |
|||
attributes: |
|||
label: Electronics |
|||
description: Stock electronics, upgrade board, or something else? |
|||
|
|||
- type: input |
|||
attributes: |
|||
label: Add-ons |
|||
description: Please list any hardware add-ons that could be involved. |
|||
|
|||
- type: dropdown |
|||
attributes: |
|||
label: Your Slicer |
|||
description: Do you use Slic3r, Prusa Slicer, Simplify3D, IdeaMaker...? |
|||
options: |
|||
- Slic3r |
|||
- Simplify3D |
|||
- Prusa Slicer |
|||
- IdeaMaker |
|||
- Cura |
|||
- Other (explain below) |
|||
|
|||
- type: dropdown |
|||
attributes: |
|||
label: Host Software |
|||
description: Do you use OctoPrint, Repetier Host, Pronterface...? |
|||
options: |
|||
- SD Card (headless) |
|||
- Repetier Host |
|||
- OctoPrint |
|||
- Pronterface |
|||
- Cura |
|||
- Same as my slicer |
|||
- Other (explain below) |
|||
|
|||
- type: markdown |
|||
attributes: |
|||
value: >- |
|||
## Other things to include |
|||
|
|||
Please also be sure to include these items to help with troubleshooting: |
|||
|
|||
* **A ZIP file** containing your `Configuration.h` and `Configuration_adv.h`. |
|||
(Please don't paste lengthy configuration text here.) |
|||
* **Log output** from the host. (`M111 S247` for maximum logging.) |
|||
* **Images or videos** demonstrating the problem, if it helps to make it clear. |
|||
* **A G-Code file** that exposes the problem, if not affecting _all_ G-code. |
|||
|
|||
If you've made any other modifications to the firmware, please describe them in detail in the space provided. |
|||
|
|||
When pasting formatted text into the box below don't forget to put ` ``` ` (on its own line) before and after to make it readable. |
|||
|
|||
- type: textarea |
|||
attributes: |
|||
label: Additional information & file uploads |
|||
@ -1,20 +0,0 @@ |
|||
blank_issues_enabled: false |
|||
contact_links: |
|||
- name: 📖 Marlin Documentation |
|||
url: http://marlinfw.org/ |
|||
about: Lots of documentation on installing and using Marlin. |
|||
- name: 👤 MarlinFirmware Facebook group |
|||
url: https://www.facebook.com/groups/1049718498464482 |
|||
about: Please ask and answer questions here. |
|||
- name: 🕹 Marlin on Discord |
|||
url: https://discord.gg/n5NJ59y |
|||
about: Join the Discord server for support and discussion. |
|||
- name: 🔗 Marlin Discussion Forum |
|||
url: http://forums.reprap.org/list.php?415 |
|||
about: A searchable web forum hosted by RepRap dot org. |
|||
- name: 📺 Marlin Videos on YouTube |
|||
url: https://www.youtube.com/results?search_query=marlin+firmware |
|||
about: Tutorials and more from Marlin users all around the world. Great for new users! |
|||
- name: 💸 Want to donate? |
|||
url: https://www.thinkyhead.com/donate-to-marlin |
|||
about: Please take a look at the various options to support Marlin Firmware's development financially! |
|||
@ -1,44 +0,0 @@ |
|||
name: ✨ Request a feature |
|||
description: Request a new Marlin Firmware feature |
|||
title: "[FR] (feature summary)" |
|||
labels: 'T: Feature Request' |
|||
body: |
|||
- type: markdown |
|||
attributes: |
|||
value: > |
|||
Do you want to ask a question? Are you looking for support? Please use one of the [support links](https://github.com/MarlinFirmware/Marlin/issues/new/choose). |
|||
|
|||
- type: markdown |
|||
attributes: |
|||
value: > |
|||
**Thank you for requesting a new Marlin Firmware feature!** |
|||
|
|||
## Before Requesting a Feature |
|||
|
|||
- Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect. |
|||
|
|||
- Check the latest [`bugfix-2.0.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip) to see if the feature already exists. |
|||
|
|||
- Before you proceed with your request, please consider if it is necessary to make it into a firmware feature, or if it may be better suited for a slicer or host feature. |
|||
|
|||
- type: textarea |
|||
attributes: |
|||
label: Is your feature request related to a problem? Please describe. |
|||
description: A clear description of the problem (e.g., "I need X but Marlin can't do it [...]"). |
|||
|
|||
- type: textarea |
|||
attributes: |
|||
label: Are you looking for hardware support? |
|||
description: Tell us the printer, board, or peripheral that needs support. |
|||
|
|||
- type: textarea |
|||
attributes: |
|||
label: Describe the feature you want |
|||
description: A clear description of the feature and how you think it should work. |
|||
validations: |
|||
required: true |
|||
|
|||
- type: textarea |
|||
attributes: |
|||
label: Additional context |
|||
description: Add any other context or screenshots about the feature request here. |
|||
@ -1,46 +0,0 @@ |
|||
# Contributor Covenant Code of Conduct |
|||
|
|||
## Our Pledge |
|||
|
|||
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. |
|||
|
|||
## Our Standards |
|||
|
|||
Examples of behavior that contributes to creating a positive environment include: |
|||
|
|||
* Using welcoming and inclusive language |
|||
* Being respectful of differing viewpoints and experiences |
|||
* Gracefully accepting constructive criticism |
|||
* Focusing on what is best for the community |
|||
* Showing empathy towards other community members |
|||
|
|||
Examples of unacceptable behavior by participants include: |
|||
|
|||
* The use of sexualized language or imagery and unwelcome sexual attention or advances |
|||
* Trolling, insulting/derogatory comments, and personal or political attacks |
|||
* Public or private harassment |
|||
* Publishing others' private information, such as a physical or electronic address, without explicit permission |
|||
* Other conduct which could reasonably be considered inappropriate in a professional setting |
|||
|
|||
## Our Responsibilities |
|||
|
|||
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. |
|||
|
|||
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. |
|||
|
|||
## Scope |
|||
|
|||
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. |
|||
|
|||
## Enforcement |
|||
|
|||
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [marlinfirmware@github.com](mailto:marlinfirmware@github.com). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. |
|||
|
|||
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. |
|||
|
|||
## Attribution |
|||
|
|||
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version] |
|||
|
|||
[homepage]: https://contributor-covenant.org |
|||
[version]: https://contributor-covenant.org/version/1/4/ |
|||
@ -1,143 +0,0 @@ |
|||
# Contributing to Marlin |
|||
|
|||
Thanks for your interest in contributing to Marlin Firmware! |
|||
|
|||
The following is a set of guidelines for contributing to Marlin, hosted by the [MarlinFirmware Organization](https://github.com/MarlinFirmware) on GitHub. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a Pull Request. |
|||
|
|||
#### Table Of Contents |
|||
|
|||
[Code of Conduct](#code-of-conduct) |
|||
|
|||
[I don't want to read this whole thing, I just have a question!!!](#i-dont-want-to-read-this-whole-thing-i-just-have-a-question) |
|||
|
|||
[How Can I Contribute?](#how-can-i-contribute) |
|||
* [Reporting Bugs](#reporting-bugs) |
|||
* [Suggesting Features or Changes](#suggesting-features-or-changes) |
|||
* [Your First Code Contribution](#your-first-code-contribution) |
|||
* [Pull Requests](#pull-requests) |
|||
|
|||
[Styleguides](#styleguides) |
|||
* [Git Commit Messages](#git-commit-messages) |
|||
* [C++ Coding Standards](#c++-coding-standards) |
|||
* [Documentation Styleguide](#documentation) |
|||
|
|||
[Additional Notes](#additional-notes) |
|||
* [Issue and Pull Request Labels](#issue-and-pull-request-labels) |
|||
|
|||
## Code of Conduct |
|||
|
|||
This project and everyone participating in it is governed by the [Marlin Code of Conduct](code_of_conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [marlinfirmware@github.com](mailto:marlinfirmware@github.com). |
|||
|
|||
## I don't want to read this whole thing I just have a question!!! |
|||
|
|||
> **Note:** Please don't file an issue to ask a question. You'll get faster results by using the resources below. |
|||
|
|||
We have a Message Board and a Facebook group where our knowledgable user community can provide helpful advice if you have questions. |
|||
|
|||
* [Marlin RepRap forum](https://reprap.org/forum/list.php?415) |
|||
* [MarlinFirmware on Facebook](https://www.facebook.com/groups/1049718498464482/) |
|||
|
|||
If chat is more your speed, you can join the MarlinFirmware Discord server: |
|||
|
|||
* Use the link https://discord.gg/n5NJ59y to join up as a General User. |
|||
* Even though our Discord is pretty active, it may take a while for community members to respond — please be patient! |
|||
* Use the `#general` channel for general questions or discussion about Marlin. |
|||
* Other channels exist for certain topics or are limited to Patrons. Check the channel list. |
|||
|
|||
## How Can I Contribute? |
|||
|
|||
### Reporting Bugs |
|||
|
|||
This section guides you through submitting a Bug Report for Marlin. Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports. |
|||
|
|||
Before creating a Bug Report, please test the "nightly" development branch, as you might find out that you don't need to create one. When you are creating a Bug Report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out [the required template](issue_template.md), the information it asks for helps us resolve issues faster. |
|||
|
|||
> **Note:** Regressions can happen. If you find a **Closed** issue that seems like your issue, go ahead and open a new issue and include a link to the original issue in the body of your new one. All you need to create a link is the issue number, preceded by #. For example, #8888. |
|||
|
|||
#### How Do I Submit A (Good) Bug Report? |
|||
|
|||
Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). Use the New Issue button to create an issue and provide the following information by filling in [the template](issue_template.md). |
|||
|
|||
Explain the problem and include additional details to help maintainers reproduce the problem: |
|||
|
|||
* **Use a clear and descriptive title** for the issue to identify the problem. |
|||
* **Describe the exact steps which reproduce the problem** in as many details as possible. For example, start by explaining how you started Marlin, e.g. which command exactly you used in the terminal, or how you started Marlin otherwise. When listing steps, **don't just say what you did, but explain how you did it**. For example, if you moved the cursor to the end of a line, explain if you used the mouse, or a keyboard shortcut or an Marlin command, and if so which one? |
|||
* **Provide specific examples to demonstrate the steps**. Include links to files or GitHub projects, or copy/pasteable snippets, which you use in those examples. If you're providing snippets or log output in the issue, use [Markdown code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines). |
|||
* **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior. |
|||
* **Explain which behavior you expected to see instead and why.** |
|||
* **Include detailed log output** especially for probing and leveling. See below for usage of `DEBUG_LEVELING_FEATURE`. |
|||
* **Include screenshots, links to videos, etc.** which clearly demonstrate the problem. |
|||
* **Include G-code** (if relevant) that reliably causes the problem to show itself. |
|||
* **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below. |
|||
|
|||
Provide more context: |
|||
|
|||
* **Can you reproduce the problem with a minimum of options enabled?** |
|||
* **Did the problem start happening recently** (e.g. after updating to a new version of Marlin) or was this always a problem? |
|||
* If the problem started happening recently, **can you reproduce the problem in an older version of Marlin?** What's the most recent version in which the problem doesn't happen? You can download older versions of Marlin from [the releases page](https://github.com/MarlinFirmware/Marlin/releases). |
|||
* **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens. |
|||
|
|||
Include details about your configuration and environment: |
|||
|
|||
* **Which version of Marlin are you using?** Marlin's exact version and build date can be seen in the startup message when a host connects to Marlin, or in the LCD Info menu (if enabled). |
|||
* **What kind of 3D Printer and electronics are you using**? |
|||
* **What kind of add-ons (probe, filament sensor) do you have**? |
|||
* **Include your Configuration files.** Make a ZIP file containing `Configuration.h` and `Configuration_adv.h` and drop it on your reply. |
|||
|
|||
### Suggesting Features or Changes |
|||
|
|||
This section guides you through submitting a suggestion for Marlin, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion and find related suggestions. |
|||
|
|||
Before creating a suggestion, please check [this list](#before-submitting-a-suggestion) as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-enhancement-suggestion). Fill in [the template](issue_template.md), including the steps that you imagine you would take if the feature you're requesting existed. |
|||
|
|||
#### Before Submitting a Feature Request |
|||
|
|||
* **Check the [Marlin website](https://marlinfw.org/)** for tips — you might discover that the feature is already included. Most importantly, check if you're using [the latest version of Marlin](https://github.com/MarlinFirmware/Marlin/releases) and if you can get the desired behavior by changing [Marlin's config settings](https://marlinfw.org/docs/configuration/configuration.html). |
|||
* **Perform a [cursory search](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aissue)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one. |
|||
|
|||
#### How Do I Submit A (Good) Feature Request? |
|||
|
|||
Feature Requests are tracked as [GitHub issues](https://guides.github.com/features/issues/). Please follow these guidelines in your request: |
|||
|
|||
* **Use a clear and descriptive title** for the issue to identify the suggestion. |
|||
* **Provide a step-by-step description of the requested feature** in as much detail as possible. |
|||
* **Provide specific examples to demonstrate the steps**. |
|||
* **Describe the current behavior** and **explain which behavior you expected to see instead** and why. |
|||
* **Include screenshots and links to videos** which demonstrate the feature or point out the part of Marlin to which the request is related. |
|||
* **Explain why this feature would be useful** to most Marlin users. |
|||
* **Name other firmwares that have this feature, if any.** |
|||
|
|||
### Your First Code Contribution |
|||
|
|||
Unsure where to begin contributing to Marlin? You can start by looking through these `good-first-issue` and `help-wanted` issues: |
|||
|
|||
* [Beginner issues][good-first-issue] - issues which should only require a few lines of code, and a test or two. |
|||
* [Help Wanted issues][help-wanted] - issues which should be a bit more involved than `beginner` issues. |
|||
|
|||
### Pull Requests |
|||
|
|||
Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x` and/or `bugfix-2.0.x`) and never to release branches (e.g., `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation. |
|||
|
|||
* Fill in [the required template](pull_request_template.md). |
|||
* Don't include issue numbers in the PR title. |
|||
* Include pictures, diagrams, and links to videos in your Pull Request to demonstrate your changes, if needed. |
|||
* Follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) posted on our website. |
|||
* Document new code with clear and concise comments. |
|||
* End all files with a newline. |
|||
|
|||
## Styleguides |
|||
|
|||
### Git Commit Messages |
|||
|
|||
* Use the present tense ("Add feature" not "Added feature"). |
|||
* Use the imperative mood ("Move cursor to..." not "Moves cursor to..."). |
|||
* Limit the first line to 72 characters or fewer. |
|||
* Reference issues and Pull Requests liberally after the first line. |
|||
|
|||
### C++ Coding Standards |
|||
|
|||
* Please read and follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) posted on our website. Failure to follow these guidelines will delay evaluation and acceptance of Pull Requests. |
|||
|
|||
### Documentation |
|||
|
|||
* Guidelines for documentation are still under development. In-general, be clear, concise, and to-the-point. |
|||
@ -1,35 +0,0 @@ |
|||
<!-- |
|||
|
|||
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. 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. |
|||
@ -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 |
|||
@ -1,33 +0,0 @@ |
|||
<!-- |
|||
|
|||
Submitting a Pull Request |
|||
|
|||
- Please fill out all sections of this form. You can delete the helpful comments. |
|||
- Pull Requests without clear information will take longer and may even be rejected. |
|||
- We get a high volume of submissions so please be patient during review. |
|||
|
|||
--> |
|||
|
|||
### Description |
|||
|
|||
<!-- |
|||
|
|||
Clearly describe the submitted changes with lots of details. Include images where helpful. Initial reviewers may not be familiar with the subject, so be as thorough as possible. You can use MarkDown syntax to improve readability with bullet lists, code blocks, and so on. PREVIEW and fix up formatting before submitting. |
|||
|
|||
--> |
|||
|
|||
### Requirements |
|||
|
|||
<!-- Does this PR require a specific board, LCD, etc.? --> |
|||
|
|||
### Benefits |
|||
|
|||
<!-- What does this PR fix or improve? --> |
|||
|
|||
### Configurations |
|||
|
|||
<!-- Attach Configurations ZIP and any other files needed to test this PR. --> |
|||
|
|||
### Related Issues |
|||
|
|||
<!-- Does this PR fix a bug or fulfill a Feature Request? Link related Issues here. --> |
|||
@ -1,35 +0,0 @@ |
|||
# |
|||
# bump-date.yml |
|||
# Bump the distribution date once per day |
|||
# |
|||
|
|||
name: Bump Distribution Date |
|||
|
|||
on: |
|||
schedule: |
|||
- cron: '0 0 * * *' |
|||
|
|||
jobs: |
|||
bump_date: |
|||
name: Bump Distribution Date |
|||
if: github.repository == 'MarlinFirmware/Marlin' |
|||
|
|||
runs-on: ubuntu-latest |
|||
|
|||
steps: |
|||
|
|||
- name: Check out bugfix-2.0.x |
|||
uses: actions/checkout@v2 |
|||
with: |
|||
ref: bugfix-2.0.x |
|||
|
|||
- name: Bump Distribution Date |
|||
run: | |
|||
# Inline Bump Script |
|||
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}" && \ |
|||
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \ |
|||
git add . && \ |
|||
git commit -m "[cron] Bump distribution date ($DIST)" && \ |
|||
git push |
|||
@ -1,32 +0,0 @@ |
|||
# |
|||
# check-pr.yml |
|||
# Close PRs directed at release branches |
|||
# |
|||
|
|||
name: PR Bad Target |
|||
|
|||
on: |
|||
pull_request: |
|||
branches: |
|||
- 1.0.x |
|||
- 1.1.x |
|||
- 2.0.x |
|||
|
|||
jobs: |
|||
bad_target: |
|||
name: PR Bad Target |
|||
if: github.repository == 'MarlinFirmware/Marlin' |
|||
|
|||
runs-on: ubuntu-latest |
|||
|
|||
steps: |
|||
- uses: superbrothers/close-pull-request@v3 |
|||
with: |
|||
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. |
|||
@ -1,39 +0,0 @@ |
|||
# |
|||
# clean-closed.yml |
|||
# Remove obsolete labels when an Issue or PR is closed |
|||
# |
|||
|
|||
name: Clean Closed |
|||
|
|||
on: |
|||
pull_request: |
|||
types: [closed] |
|||
issues: |
|||
types: [closed] |
|||
|
|||
jobs: |
|||
remove_label: |
|||
runs-on: ubuntu-latest |
|||
|
|||
strategy: |
|||
matrix: |
|||
label: |
|||
- "S: Don't Merge" |
|||
- "S: Hold for 2.1" |
|||
- "S: Please Merge" |
|||
- "S: Please Test" |
|||
- "help wanted" |
|||
- "Needs: Discussion" |
|||
- "Needs: Documentation" |
|||
- "Needs: More Data" |
|||
- "Needs: Patch" |
|||
- "Needs: Testing" |
|||
- "Needs: Work" |
|||
|
|||
steps: |
|||
- uses: actions/checkout@v2 |
|||
- name: Remove Labels |
|||
uses: actions-ecosystem/action-remove-labels@v1 |
|||
with: |
|||
github_token: ${{ github.token }} |
|||
labels: ${{ matrix.label }} |
|||
@ -1,28 +0,0 @@ |
|||
# |
|||
# 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 60 days. Please add a reply if you want to keep this issue active, otherwise it will be automatically closed within 10 days.' |
|||
days-before-stale: 60 |
|||
days-before-close: 10 |
|||
stale-issue-label: 'stale-closing-soon' |
|||
exempt-all-assignees: true |
|||
exempt-issue-labels: 'Bug: Confirmed !,T: Feature Request,Needs: Discussion,Needs: Documentation,Needs: More Data,Needs: Patch,Needs: Work,Needs: Testing,help wanted,no-locking' |
|||
@ -1,32 +0,0 @@ |
|||
# |
|||
# 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: '2017-07-01T00:00:00Z' |
|||
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,142 +0,0 @@ |
|||
# |
|||
# test-builds.yml |
|||
# Do test builds to catch compile errors |
|||
# |
|||
|
|||
name: CI |
|||
|
|||
on: |
|||
pull_request: |
|||
branches: |
|||
- bugfix-2.0.x |
|||
paths-ignore: |
|||
- config/** |
|||
- data/** |
|||
- docs/** |
|||
- '**/*.md' |
|||
push: |
|||
branches: |
|||
- bugfix-2.0.x |
|||
paths-ignore: |
|||
- config/** |
|||
- data/** |
|||
- docs/** |
|||
- '**/*.md' |
|||
|
|||
jobs: |
|||
test_builds: |
|||
name: Run All Tests |
|||
if: github.repository == 'MarlinFirmware/Marlin' |
|||
|
|||
runs-on: ubuntu-latest |
|||
|
|||
strategy: |
|||
matrix: |
|||
test-platform: |
|||
# Base Environments |
|||
|
|||
- DUE |
|||
- DUE_archim |
|||
- esp32 |
|||
- linux_native |
|||
- mega2560 |
|||
- at90usb1286_dfu |
|||
- teensy31 |
|||
- teensy35 |
|||
- teensy41 |
|||
- SAMD51_grandcentral_m4 |
|||
|
|||
# Extended AVR Environments |
|||
|
|||
- FYSETC_F6 |
|||
- mega1280 |
|||
- rambo |
|||
- sanguino1284p |
|||
- sanguino644p |
|||
|
|||
# STM32F1 (Maple) Environments |
|||
|
|||
#- STM32F103RC_btt_maple |
|||
- STM32F103RC_btt_USB_maple |
|||
- STM32F103RC_fysetc |
|||
- STM32F103RC_meeb |
|||
- jgaurora_a5s_a1 |
|||
- STM32F103VE_longer |
|||
#- mks_robin_maple |
|||
- mks_robin_lite |
|||
- mks_robin_pro |
|||
#- mks_robin_nano35_maple |
|||
#- STM32F103RET6_creality_maple |
|||
|
|||
# STM32 (ST) Environments |
|||
|
|||
- STM32F103RC_btt |
|||
#- STM32F103RC_btt_USB |
|||
- STM32F103RE_btt |
|||
- STM32F103RE_btt_USB |
|||
- STM32F103RET6_creality |
|||
- STM32F407VE_black |
|||
- STM32F401VE_STEVAL |
|||
- BIGTREE_BTT002 |
|||
- BIGTREE_SKR_PRO |
|||
- BIGTREE_GTR_V1_0 |
|||
- mks_robin |
|||
- ARMED |
|||
- FYSETC_S6 |
|||
- STM32F070CB_malyan |
|||
- STM32F070RB_malyan |
|||
- malyan_M300 |
|||
- FLYF407ZG |
|||
- rumba32 |
|||
- LERDGEX |
|||
- LERDGEK |
|||
- mks_robin_nano35 |
|||
- NUCLEO_F767ZI |
|||
- REMRAM_V1 |
|||
- BTT_SKR_SE_BX |
|||
- chitu_f103 |
|||
|
|||
# Put lengthy tests last |
|||
|
|||
- LPC1768 |
|||
- LPC1769 |
|||
|
|||
# Non-working environment tests |
|||
#- at90usb1286_cdc |
|||
#- STM32F103CB_malyan |
|||
#- STM32F103RE |
|||
#- mks_robin_mini |
|||
|
|||
steps: |
|||
|
|||
- name: Check out the PR |
|||
uses: actions/checkout@v2 |
|||
|
|||
- name: Cache pip |
|||
uses: actions/cache@v2 |
|||
with: |
|||
path: ~/.cache/pip |
|||
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }} |
|||
restore-keys: | |
|||
${{ runner.os }}-pip- |
|||
|
|||
- name: Cache PlatformIO |
|||
uses: actions/cache@v2 |
|||
with: |
|||
path: ~/.platformio |
|||
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }} |
|||
|
|||
- name: Select Python 3.7 |
|||
uses: actions/setup-python@v2 |
|||
with: |
|||
python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax. |
|||
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified |
|||
|
|||
- name: Install PlatformIO |
|||
run: | |
|||
pip install -U https://github.com/platformio/platformio-core/archive/develop.zip |
|||
platformio update |
|||
|
|||
- name: Run ${{ matrix.test-platform }} Tests |
|||
run: | |
|||
make tests-single-ci TEST_TARGET=${{ matrix.test-platform }} |
|||
@ -1,22 +0,0 @@ |
|||
# |
|||
# 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 }}" |
|||
@ -0,0 +1,8 @@ |
|||
{ |
|||
// See http://go.microsoft.com/fwlink/?LinkId=827846 |
|||
// for the documentation about the extensions.json format |
|||
"recommendations": [ |
|||
"marlinfirmware.auto-build", |
|||
"platformio.platformio-ide" |
|||
] |
|||
} |
|||
File diff suppressed because it is too large
File diff suppressed because it is too large
@ -0,0 +1,211 @@ |
|||
# |
|||
# Marlin Firmware |
|||
# config.ini - Options to apply before the build |
|||
# |
|||
[config:base] |
|||
ini_use_config = none |
|||
|
|||
# Load all config: sections in this file |
|||
;ini_use_config = all |
|||
# Load config file relative to Marlin/ |
|||
;ini_use_config = another.ini |
|||
# Download configurations from GitHub |
|||
;ini_use_config = example/Creality/Ender-5 Plus @ bugfix-2.1.x |
|||
# Download configurations from your server |
|||
;ini_use_config = https://me.myserver.com/path/to/configs |
|||
# Evaluate config:base and do a config dump |
|||
;ini_use_config = base |
|||
;config_export = 2 |
|||
|
|||
[config:minimal] |
|||
motherboard = BOARD_RAMPS_14_EFB |
|||
serial_port = 0 |
|||
baudrate = 250000 |
|||
|
|||
use_watchdog = on |
|||
thermal_protection_hotends = on |
|||
thermal_protection_hysteresis = 4 |
|||
thermal_protection_period = 40 |
|||
|
|||
bufsize = 4 |
|||
block_buffer_size = 16 |
|||
max_cmd_size = 96 |
|||
|
|||
extruders = 1 |
|||
temp_sensor_0 = 1 |
|||
|
|||
temp_hysteresis = 3 |
|||
heater_0_mintemp = 5 |
|||
heater_0_maxtemp = 275 |
|||
preheat_1_temp_hotend = 180 |
|||
|
|||
bang_max = 255 |
|||
pidtemp = on |
|||
pid_k1 = 0.95 |
|||
pid_max = BANG_MAX |
|||
pid_functional_range = 10 |
|||
|
|||
default_kp = 22.20 |
|||
default_ki = 1.08 |
|||
default_kd = 114.00 |
|||
|
|||
x_driver_type = A4988 |
|||
y_driver_type = A4988 |
|||
z_driver_type = A4988 |
|||
e0_driver_type = A4988 |
|||
|
|||
x_bed_size = 200 |
|||
x_min_pos = 0 |
|||
x_max_pos = X_BED_SIZE |
|||
|
|||
y_bed_size = 200 |
|||
y_min_pos = 0 |
|||
y_max_pos = Y_BED_SIZE |
|||
|
|||
z_min_pos = 0 |
|||
z_max_pos = 200 |
|||
|
|||
x_home_dir = -1 |
|||
y_home_dir = -1 |
|||
z_home_dir = -1 |
|||
|
|||
use_xmin_plug = on |
|||
use_ymin_plug = on |
|||
use_zmin_plug = on |
|||
|
|||
x_min_endstop_inverting = false |
|||
y_min_endstop_inverting = false |
|||
z_min_endstop_inverting = false |
|||
|
|||
default_axis_steps_per_unit = { 80, 80, 400, 500 } |
|||
axis_relative_modes = { false, false, false, false } |
|||
default_max_feedrate = { 300, 300, 5, 25 } |
|||
default_max_acceleration = { 3000, 3000, 100, 10000 } |
|||
|
|||
homing_feedrate_mm_m = { (50*60), (50*60), (4*60) } |
|||
homing_bump_divisor = { 2, 2, 4 } |
|||
|
|||
x_enable_on = 0 |
|||
y_enable_on = 0 |
|||
z_enable_on = 0 |
|||
e_enable_on = 0 |
|||
|
|||
invert_x_dir = false |
|||
invert_y_dir = true |
|||
invert_z_dir = false |
|||
invert_e0_dir = false |
|||
|
|||
invert_e_step_pin = false |
|||
invert_x_step_pin = false |
|||
invert_y_step_pin = false |
|||
invert_z_step_pin = false |
|||
|
|||
disable_x = false |
|||
disable_y = false |
|||
disable_z = false |
|||
disable_e = false |
|||
|
|||
proportional_font_ratio = 1.0 |
|||
default_nominal_filament_dia = 1.75 |
|||
|
|||
junction_deviation_mm = 0.013 |
|||
|
|||
default_acceleration = 3000 |
|||
default_travel_acceleration = 3000 |
|||
default_retract_acceleration = 3000 |
|||
|
|||
default_minimumfeedrate = 0.0 |
|||
default_mintravelfeedrate = 0.0 |
|||
|
|||
minimum_planner_speed = 0.05 |
|||
min_steps_per_segment = 6 |
|||
default_minsegmenttime = 20000 |
|||
|
|||
[config:basic] |
|||
bed_overshoot = 10 |
|||
busy_while_heating = on |
|||
default_ejerk = 5.0 |
|||
default_keepalive_interval = 2 |
|||
default_leveling_fade_height = 0.0 |
|||
disable_inactive_extruder = on |
|||
display_charset_hd44780 = JAPANESE |
|||
eeprom_boot_silent = on |
|||
eeprom_chitchat = on |
|||
endstoppullups = on |
|||
extrude_maxlength = 200 |
|||
extrude_mintemp = 170 |
|||
host_keepalive_feature = on |
|||
hotend_overshoot = 15 |
|||
jd_handle_small_segments = on |
|||
lcd_info_screen_style = 0 |
|||
lcd_language = en |
|||
max_bed_power = 255 |
|||
mesh_inset = 0 |
|||
min_software_endstops = on |
|||
max_software_endstops = on |
|||
min_software_endstop_x = on |
|||
min_software_endstop_y = on |
|||
min_software_endstop_z = on |
|||
max_software_endstop_x = on |
|||
max_software_endstop_y = on |
|||
max_software_endstop_z = on |
|||
preheat_1_fan_speed = 0 |
|||
preheat_1_label = "PLA" |
|||
preheat_1_temp_bed = 70 |
|||
prevent_cold_extrusion = on |
|||
prevent_lengthy_extrude = on |
|||
printjob_timer_autostart = on |
|||
probing_margin = 10 |
|||
show_bootscreen = on |
|||
soft_pwm_scale = 0 |
|||
string_config_h_author = "(none, default config)" |
|||
temp_bed_hysteresis = 3 |
|||
temp_bed_residency_time = 10 |
|||
temp_bed_window = 1 |
|||
temp_residency_time = 10 |
|||
temp_window = 1 |
|||
validate_homing_endstops = on |
|||
xy_probe_feedrate = (133*60) |
|||
z_clearance_between_probes = 5 |
|||
z_clearance_deploy_probe = 10 |
|||
z_clearance_multi_probe = 5 |
|||
|
|||
[config:advanced] |
|||
arc_support = on |
|||
auto_report_temperatures = on |
|||
autotemp = on |
|||
autotemp_oldweight = 0.98 |
|||
bed_check_interval = 5000 |
|||
default_stepper_deactive_time = 120 |
|||
default_volumetric_extruder_limit = 0.00 |
|||
disable_inactive_e = true |
|||
disable_inactive_x = true |
|||
disable_inactive_y = true |
|||
disable_inactive_z = true |
|||
e0_auto_fan_pin = -1 |
|||
encoder_100x_steps_per_sec = 80 |
|||
encoder_10x_steps_per_sec = 30 |
|||
encoder_rate_multiplier = on |
|||
extended_capabilities_report = on |
|||
extruder_auto_fan_speed = 255 |
|||
extruder_auto_fan_temperature = 50 |
|||
fanmux0_pin = -1 |
|||
fanmux1_pin = -1 |
|||
fanmux2_pin = -1 |
|||
faster_gcode_parser = on |
|||
homing_bump_mm = { 5, 5, 2 } |
|||
max_arc_segment_mm = 1.0 |
|||
min_arc_segment_mm = 0.1 |
|||
min_circle_segments = 72 |
|||
n_arc_correction = 25 |
|||
serial_overrun_protection = on |
|||
slowdown = on |
|||
slowdown_divisor = 2 |
|||
temp_sensor_bed = 0 |
|||
thermal_protection_bed_hysteresis = 2 |
|||
thermocouple_max_errors = 15 |
|||
tx_buffer_size = 0 |
|||
watch_bed_temp_increase = 2 |
|||
watch_bed_temp_period = 60 |
|||
watch_temp_increase = 2 |
|||
watch_temp_period = 20 |
|||
@ -1,70 +0,0 @@ |
|||
/**
|
|||
* Marlin 3D Printer Firmware |
|||
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
|||
* |
|||
* Based on Sprinter and grbl. |
|||
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm |
|||
* |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|||
* |
|||
*/ |
|||
#ifdef __AVR__ |
|||
|
|||
#include "../../inc/MarlinConfig.h" |
|||
|
|||
#if ENABLED(USE_WATCHDOG) |
|||
|
|||
#include "watchdog.h" |
|||
|
|||
#include "../../MarlinCore.h" |
|||
|
|||
// Initialize watchdog with 8s timeout, if possible. Otherwise, make it 4s.
|
|||
void watchdog_init() { |
|||
#if ENABLED(WATCHDOG_DURATION_8S) && defined(WDTO_8S) |
|||
#define WDTO_NS WDTO_8S |
|||
#else |
|||
#define WDTO_NS WDTO_4S |
|||
#endif |
|||
#if ENABLED(WATCHDOG_RESET_MANUAL) |
|||
// Enable the watchdog timer, but only for the interrupt.
|
|||
// Take care, as this requires the correct order of operation, with interrupts disabled.
|
|||
// See the datasheet of any AVR chip for details.
|
|||
wdt_reset(); |
|||
cli(); |
|||
_WD_CONTROL_REG = _BV(_WD_CHANGE_BIT) | _BV(WDE); |
|||
_WD_CONTROL_REG = _BV(WDIE) | (WDTO_NS & 0x07) | ((WDTO_NS & 0x08) << 2); // WDTO_NS directly does not work. bit 0-2 are consecutive in the register but the highest value bit is at bit 5
|
|||
// So worked for up to WDTO_2S
|
|||
sei(); |
|||
wdt_reset(); |
|||
#else |
|||
wdt_enable(WDTO_NS); // The function handles the upper bit correct.
|
|||
#endif |
|||
//delay(10000); // test it!
|
|||
} |
|||
|
|||
//===========================================================================
|
|||
//=================================== ISR ===================================
|
|||
//===========================================================================
|
|||
|
|||
// Watchdog timer interrupt, called if main program blocks >4sec and manual reset is enabled.
|
|||
#if ENABLED(WATCHDOG_RESET_MANUAL) |
|||
ISR(WDT_vect) { |
|||
sei(); // With the interrupt driven serial we need to allow interrupts.
|
|||
SERIAL_ERROR_MSG(STR_WATCHDOG_FIRED); |
|||
minkill(); // interrupt-safe final kill and infinite loop
|
|||
} |
|||
#endif |
|||
|
|||
#endif // USE_WATCHDOG
|
|||
#endif // __AVR__
|
|||
@ -1,114 +0,0 @@ |
|||
/**
|
|||
* Marlin 3D Printer Firmware |
|||
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
|||
* |
|||
* Based on Sprinter and grbl. |
|||
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm |
|||
* |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|||
* |
|||
*/ |
|||
#ifdef ARDUINO_ARCH_SAM |
|||
|
|||
#include "../../inc/MarlinConfig.h" |
|||
#include "../../MarlinCore.h" |
|||
#include "watchdog.h" |
|||
|
|||
// Override Arduino runtime to either config or disable the watchdog
|
|||
//
|
|||
// We need to configure the watchdog as soon as possible in the boot
|
|||
// process, because watchdog initialization at hardware reset on SAM3X8E
|
|||
// is unreliable, and there is risk of unintended resets if we delay
|
|||
// that initialization to a later time.
|
|||
void watchdogSetup() { |
|||
|
|||
#if ENABLED(USE_WATCHDOG) |
|||
|
|||
// 4 seconds timeout
|
|||
uint32_t timeout = TERN(WATCHDOG_DURATION_8S, 8000, 4000); |
|||
|
|||
// Calculate timeout value in WDT counter ticks: This assumes
|
|||
// the slow clock is running at 32.768 kHz watchdog
|
|||
// frequency is therefore 32768 / 128 = 256 Hz
|
|||
timeout = (timeout << 8) / 1000; |
|||
if (timeout == 0) |
|||
timeout = 1; |
|||
else if (timeout > 0xFFF) |
|||
timeout = 0xFFF; |
|||
|
|||
// We want to enable the watchdog with the specified timeout
|
|||
uint32_t value = |
|||
WDT_MR_WDV(timeout) | // With the specified timeout
|
|||
WDT_MR_WDD(timeout) | // and no invalid write window
|
|||
#if !(SAMV70 || SAMV71 || SAME70 || SAMS70) |
|||
WDT_MR_WDRPROC | // WDT fault resets processor only - We want
|
|||
// to keep PIO controller state
|
|||
#endif |
|||
WDT_MR_WDDBGHLT | // WDT stops in debug state.
|
|||
WDT_MR_WDIDLEHLT; // WDT stops in idle state.
|
|||
|
|||
#if ENABLED(WATCHDOG_RESET_MANUAL) |
|||
// We enable the watchdog timer, but only for the interrupt.
|
|||
|
|||
// Configure WDT to only trigger an interrupt
|
|||
value |= WDT_MR_WDFIEN; // Enable WDT fault interrupt.
|
|||
|
|||
// Disable WDT interrupt (just in case, to avoid triggering it!)
|
|||
NVIC_DisableIRQ(WDT_IRQn); |
|||
|
|||
// We NEED memory barriers to ensure Interrupts are actually disabled!
|
|||
// ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
|
|||
__DSB(); |
|||
__ISB(); |
|||
|
|||
// Initialize WDT with the given parameters
|
|||
WDT_Enable(WDT, value); |
|||
|
|||
// Configure and enable WDT interrupt.
|
|||
NVIC_ClearPendingIRQ(WDT_IRQn); |
|||
NVIC_SetPriority(WDT_IRQn, 0); // Use highest priority, so we detect all kinds of lockups
|
|||
NVIC_EnableIRQ(WDT_IRQn); |
|||
|
|||
#else |
|||
|
|||
// a WDT fault triggers a reset
|
|||
value |= WDT_MR_WDRSTEN; |
|||
|
|||
// Initialize WDT with the given parameters
|
|||
WDT_Enable(WDT, value); |
|||
|
|||
#endif |
|||
|
|||
// Reset the watchdog
|
|||
WDT_Restart(WDT); |
|||
|
|||
#else |
|||
|
|||
// Make sure to completely disable the Watchdog
|
|||
WDT_Disable(WDT); |
|||
|
|||
#endif |
|||
} |
|||
|
|||
#if ENABLED(USE_WATCHDOG) |
|||
// Initialize watchdog - On SAM3X, Watchdog was already configured
|
|||
// and enabled or disabled at startup, so no need to reconfigure it
|
|||
// here.
|
|||
void watchdog_init() { |
|||
// Reset watchdog to start clean
|
|||
WDT_Restart(WDT); |
|||
} |
|||
#endif // USE_WATCHDOG
|
|||
|
|||
#endif |
|||
|
@ -0,0 +1,106 @@ |
|||
/**
|
|||
* Marlin 3D Printer Firmware |
|||
* Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
|||
* |
|||
* Based on Sprinter and grbl. |
|||
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm |
|||
* |
|||
* Copypaste of SAMD51 HAL developed by Giuliano Zaro (AKA GMagician) |
|||
* |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|||
* |
|||
*/ |
|||
#ifdef ARDUINO_ARCH_ESP32 |
|||
|
|||
#include "../../inc/MarlinConfig.h" |
|||
|
|||
#if EITHER(MKS_MINI_12864, FYSETC_MINI_12864_2_1) |
|||
|
|||
#include <U8glib-HAL.h> |
|||
#include "../shared/HAL_SPI.h" |
|||
#include "HAL.h" |
|||
#include "SPI.h" |
|||
|
|||
#if ENABLED(SDSUPPORT) |
|||
#include "../../sd/cardreader.h" |
|||
#if ENABLED(ESP3D_WIFISUPPORT) |
|||
#include "sd_ESP32.h" |
|||
#endif |
|||
#endif |
|||
|
|||
static SPISettings spiConfig; |
|||
|
|||
|
|||
#ifndef LCD_SPI_SPEED |
|||
#ifdef SD_SPI_SPEED |
|||
#define LCD_SPI_SPEED SD_SPI_SPEED // Assume SPI speed shared with SD
|
|||
#else |
|||
#define LCD_SPI_SPEED SPI_FULL_SPEED // Use full speed if SD speed is not supplied
|
|||
#endif |
|||
#endif |
|||
|
|||
uint8_t u8g_eps_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) { |
|||
static uint8_t msgInitCount = 2; // Ignore all messages until 2nd U8G_COM_MSG_INIT
|
|||
|
|||
#if ENABLED(PAUSE_LCD_FOR_BUSY_SD) |
|||
if (card.flag.saving || card.flag.logging || TERN0(ESP3D_WIFISUPPORT, sd_busy_lock == true)) return 0; |
|||
#endif |
|||
|
|||
if (msgInitCount) { |
|||
if (msg == U8G_COM_MSG_INIT) msgInitCount--; |
|||
if (msgInitCount) return -1; |
|||
} |
|||
|
|||
switch (msg) { |
|||
case U8G_COM_MSG_STOP: break; |
|||
|
|||
case U8G_COM_MSG_INIT: |
|||
OUT_WRITE(DOGLCD_CS, HIGH); |
|||
OUT_WRITE(DOGLCD_A0, HIGH); |
|||
OUT_WRITE(LCD_RESET_PIN, HIGH); |
|||
u8g_Delay(5); |
|||
spiBegin(); |
|||
spiInit(LCD_SPI_SPEED); |
|||
break; |
|||
|
|||
case U8G_COM_MSG_ADDRESS: /* define cmd (arg_val = 0) or data mode (arg_val = 1) */ |
|||
WRITE(DOGLCD_A0, arg_val ? HIGH : LOW); |
|||
break; |
|||
|
|||
case U8G_COM_MSG_CHIP_SELECT: /* arg_val == 0 means HIGH level of U8G_PI_CS */ |
|||
WRITE(DOGLCD_CS, arg_val ? LOW : HIGH); |
|||
break; |
|||
|
|||
case U8G_COM_MSG_RESET: |
|||
WRITE(LCD_RESET_PIN, arg_val); |
|||
break; |
|||
|
|||
case U8G_COM_MSG_WRITE_BYTE: |
|||
spiSend((uint8_t)arg_val); |
|||
break; |
|||
|
|||
case U8G_COM_MSG_WRITE_SEQ: |
|||
uint8_t *ptr = (uint8_t*) arg_ptr; |
|||
while (arg_val > 0) { |
|||
spiSend(*ptr++); |
|||
arg_val--; |
|||
} |
|||
break; |
|||
} |
|||
return 1; |
|||
} |
|||
|
|||
#endif // EITHER(MKS_MINI_12864, FYSETC_MINI_12864_2_1)
|
|||
|
|||
#endif // ARDUINO_ARCH_ESP32
|
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue