Skip to content

Commit 395081f

Browse files
thisiskeithbLCh-77
authored andcommitted
👔 Move GitHub templates, update README (MarlinFirmware#24199)
1 parent d9fb7b6 commit 395081f

File tree

6 files changed

+39
-61
lines changed

6 files changed

+39
-61
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ body:
1414
1515
## Before Reporting a Bug
1616
17-
- 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.
17+
- Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
1818
1919
- 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.
2020
2121
## Instructions
2222
23-
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.
23+
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/bugfix-2.0.x/.github/contributing.md) for additional guidelines.
2424
2525
1. Provide a good title starting with [BUG].
2626
2. Fill out all sections of this bug report form.

.github/ISSUE_TEMPLATE/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: 📖 Marlin Documentation
4-
url: http://marlinfw.org/
4+
url: https://marlinfw.org/
55
about: Lots of documentation on installing and using Marlin.
66
- name: 👤 MarlinFirmware Facebook group
77
url: https://www.facebook.com/groups/1049718498464482
@@ -10,7 +10,7 @@ contact_links:
1010
url: https://discord.gg/n5NJ59y
1111
about: Join the Discord server for support and discussion.
1212
- name: 🔗 Marlin Discussion Forum
13-
url: http://forums.reprap.org/list.php?415
13+
url: https://reprap.org/forum/list.php?415
1414
about: A searchable web forum hosted by RepRap dot org.
1515
- name: 📺 Marlin Videos on YouTube
1616
url: https://www.youtube.com/results?search_query=marlin+firmware

.github/contributing.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ If chat is more your speed, you can join the MarlinFirmware Discord server:
5050

5151
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.
5252

53-
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.
53+
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/bug_report.yml), the information it asks for helps us resolve issues faster.
5454

5555
> **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.
5656
5757
#### How Do I Submit A (Good) Bug Report?
5858

59-
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).
59+
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/bug_report.yml).
6060

6161
Explain the problem and include additional details to help maintainers reproduce the problem:
6262

@@ -88,12 +88,12 @@ Include details about your configuration and environment:
8888

8989
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.
9090

91-
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.
91+
Before creating a suggestion, please check [this list](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aopen+is%3Aissue+label%3A%22T%3A+Feature+Request%22) 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-feature-request). Fill in [the template](ISSUE_TEMPLATE/feature_request.yml), including the steps that you imagine you would take if the feature you're requesting existed.
9292

9393
#### Before Submitting a Feature Request
9494

9595
* **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).
96-
* **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.
96+
* **Perform a [cursory search](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aopen+is%3Aissue+label%3A%22T%3A+Feature+Request%22)** 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.
9797

9898
#### How Do I Submit A (Good) Feature Request?
9999

@@ -116,7 +116,7 @@ Unsure where to begin contributing to Marlin? You can start by looking through t
116116

117117
### Pull Requests
118118

119-
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.
119+
Pull Requests should always be targeted to working branches (e.g., `bugfix-2.0.x` and/or `bugfix-1.1.x`) and never to release branches (e.g., `2.0.x` and/or `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.
120120

121121
* Fill in [the required template](pull_request_template.md).
122122
* Don't include issue numbers in the PR title.

.github/issue_template.md

-35
This file was deleted.

README.md

+29-16
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@
1010
Additional documentation can be found at the [Marlin Home Page](https://marlinfw.org/).
1111
Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!
1212

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

1517
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.
1618

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+
1721
Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases).
1822

1923
## Example Configurations
@@ -22,21 +26,22 @@ Before building Marlin you'll need to configure it for your specific hardware. Y
2226

2327
## Building Marlin 2.0
2428

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). Detailed build and install instructions are posted at:
29+
To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino.cc/en/main/software) or [PlatformIO](https://docs.platformio.org/en/latest/ide.html#platformio-ide). We've posted detailed instructions on [Building Marlin with Arduino](https://marlinfw.org/docs/basics/install_arduino.html) and [Building Marlin with PlatformIO for ReArm](https://marlinfw.org/docs/basics/install_rearm.html) (which applies well to other 32-bit boards).
2630

27-
- [Installing Marlin (Arduino)](http://marlinfw.org/docs/basics/install_arduino.html)
28-
- [Installing Marlin (VSCode)](http://marlinfw.org/docs/basics/install_platformio_vscode.html).
31+
## Hardware Abstraction Layer (HAL)
32+
33+
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.
2934

3035
### Supported Platforms
3136

3237
Platform|MCU|Example Boards
3338
--------|---|-------
3439
[Arduino AVR](https://www.arduino.cc/)|ATmega|RAMPS, Melzi, RAMBo
35-
[Teensy++ 2.0](http://www.microchip.com/wwwproducts/en/AT90USB1286)|AT90USB1286|Printrboard
40+
[Teensy++ 2.0](https://www.microchip.com/en-us/product/AT90USB1286)|AT90USB1286|Printrboard
3641
[Arduino Due](https://www.arduino.cc/en/Guide/ArduinoDue)|SAM3X8E|RAMPS-FD, RADDS, RAMPS4DUE
3742
[ESP32](https://github.com/espressif/arduino-esp32)|ESP32|FYSETC E4, E4d@BOX, MRR
38-
[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
39-
[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
43+
[LPC1768](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1700-cortex-m3/512-kb-flash-64-kb-sram-ethernet-usb-lqfp100-package:LPC1768FBD100)|ARM® Cortex-M3|MKS SBASE, Re-ARM, Selena Compact
44+
[LPC1769](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1700-cortex-m3/512-kb-flash-64-kb-sram-ethernet-usb-lqfp100-package:LPC1769FBD100)|ARM® Cortex-M3|Smoothieboard, Azteeg X5 mini, TH3D EZBoard
4045
[STM32F103](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html)|ARM® Cortex-M3|Malyan M200, GTM32 Pro, MKS Robin, BTT SKR Mini
4146
[STM32F401](https://www.st.com/en/microcontrollers-microprocessors/stm32f401.html)|ARM® Cortex-M4|ARMED, Rumba32, SKR Pro, Lerdge, FYSETC S6
4247
[STM32F7x6](https://www.st.com/en/microcontrollers-microprocessors/stm32f7x6.html)|ARM® Cortex-M7|The Borg, RemRam V1
@@ -47,20 +52,27 @@ To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino
4752
[Teensy 4.1](https://www.pjrc.com/store/teensy41.html)|ARM® Cortex-M7|
4853
Linux Native|x86/ARM/etc.|Raspberry Pi
4954

50-
## Submitting Changes
55+
## Submitting Patches
56+
57+
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.
5158

52-
- Submit **Bug Fixes** as Pull Requests to the ([bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x)) branch.
53-
- Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers.
54-
- Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues).
59+
- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 2.0.x life-cycle.
60+
- Follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers.
61+
- Please submit Feature Requests and Bug Reports to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues/new/choose). Support resources are also listed there.
62+
- Whenever you add new features, be sure to add tests to `buildroot/tests` and then run your tests locally, if possible.
63+
- It's optional: Running all the tests on Windows might take a long time, and they will run anyway on GitHub.
64+
- If you're running the tests on Linux (or on WSL with the code on a Linux volume) the speed is much faster.
65+
- You can use `make tests-all-local` or `make tests-single-local TEST_TARGET=...`.
66+
- If you prefer Docker you can use `make tests-all-local-docker` or `make tests-all-local-docker TEST_TARGET=...`.
5567

5668
## Marlin Support
5769

5870
The Issue Queue is reserved for Bug Reports and Feature Requests. To get help with configuration and troubleshooting, please use the following resources:
5971

60-
- [Marlin Documentation](http://marlinfw.org) - Official Marlin documentation
72+
- [Marlin Documentation](https://marlinfw.org) - Official Marlin documentation
6173
- [Marlin Discord](https://discord.gg/n5NJ59y) - Discuss issues with Marlin users and developers
6274
- Facebook Group ["Marlin Firmware"](https://www.facebook.com/groups/1049718498464482/)
63-
- RepRap.org [Marlin Forum](http://forums.reprap.org/list.php?415)
75+
- RepRap.org [Marlin Forum](https://forums.reprap.org/list.php?415)
6476
- Facebook Group ["Marlin Firmware for 3D Printers"](https://www.facebook.com/groups/3Dtechtalk/)
6577
- [Marlin Configuration](https://www.youtube.com/results?search_query=marlin+configuration) on YouTube
6678

@@ -72,15 +84,16 @@ Marlin is constantly improving thanks to a huge number of contributors from all
7284

7385
Regular users can open and close their own issues, but only the administrators can do project-related things like add labels, merge changes, set milestones, and kick trolls. The current Marlin admin team consists of:
7486

75-
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA - Project Maintainer   [![Donate](https://api.flattr.com/button/flattr-badge-large.png)](http://www.thinkyhead.com/donate-to-marlin)
87+
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA - Project Maintainer   [💸 Donate](https://www.thinkyhead.com/donate-to-marlin)
7688
- Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - USA
77-
- Keith Bennett [[@thisiskeithb](https://github.com/thisiskeithb)] - USA
89+
- Keith Bennett [[@thisiskeithb](https://github.com/thisiskeithb)] - USA   [💸 Donate](https://github.com/sponsors/thisiskeithb)
90+
- Peter Ellens [[@ellensp](https://github.com/ellensp)] - New Zealand
7891
- Victor Oliveira [[@rhapsodyv](https://github.com/rhapsodyv)] - Brazil
7992
- Chris Pepper [[@p3p](https://github.com/p3p)] - UK
8093
- Jason Smith [[@sjasonsmith](https://github.com/sjasonsmith)] - USA
8194
- Luu Lac [[@shitcreek](https://github.com/shitcreek)] - USA
8295
- Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - USA
83-
- Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)] - Netherlands   [![Flattr Erik](https://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)
96+
- Erik van der Zalm [[@ErikZalm](https://github.com/ErikZalm)] - Netherlands   [💸 Donate](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
8497

8598
## License
8699

buildroot/web-ui/data/www/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@
456456
<label for="text-gcommand" class="mb-0 field-labels">G-Code command:</label>
457457
<div class="input-group">
458458
<div class="input-group-prepend">
459-
<a class="btn btn-sm btn-dark" target="_blank" href="http://marlinfw.org/meta/gcode/"><i class="icon icon-info"></i></a>
459+
<a class="btn btn-sm btn-dark" target="_blank" href="https://marlinfw.org/meta/gcode/"><i class="icon icon-info"></i></a>
460460
<button class="btn btn-sm btn-outline-dark" type="button" id="btn-gcommand-preset" data-toggle="modal" data-target="#modal-presets"><i class="icon icon-tasks"></i></button>
461461
</div>
462462
<input type="text" id="text-gcommand" class="form-control form-control-sm border-dark text-uppercase" value="" required>

0 commit comments

Comments
 (0)