Skip to content

Commit ac7ee4b

Browse files
thinkyheadthinkyhead
committed
Release version 2.0.0
1 parent 68da497 commit ac7ee4b

File tree

7 files changed

+146
-69
lines changed

7 files changed

+146
-69
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
name: Bug report
3+
about: Report a bug in Marlin
4+
title: "[BUG] (short description)"
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
12+
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
13+
14+
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
15+
16+
Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
17+
18+
-->
19+
20+
### Bug Description
21+
22+
<!-- Description of the bug -->
23+
24+
### My Configurations
25+
26+
**Required:** Please include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
27+
28+
### Steps to Reproduce
29+
30+
<!-- Please describe the steps needed to reproduce the issue -->
31+
32+
1. [First Step]
33+
2. [Second Step]
34+
3. [and so on...]
35+
36+
**Expected behavior:** [What you expect to happen]
37+
38+
**Actual behavior:** [What actually happens]
39+
40+
#### Additional Information
41+
42+
* Provide pictures or links to videos that clearly demonstrate the issue.
43+
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Marlin Documentation
4+
url: http://marlinfw.org/
5+
about: Lots of documentation on installing and using Marlin.
6+
- name: MarlinFirmware Facebook group
7+
url: https://www.facebook.com/groups/1049718498464482
8+
about: Please ask and answer questions here.
9+
- name: Marlin on Discord
10+
url: https://discord.gg/n5NJ59y
11+
about: Join the Discord server for support and discussion.
12+
- name: Marlin Discussion Forum
13+
url: http://forums.reprap.org/list.php?415
14+
about: A searchable web forum hosted by RepRap dot org.
15+
- name: Marlin Videos on YouTube
16+
url: https://www.youtube.com/results?search_query=marlin+firmware
17+
about: Tutorials and more from Marlin users all around the world. Great for new users!

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
---
2+
name: Feature request
3+
about: Request a Feature
4+
title: "[FR] (feature request title)"
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
12+
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
13+
14+
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
15+
16+
Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
17+
18+
-->
19+
20+
### Description
21+
22+
<!-- Description of the requested feature -->
23+
24+
### Feature Workflow
25+
26+
<!-- Please describe the feature's behavior, user interaction, etc. -->
27+
28+
1. [First Action]
29+
2. [Second Action]
30+
3. [and so on...]
31+
32+
#### Additional Information
33+
34+
* Provide pictures or links that demonstrate a similar feature or concept.
35+
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.

‎.github/issue_template.md‎

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,16 @@
1-
<!--
1+
# NO SUPPORT REQUESTS PLEASE
22

3-
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
3+
Support Requests posted here will be automatically closed!
44

5-
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/ or the Marlin Discord Server https://discord.gg/n5NJ59y.
5+
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.
66

7-
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.
7+
For best results getting help with configuration and troubleshooting, please use the following resources:
88

9-
-->
9+
- RepRap.org Marlin Forum http://forums.reprap.org/list.php?415
10+
- Tom's 3D Forums https://discuss.toms3d.org/
11+
- Facebook Group "Marlin Firmware" https://www.facebook.com/groups/1049718498464482/
12+
- Facebook Group "Marlin Firmware for 3D Printers" https://www.facebook.com/groups/3Dtechtalk/
13+
- Marlin Configuration https://www.youtube.com/results?search_query=marlin+configuration on YouTube
14+
- Marlin Discord server. Join link: https://discord.gg/n5NJ59y
1015

11-
### Description
12-
13-
<!-- Description of the bug or requested feature -->
14-
15-
### Steps to Reproduce
16-
17-
<!-- If this is a Bug Report, please describe the steps needed to reproduce the issue -->
18-
19-
1. [First Step]
20-
2. [Second Step]
21-
3. [and so on...]
22-
23-
**Expected behavior:** [What you expect to happen]
24-
25-
**Actual behavior:** [What actually happens]
26-
27-
#### Additional Information
28-
29-
* Include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
30-
* Provide pictures or links to videos that clearly demonstrate the issue.
31-
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.
16+
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).

‎Marlin/Version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* Marlin release version identifier
3030
*/
31-
//#define SHORT_BUILD_VERSION "bugfix-2.0.x"
31+
//#define SHORT_BUILD_VERSION "2.0.x"
3232

3333
/**
3434
* Verbose version identifier which should contain a reference to the location

‎Marlin/src/inc/Version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* Release version. Leave the Marlin version or apply a custom scheme.
2626
*/
2727
#ifndef SHORT_BUILD_VERSION
28-
#define SHORT_BUILD_VERSION "bugfix-2.0.x"
28+
#define SHORT_BUILD_VERSION "2.0.0"
2929
#endif
3030

3131
/**
@@ -42,7 +42,7 @@
4242
* version was tagged.
4343
*/
4444
#ifndef STRING_DISTRIBUTION_DATE
45-
#define STRING_DISTRIBUTION_DATE "2019-12-02"
45+
#define STRING_DISTRIBUTION_DATE "2019-12-01"
4646
#endif
4747

4848
/**

‎README.md‎

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,71 @@
11
# Marlin 3D Printer Firmware
22

3-
[![Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg?branch=bugfix-2.0.x)](https://travis-ci.org/MarlinFirmware/Marlin)
3+
[![Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg?branch=2.0.x)](https://travis-ci.org/MarlinFirmware/Marlin)
44
![GitHub](https://img.shields.io/github/license/marlinfirmware/marlin.svg)
55
![GitHub contributors](https://img.shields.io/github/contributors/marlinfirmware/marlin.svg)
66
![GitHub Release Date](https://img.shields.io/github/release-date/marlinfirmware/marlin.svg)
77

8-
<img align="top" width=175 src="buildroot/share/pixmaps/logo/marlin-250.png" />
8+
<img align="right" width=175 src="buildroot/share/pixmaps/logo/marlin-250.png" />
99

1010
Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/).
11-
Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!
11+
Please let us know if Marlin misbehaves in any way. Volunteers are standing by!
1212

13-
## Marlin 2.0 Bugfix Branch
14-
15-
__Not for production use. Use with caution!__
13+
## Marlin 2.0
1614

1715
Marlin 2.0 takes this popular RepRap firmware to the next level by adding support for much faster 32-bit and ARM-based boards while improving support for 8-bit AVR boards. Read about Marlin's decision to use a "Hardware Abstraction Layer" below.
1816

19-
This branch is for patches to the latest 2.0.x release version. Periodically this branch will form the basis for the next minor 2.0.x release.
20-
2117
Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases).
2218

2319
## Building Marlin 2.0
2420

25-
To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino.cc/en/main/software) or [PlatformIO](http://docs.platformio.org/en/latest/ide.html#platformio-ide). We've posted detailed instructions on [Building Marlin with Arduino](http://marlinfw.org/docs/basics/install_arduino.html) and [Building Marlin with PlatformIO for ReArm](http://marlinfw.org/docs/basics/install_rearm.html) (which applies well to other 32-bit boards).
26-
27-
## Hardware Abstraction Layer (HAL)
28-
29-
Marlin 2.0 introduces a layer of abstraction so that all the existing high-level code can be built for 32-bit platforms while still retaining full 8-bit AVR compatibility. Retaining AVR compatibility and a single code-base is important to us, because we want to make sure that features and patches get as much testing and attention as possible, and that all platforms always benefit from the latest improvements.
30-
31-
### Current HALs
21+
To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino.cc/en/main/software) or [PlatformIO](http://docs.platformio.org/en/latest/ide.html#platformio-ide). Detailed build and install instructions are posted at:
3222

33-
name|processor|speed|flash|sram|logic|fpu
34-
----|---------|-----|-----|----|-----|---
35-
[Arduino AVR](https://www.arduino.cc/)|ATmega, ATTiny, etc.|16-20MHz|64-256k|2-16k|5V|no
36-
[Teensy++ 2.0](http://www.microchip.com/wwwproducts/en/AT90USB1286)|[AT90USB1286](http://www.microchip.com/wwwproducts/en/AT90USB1286)|16MHz|128k|8k|5V|no
37-
[Arduino STM32](https://github.com/rogerclarkmelbourne/Arduino_STM32)|[STM32F1](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html) ARM-Cortex M3|72MHz|256-512k|48-64k|3.3V|no
38-
[Due](https://www.arduino.cc/en/Guide/ArduinoDue), [RAMPS-FD](http://www.reprap.org/wiki/RAMPS-FD), etc.|[SAM3X8E ARM-Cortex M3](http://www.microchip.com/wwwproducts/en/ATsam3x8e)|84MHz|512k|64+32k|3.3V|no
39-
[Re-ARM](https://www.kickstarter.com/projects/1245051645/re-arm-for-ramps-simple-32-bit-upgrade)|[LPC1768 ARM-Cortex M3](http://www.nxp.com/products/microcontrollers-and-processors/arm-based-processors-and-mcus/lpc-cortex-m-mcus/lpc1700-cortex-m3/512kb-flash-64kb-sram-ethernet-usb-lqfp100-package:LPC1768FBD100)|100MHz|512k|32+16+16k|3.3-5V|no
40-
[MKS SBASE](http://forums.reprap.org/read.php?13,499322)|LPC1768 ARM-Cortex M3|100MHz|512k|32+16+16k|3.3-5V|no
41-
[Azteeg X5 GT](https://www.panucatt.com/azteeg_X5_GT_reprap_3d_printer_controller_p/ax5gt.htm)|LPC1769 ARM-Cortex M3|120MHz|512k|32+16+16k|3.3-5V|no
42-
[Selena Compact](https://github.com/Ales2-k/Selena)|LPC1768 ARM-Cortex M3|100MHz|512k|32+16+16k|3.3-5V|no
43-
[Teensy 3.5](https://www.pjrc.com/store/teensy35.html)|ARM-Cortex M4|120MHz|512k|192k|3.3-5V|yes
44-
[Teensy 3.6](https://www.pjrc.com/store/teensy36.html)|ARM-Cortex M4|180MHz|1M|256k|3.3V|yes
23+
- [Installing Marlin (Arduino)](http://marlinfw.org/docs/basics/install_arduino.html)
24+
- [Installing Marlin (VSCode)](http://marlinfw.org/docs/basics/install_platformio_vscode.html).
4525

46-
### HALs in Development
26+
### Supported Platforms
4727

48-
name|processor|speed|flash|sram|logic|fpu
49-
----|---------|-----|-----|----|-----|---
50-
[STEVAL-3DP001V1](http://www.st.com/en/evaluation-tools/steval-3dp001v1.html)|[STM32F401VE Arm-Cortex M4](http://www.st.com/en/microcontrollers/stm32f401ve.html)|84MHz|512k|64+32k|3.3-5V|yes
51-
[Smoothieboard](http://reprap.org/wiki/Smoothieboard)|LPC1769 ARM-Cortex M3|120MHz|512k|64k|3.3-5V|no
52-
[Adafruit Grand Central M4](https://www.adafruit.com/product/4064)|[SAMD51P20A ARM-Cortex M4](https://www.microchip.com/wwwproducts/en/ATSAMD51P20A)|120MHz|1M|256k|3.3V|yes
28+
Platform|MCU|Example Boards
29+
--------|---|-------
30+
[Arduino AVR](https://www.arduino.cc/)|ATmega|RAMPS, Melzi, RAMBo
31+
[Teensy++ 2.0](http://www.microchip.com/wwwproducts/en/AT90USB1286)|AT90USB1286|Printrboard
32+
[Arduino Due](https://www.arduino.cc/en/Guide/ArduinoDue)|SAM3X8E|RAMPS-FD, RADDS, RAMPS4DUE
33+
[LPC1768](http://www.nxp.com/products/microcontrollers-and-processors/arm-based-processors-and-mcus/lpc-cortex-m-mcus/lpc1700-cortex-m3/512kb-flash-64kb-sram-ethernet-usb-lqfp100-package:LPC1768FBD100)|ARM® Cortex-M3|MKS SBASE, Re-ARM, Selena Compact
34+
[LPC1769](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1700-cortex-m3/512kb-flash-64kb-sram-ethernet-usb-lqfp100-package:LPC1769FBD100)|ARM® Cortex-M3|Smoothieboard, Azteeg X5 mini, TH3D EZBoard
35+
[STM32F103](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html)|ARM® Cortex-M3|Malyan M200, GTM32 Pro, MKS Robin, BTT SKR Mini
36+
[STM32F401](https://www.st.com/en/microcontrollers-microprocessors/stm32f401.html)|ARM® Cortex-M4|ARMED, Rumba32, SKR Pro, Lerdge, FYSETC S6
37+
[STM32F7x6](https://www.st.com/en/microcontrollers-microprocessors/stm32f7x6.html)|ARM® Cortex-M7|The Borg, RemRam V1
38+
[SAMD51P20A](https://www.adafruit.com/product/4064)|ARM® Cortex-M4|Adafruit Grand Central M4
39+
[Teensy 3.5](https://www.pjrc.com/store/teensy35.html)|ARM® Cortex-M4|
40+
[Teensy 3.6](https://www.pjrc.com/store/teensy36.html)|ARM® Cortex-M4|
5341

54-
## Submitting Patches
42+
## Submitting Changes
5543

56-
Proposed patches should be submitted as a Pull Request against the ([bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x)) branch.
57-
58-
- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 2.0.x life-cycle.
44+
- Submit **Bug Fixes** as Pull Requests to the ([bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x)) branch.
45+
- Submit **New Features** to the ([dev-2.1.x](https://github.com/MarlinFirmware/Marlin/tree/dev-2.1.x)) branch.
5946
- Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers.
6047
- Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues).
6148

62-
### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
49+
## Marlin Support
50+
51+
For best results getting help with configuration and troubleshooting, please use the following resources:
52+
53+
- [Marlin Documentation](http://marlinfw.org) - Official Marlin documentation
54+
- [Marlin Discord](https://discord.gg/n5NJ59y) - Discuss issues with Marlin users and developers
55+
- Facebook Group ["Marlin Firmware"](https://www.facebook.com/groups/1049718498464482/)
56+
- RepRap.org [Marlin Forum](http://forums.reprap.org/list.php?415)
57+
- [Tom's 3D Forums](https://discuss.toms3d.org/)
58+
- Facebook Group ["Marlin Firmware for 3D Printers"](https://www.facebook.com/groups/3Dtechtalk/)
59+
- [Marlin Configuration](https://www.youtube.com/results?search_query=marlin+configuration) on YouTube
6360

6461
## Credits
6562

6663
The current Marlin dev team consists of:
6764

68-
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA &nbsp; [![Flattr Scott](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=thinkyhead&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
65+
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA &nbsp; [Donate](http://www.thinkyhead.com/donate-to-marlin) / Flattr: [![Flattr Scott](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=thinkyhead&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
6966
- Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - USA
70-
- Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - USA
7167
- Chris Pepper [[@p3p](https://github.com/p3p)] - UK
68+
- Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - USA
7269
- João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portugal
7370
- Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)] - Netherlands &nbsp; [![Flattr Erik](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
7471

0 commit comments

Comments
 (0)