Compare commits
2 Commits
1.1.9.2
...
bugfix-1.1
Author | SHA1 | Date | |
---|---|---|---|
|
2b4c269991 | ||
|
b7806f863b |
1
.github/FUNDING.yml
vendored
1
.github/FUNDING.yml
vendored
@@ -1 +0,0 @@
|
||||
custom: http://www.thinkyhead.com/donate-to-marlin
|
43
.github/ISSUE_TEMPLATE/bug_report.md
vendored
43
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@@ -1,43 +0,0 @@
|
||||
---
|
||||
name: Bug report
|
||||
about: Report a bug in Marlin
|
||||
title: "[BUG] (short description)"
|
||||
labels: ''
|
||||
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
|
||||
|
||||
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 filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
|
||||
|
||||
-->
|
||||
|
||||
### Bug Description
|
||||
|
||||
<!-- Description of the bug -->
|
||||
|
||||
### My Configurations
|
||||
|
||||
**Required:** Please include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
|
||||
|
||||
### Steps to Reproduce
|
||||
|
||||
<!-- 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
|
||||
|
||||
* Provide pictures or links to videos that clearly demonstrate the issue.
|
||||
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.
|
17
.github/ISSUE_TEMPLATE/config.yml
vendored
17
.github/ISSUE_TEMPLATE/config.yml
vendored
@@ -1,17 +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!
|
35
.github/ISSUE_TEMPLATE/feature_request.md
vendored
35
.github/ISSUE_TEMPLATE/feature_request.md
vendored
@@ -1,35 +0,0 @@
|
||||
---
|
||||
name: Feature request
|
||||
about: Request a Feature
|
||||
title: "[FR] (feature request title)"
|
||||
labels: ''
|
||||
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
|
||||
|
||||
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 filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
|
||||
|
||||
-->
|
||||
|
||||
### Description
|
||||
|
||||
<!-- Description of the requested feature -->
|
||||
|
||||
### Feature Workflow
|
||||
|
||||
<!-- Please describe the feature's behavior, user interaction, etc. -->
|
||||
|
||||
1. [First Action]
|
||||
2. [Second Action]
|
||||
3. [and so on...]
|
||||
|
||||
#### Additional Information
|
||||
|
||||
* Provide pictures or links that demonstrate a similar feature or concept.
|
||||
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.
|
37
.github/issue_template.md
vendored
37
.github/issue_template.md
vendored
@@ -1,16 +1,31 @@
|
||||
# NO SUPPORT REQUESTS PLEASE
|
||||
<!--
|
||||
|
||||
Support Requests posted here will be automatically closed!
|
||||
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/1.1.x/.github/code_of_conduct.md
|
||||
|
||||
This Issue Queue is for Marlin bug reports and development-related issues, and we prefer not to handle user-support questions here. See https://github.com/MarlinFirmware/Marlin/blob/1.1.x/.github/contributing.md#i-dont-want-to-read-this-whole-thing-i-just-have-a-question.
|
||||
Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use the Marlin Firmware forum at http://forums.reprap.org/list.php?415 or the Marlin Facebook Group https://www.facebook.com/groups/1049718498464482/.
|
||||
|
||||
For best results getting help with configuration and troubleshooting, please use the following resources:
|
||||
Before filing an issue be sure to test the 1.1 and/or 2.0 "bugfix" branches to see whether the issue is already addressed.
|
||||
|
||||
- RepRap.org Marlin Forum http://forums.reprap.org/list.php?415
|
||||
- Tom's 3D Forums https://discuss.toms3d.org/
|
||||
- Facebook Group "Marlin Firmware" https://www.facebook.com/groups/1049718498464482/
|
||||
- Facebook Group "Marlin Firmware for 3D Printers" https://www.facebook.com/groups/3Dtechtalk/
|
||||
- Marlin Configuration https://www.youtube.com/results?search_query=marlin+configuration on YouTube
|
||||
- Marlin Discord server. Join link: https://discord.gg/n5NJ59y
|
||||
-->
|
||||
|
||||
After seeking help from the community, if the consensus points to to a bug in Marlin, then you should post a Bug Report at https://github.com/MarlinFirmware/Marlin/issues/new/choose).
|
||||
### 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](https://github.com/MarlinFirmware/Marlin/blob/1.1.x/.github/contributing.md#how-can-i-contribute) for additional guidelines.
|
||||
|
@@ -2279,7 +2279,7 @@ void clean_up_after_endstop_or_probe_move() {
|
||||
#else
|
||||
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
||||
if (DEBUGGING(LEVELING)) {
|
||||
SERIAL_ECHOLNPAIR("last_written_mode - ", int(bltouch_last_written_mode));
|
||||
SERIAL_ECHOPAIR("last_written_mode - ", int(bltouch_last_written_mode));
|
||||
SERIAL_ECHOLNPGM("config mode - "
|
||||
#if ENABLED(BLTOUCH_SET_5V_MODE)
|
||||
"BLTOUCH_SET_5V_MODE"
|
||||
|
@@ -35,7 +35,7 @@
|
||||
/**
|
||||
* Marlin release version identifier
|
||||
*/
|
||||
#define SHORT_BUILD_VERSION "1.1.9.2"
|
||||
#define SHORT_BUILD_VERSION "bugfix-1.1.x"
|
||||
|
||||
/**
|
||||
* Verbose version identifier which should contain a reference to the location
|
||||
@@ -48,7 +48,7 @@
|
||||
* here we define this default string as the date where the latest release
|
||||
* version was tagged.
|
||||
*/
|
||||
#define STRING_DISTRIBUTION_DATE "2023-07-18"
|
||||
#define STRING_DISTRIBUTION_DATE "2018-07-31"
|
||||
|
||||
/**
|
||||
* Required minimum Configuration.h and Configuration_adv.h file versions.
|
||||
|
78
README.md
78
README.md
@@ -1,69 +1,60 @@
|
||||
# Marlin 3D Printer Firmware
|
||||
<img align="right" src="../../raw/1.1.x/buildroot/share/pixmaps/logo/marlin-250.png" />
|
||||
|
||||
Marlin is the world's most popular open source firmware for Replicating Rapid Prototyper (RepRap) machines, commonly referred to as "3D printers." Marlin Firmware is highly efficient, running even on modest 16MHz embedded AVR processors. While Marlin 1.1 only supports ATmega AVR (Arduino, etc.) and AT90USB (Teensy++ 2.0), [Marlin 2.0](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x) also adds support for several ARM processors, including the SAM3X8E (Arduino Due), NXP LPC1768/LPC1769 ARM Cortex-M3 (Re-Arm, MKS SBASE, Smoothieboard), and ARM Cortex-M4 (Teensy 3.5/3.6, STM32F1/4/7).
|
||||
[](https://travis-ci.org/MarlinFirmware/Marlin)
|
||||
[](https://scan.coverity.com/projects/2224)
|
||||
|
||||
A monumental amount of talent and effort goes into Marlin production, and thanks are due to many volunteers around the world. We work closely with the community, contributors, vendors, host and library developers, etc. to improve the quality, configurability, and compatibility of Marlin Firmware with a [huge variety](http://marlinfw.org/docs/configuration/configuration.html#motherboard) of boards. For the final 1.1 release we focused on code quality, performance, stability, and overall user experience. Several new features were added, many of which require no extra hardware.
|
||||
<img align="top" width=175 src="buildroot/share/pixmaps/logo/marlin-250.png" />
|
||||
|
||||
## Documentation
|
||||
Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/).
|
||||
Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!
|
||||
|
||||
- Visit [marlinfw.org](http://marlinfw.org/) for complete documentation on [configuration](http://marlinfw.org/docs/configuration/configuration.html), [installation](http://marlinfw.org/docs/basics/install.html), [features](http://marlinfw.org/meta/features/), and the many [G-codes](http://marlinfw.org/meta/gcode/) that Marlin supports. We will continue to expand the site to include in-depth articles, tutorials, and how-to videos on all of Marlin's features.
|
||||
- See the [Releases](https://github.com/MarlinFirmware/Marlin/releases) page for Release Notes on all current and previous versions of Marlin.
|
||||
- Check out the [RepRap.org Marlin Page](http://reprap.org/wiki/Marlin) for an overview of Marlin and its role in the RepRap project.
|
||||
## Bugfix Branch
|
||||
|
||||
## Marlin 1.1.x
|
||||
__Not for production use. Use with caution!__
|
||||
|
||||
The 1.1.x branch is home to all tagged releases of Marlin 1.1.
|
||||
This branch is used to accumulate patches to the latest 1.1.x release version. Periodically this branch will form the basis for the next minor 1.1.x release.
|
||||
|
||||
Marlin 1.1.9 is the final release of the AVR-only flat version of Marlin Firmware, so there will be no further 1.1.x releases. However [`bugfix-1.1.x`](https://github.com/MarlinFirmware/Marlin/tree/bugfix-1.1.x) will continue to receive patches for critical bugs, so be sure to test it (or [`bugfix-2.0.x`](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x)) before reporting any bugs you find in 1.1.9.
|
||||
Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases). (The latest tagged release of Marlin is version 1.1.9.)
|
||||
|
||||
## Marlin 2.0.x
|
||||
## Recent Changes
|
||||
- Internally always use native machine space
|
||||
- Initial UBL LCD Menu
|
||||
- New optimized G-code parser singleton
|
||||
- Initial `M3`/`M4`/`M5` Spindle and Laser support
|
||||
- Added `M421 Q` to offset a mesh point
|
||||
- Refinements to `G26` and `G33`
|
||||
- Added `M80 S` to query the power state
|
||||
- "Cancel Print" now shuts off heaters
|
||||
- Added `EXTRAPOLATE_BEYOND_GRID` option for mesh-based leveling
|
||||
|
||||
[Marlin 2.0](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x) is the future, featuring a much-improved hierarchical file structure and full [32-bit support](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x) via a Hardware Access Layer (HAL). Marlin 2.0 continues to work with [Arduino IDE](https://www.arduino.cc/en/Main/Software) for the platforms it supports, and the excellent [PlatformIO IDE](https://platformio.org/platformio-ide) is recommended for the next generation of ARM-based boards. If you're looking for the very best that Marlin has to offer and aren't bothered by a few rough edges, give version 2.0 a try!
|
||||
## Submitting Patches
|
||||
|
||||
## Contributing to Marlin
|
||||
Proposed patches should be submitted as a Pull Request against this branch ([bugfix-1.1.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-1.1.x)).
|
||||
|
||||
Click on the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues) and [Pull Requests](https://github.com/MarlinFirmware/Marlin/pulls) links above at any time to see what we're currently working on.
|
||||
- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 1.1.x life-cycle. We've opted for a simplified branch structure while we work on the maintainability and encapsulation of code modules. Version 2.0 and beyond should improve on separation of bug fixes and cutting-edge development.
|
||||
- Follow the proper coding style to gain points with the maintainers. See our [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) page for more information.
|
||||
- Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues). The "naive" question is often the one we forget to ask.
|
||||
|
||||
To submit patches and new features for Marlin 2.0 check out the [bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x) branch, add your commits, and submit a Pull Request back to the `bugfix-2.0.x` branch. Once 2.0.x has been certified for a critical mass of common 32-bit boards, it will become the next major release and will be the basis for all future major and minor releases.
|
||||
|
||||
Note that our "bugfix" branches always contain the latest patches and new code. These patches may not be widely tested. As always, when using "nightly" builds of Marlin, proceed with full caution.
|
||||
|
||||
## Marlin Resources
|
||||
|
||||
- [Marlin Home Page](http://marlinfw.org/) - The Marlin Documentation Project. [Help us](https://github.com/MarlinFirmware/MarlinDocumentation) expand this site!
|
||||
- [@MarlinFirmware](https://twitter.com/MarlinFirmware) on Twitter - Follow for news, release alerts, and tips & tricks. (Maintained by [@thinkyhead](https://github.com/thinkyhead).)
|
||||
|
||||
## Marlin User Support
|
||||
|
||||
Looking for help? Our GitHub Issue Queue is only for development-related issues, feature requests, and bug reports. But there are several places where you can get help from experienced users:
|
||||
|
||||
- [RepRap.org Marlin Forum](http://forums.reprap.org/list.php?415)
|
||||
- ["Marlin Firmware" Facebook Group](https://www.facebook.com/groups/1049718498464482/)
|
||||
- [Tom's 3D Forums](https://discuss.toms3d.org/)
|
||||
- [Marlin on Discord](https://discord.gg/n5NJ59y)
|
||||
### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
|
||||
|
||||
## Credits
|
||||
|
||||
Marlin Admins:
|
||||
- Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)]
|
||||
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)]
|
||||
The current Marlin dev team consists of:
|
||||
- Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)]
|
||||
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)]
|
||||
- Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)]
|
||||
|
||||
Notable contributors:
|
||||
Notable contributors include:
|
||||
- Alberto Cotronei [[@MagoKimbra](https://github.com/MagoKimbra)]
|
||||
- Andreas Hardtung [[@AnHardt](https://github.com/AnHardt)]
|
||||
- Bernhard Kubicek [[@bkubicek](https://github.com/bkubicek)]
|
||||
- Bob Cousins [[@bobc](https://github.com/bobc)]
|
||||
- Chris Palmer [[@nophead](https://github.com/nophead)]
|
||||
- Chris Pepper [[@p3p](https://github.com/p3p)]
|
||||
- David Braam [[@daid](https://github.com/daid)]
|
||||
- Éduardo Tagle [[@ejtagle](https://github.com/ejtagle)]
|
||||
- Edward Patel [[@epatel](https://github.com/epatel)]
|
||||
- Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)]
|
||||
- Ernesto Martinez [[@emartinez167](https://github.com/emartinez167)]
|
||||
- F. Malpartida [[@fmalpartida](https://github.com/fmalpartida)]
|
||||
- Giuliano Zaro [[@GMagician](https://github.com/GMagician)]
|
||||
- Jochen Groppe [[@CONSULitAS](https://github.com/CONSULitAS)]
|
||||
- João Brazio [[@jbrazio](https://github.com/jbrazio)]
|
||||
- Kai [[@Kaibob2](https://github.com/Kaibob2)]
|
||||
@@ -85,17 +76,10 @@ Notable contributors:
|
||||
- [[@psavva](https://github.com/psavva)]
|
||||
- [[@Tannoo](https://github.com/Tannoo)]
|
||||
- [[@teemuatlut](https://github.com/teemuatlut)]
|
||||
- ...and you!
|
||||
- ...and many others
|
||||
|
||||
## License
|
||||
|
||||
Marlin is published under the [GPL license](https://github.com/COPYING.md) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork.
|
||||
Marlin is published under the [GPL license](/LICENSE) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork.
|
||||
|
||||
While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own.
|
||||
|
||||
---
|
||||
|
||||
<!-- [](https://scan.coverity.com/projects/2224) -->
|
||||
- [](https://travis-ci.org/MarlinFirmware/Marlin)
|
||||
- [](https://flattr.com/submit/auto?user_id=thinkyhead&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) - Flattr Scott Lahteine
|
||||
- [](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) - Flattr Erik van der Zalm
|
||||
|
@@ -16,11 +16,16 @@
|
||||
#
|
||||
|
||||
[platformio]
|
||||
src_dir = Marlin
|
||||
default_envs = megaatmega2560
|
||||
src_dir = Marlin
|
||||
build_dir = .pioenvs
|
||||
lib_dir = .piolib
|
||||
libdeps_dir = .piolibdeps
|
||||
env_default = megaatmega2560
|
||||
|
||||
[common]
|
||||
build_flags = -fmax-errors=5 -g -fmerge-all-constants
|
||||
build_flags = -fmax-errors=5
|
||||
-g
|
||||
-ggdb
|
||||
lib_deps =
|
||||
https://github.com/MarlinFirmware/U8glib-HAL/archive/dev.zip
|
||||
LiquidCrystal_I2C@1.1.2
|
||||
|
Reference in New Issue
Block a user