Skip to content

Commit 2a60d5b

Browse files
thisiskeithbLCh-77
authored andcommitted
👔 Move GitHub templates, update README (MarlinFirmware#24199)
1 parent ad8b70f commit 2a60d5b

File tree

5 files changed

+72
-121
lines changed

5 files changed

+72
-121
lines changed

.github/ISSUE_TEMPLATE/config.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: 📖 Marlin Documentation
4+
url: https://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: https://reprap.org/forum/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!
18+
- name: 💸 Want to donate?
19+
url: https://www.thinkyhead.com/donate-to-marlin
20+
about: Please take a look at the various options to support Marlin Firmware's development financially!

.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

+46-80
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ This branch is for patches to the latest 2.0.x release version. Periodically thi
2020

2121
Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases).
2222

23+
## Example Configurations
24+
25+
Before building Marlin you'll need to configure it for your specific hardware. Your vendor should have already provided source code with configurations for the installed firmware, but if you ever decide to upgrade you'll need updated configuration files. Marlin users have contributed dozens of tested example configurations to get you started. Visit the [MarlinFirmware/Configurations](https://github.com/MarlinFirmware/Configurations) repository to find the right configuration for your hardware.
26+
2327
## Building Marlin 2.0
2428

2529
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).
@@ -28,80 +32,25 @@ To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino
2832

2933
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.
3034

31-
### Current HALs
32-
33-
#### AVR (8-bit)
34-
35-
board|processor|speed|flash|sram|logic|fpu
36-
----|---------|-----|-----|----|-----|---
37-
[Arduino AVR](https://www.arduino.cc/)|ATmega, ATTiny, etc.|16-20MHz|64-256k|2-16k|5V|no
38-
39-
#### DUE
40-
41-
boards|processor|speed|flash|sram|logic|fpu
42-
----|---------|-----|-----|----|-----|---
43-
[Arduino Due](https://www.arduino.cc/en/Guide/ArduinoDue), [RAMPS-FD](https://www.reprap.org/wiki/RAMPS-FD), etc.|[SAM3X8E ARM-Cortex M3](https://www.microchip.com/wwwproducts/en/ATsam3x8e)|84MHz|512k|64+32k|3.3V|no
44-
45-
#### ESP32
46-
47-
board|processor|speed|flash|sram|logic|fpu
48-
----|---------|-----|-----|----|-----|---
49-
[ESP32](https://www.espressif.com/en/products/hardware/esp32/overview)|Tensilica Xtensa LX6|160-240MHz variants|---|---|3.3V|---
50-
51-
#### LPC1768 / LPC1769
52-
53-
boards|processor|speed|flash|sram|logic|fpu
54-
----|---------|-----|-----|----|-----|---
55-
[Re-ARM](https://www.kickstarter.com/projects/1245051645/re-arm-for-ramps-simple-32-bit-upgrade)|[LPC1768 ARM-Cortex M3](https://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
56-
[MKS SBASE](https://reprap.org/forum/read.php?13,499322)|LPC1768 ARM-Cortex M3|100MHz|512k|32+16+16k|3.3-5V|no
57-
[Selena Compact](https://github.com/Ales2-k/Selena)|LPC1768 ARM-Cortex M3|100MHz|512k|32+16+16k|3.3-5V|no
58-
[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
59-
[Smoothieboard](https://reprap.org/wiki/Smoothieboard)|LPC1769 ARM-Cortex M3|120MHz|512k|64k|3.3-5V|no
60-
61-
#### SAMD51
62-
63-
boards|processor|speed|flash|sram|logic|fpu
64-
----|---------|-----|-----|----|-----|---
65-
[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
66-
67-
#### STM32F1
68-
69-
boards|processor|speed|flash|sram|logic|fpu
70-
----|---------|-----|-----|----|-----|---
71-
[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
72-
[Geeetech3D GTM32](https://github.com/Geeetech3D/Diagram/blob/master/Rostock301/Hardware_GTM32_PRO_VB.pdf)|[STM32F1](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html) ARM-Cortex M3|72MHz|256-512k|48-64k|3.3V|no
73-
74-
#### STM32F4
75-
76-
boards|processor|speed|flash|sram|logic|fpu
77-
----|---------|-----|-----|----|-----|---
78-
[STEVAL-3DP001V1](https://www.st.com/en/evaluation-tools/steval-3dp001v1.html)|[STM32F401VE Arm-Cortex M4](https://www.st.com/en/microcontrollers-microprocessors/stm32f401ve.html)|84MHz|512k|64+32k|3.3-5V|yes
79-
80-
#### Teensy++ 2.0
81-
82-
boards|processor|speed|flash|sram|logic|fpu
83-
----|---------|-----|-----|----|-----|---
84-
[Teensy++ 2.0](https://www.microchip.com/wwwproducts/en/AT90USB1286)|[AT90USB1286](https://www.microchip.com/wwwproducts/en/AT90USB1286)|16MHz|128k|8k|5V|no
85-
86-
#### Teensy 3.1 / 3.2
87-
88-
boards|processor|speed|flash|sram|logic|fpu
89-
----|---------|-----|-----|----|-----|---
90-
[Teensy 3.2](https://www.pjrc.com/store/teensy32.html)|[MK20DX256VLH7](https://www.mouser.com/ProductDetail/NXP-Freescale/MK20DX256VLH7) ARM-Cortex M4|72MHz|256k|32k|3.3V-5V|yes
91-
92-
#### Teensy 3.5 / 3.6
93-
94-
boards|processor|speed|flash|sram|logic|fpu
95-
----|---------|-----|-----|----|-----|---
96-
[Teensy 3.5](https://www.pjrc.com/store/teensy35.html)|[MK64FX512VMD12](https://www.mouser.com/ProductDetail/NXP-Freescale/MK64FX512VMD12) ARM-Cortex M4|120MHz|512k|192k|3.3-5V|yes
97-
[Teensy 3.6](https://www.pjrc.com/store/teensy36.html)|[MK66FX1M0VMD18](https://www.mouser.com/ProductDetail/NXP-Freescale/MK66FX1M0VMD18) ARM-Cortex M4|180MHz|1M|256k|3.3V|yes
98-
99-
#### Teensy 4.0 / 4.1
100-
101-
boards|processor|speed|flash|sram|logic|fpu
102-
----|---------|-----|-----|----|-----|---
103-
[Teensy 4.0](https://www.pjrc.com/store/teensy40.html)|[IMXRT1062DVL6A](https://www.mouser.com/new/nxp-semiconductors/nxp-imx-rt1060-crossover-processor/) ARM-Cortex M7|600MHz|1M|2M|3.3V|yes
104-
[Teensy 4.1](https://www.pjrc.com/store/teensy41.html)|[IMXRT1062DVJ6A](https://www.mouser.com/new/nxp-semiconductors/nxp-imx-rt1060-crossover-processor/) ARM-Cortex M7|600MHz|1M|2M|3.3V|yes
35+
### Supported Platforms
36+
37+
Platform|MCU|Example Boards
38+
--------|---|-------
39+
[Arduino AVR](https://www.arduino.cc/)|ATmega|RAMPS, Melzi, RAMBo
40+
[Teensy++ 2.0](https://www.microchip.com/en-us/product/AT90USB1286)|AT90USB1286|Printrboard
41+
[Arduino Due](https://www.arduino.cc/en/Guide/ArduinoDue)|SAM3X8E|RAMPS-FD, RADDS, RAMPS4DUE
42+
[ESP32](https://github.com/espressif/arduino-esp32)|ESP32|FYSETC E4, E4d@BOX, MRR
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
45+
[STM32F103](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html)|ARM® Cortex-M3|Malyan M200, GTM32 Pro, MKS Robin, BTT SKR Mini
46+
[STM32F401](https://www.st.com/en/microcontrollers-microprocessors/stm32f401.html)|ARM® Cortex-M4|ARMED, Rumba32, SKR Pro, Lerdge, FYSETC S6
47+
[STM32F7x6](https://www.st.com/en/microcontrollers-microprocessors/stm32f7x6.html)|ARM® Cortex-M7|The Borg, RemRam V1
48+
[SAMD51P20A](https://www.adafruit.com/product/4064)|ARM® Cortex-M4|Adafruit Grand Central M4
49+
[Teensy 3.5](https://www.pjrc.com/store/teensy35.html)|ARM® Cortex-M4|
50+
[Teensy 3.6](https://www.pjrc.com/store/teensy36.html)|ARM® Cortex-M4|
51+
[Teensy 4.0](https://www.pjrc.com/store/teensy40.html)|ARM® Cortex-M7|
52+
[Teensy 4.1](https://www.pjrc.com/store/teensy41.html)|ARM® Cortex-M7|
53+
Linux Native|x86/ARM/etc.|Raspberry Pi
10554

10655
## Submitting Patches
10756

@@ -116,18 +65,35 @@ Proposed patches should be submitted as a Pull Request against the ([bugfix-2.0.
11665
- You can use `make tests-all-local` or `make tests-single-local TEST_TARGET=...`.
11766
- If you prefer Docker you can use `make tests-all-local-docker` or `make tests-all-local-docker TEST_TARGET=...`.
11867

119-
### [RepRap.org Wiki Page](https://reprap.org/wiki/Marlin)
68+
## Marlin Support
69+
70+
The Issue Queue is reserved for Bug Reports and Feature Requests. To get help with configuration and troubleshooting, please use the following resources:
71+
72+
- [Marlin Documentation](https://marlinfw.org) - Official Marlin documentation
73+
- [Marlin Discord](https://discord.gg/n5NJ59y) - Discuss issues with Marlin users and developers
74+
- Facebook Group ["Marlin Firmware"](https://www.facebook.com/groups/1049718498464482/)
75+
- RepRap.org [Marlin Forum](https://forums.reprap.org/list.php?415)
76+
- Facebook Group ["Marlin Firmware for 3D Printers"](https://www.facebook.com/groups/3Dtechtalk/)
77+
- [Marlin Configuration](https://www.youtube.com/results?search_query=marlin+configuration) on YouTube
78+
79+
## Contributors
80+
81+
Marlin is constantly improving thanks to a huge number of contributors from all over the world bringing their specialties and talents. Huge thanks are due to [all the contributors](https://github.com/MarlinFirmware/Marlin/graphs/contributors) who regularly patch up bugs, help direct traffic, and basically keep Marlin from falling apart. Marlin's continued existence would not be possible without them.
12082

121-
## Credits
83+
## Administration
12284

123-
The current Marlin dev team consists of:
85+
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:
12486

125-
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA   [Donate](https://www.thinkyhead.com/donate-to-marlin) / Flattr: [![Flattr Scott](https://api.flattr.com/button/flattr-badge-small.png)](https://flattr.com/submit/auto?user_id=thinkyhead&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
87+
- Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA - Project Maintainer   [💸 Donate](https://www.thinkyhead.com/donate-to-marlin)
12688
- Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - 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
91+
- Victor Oliveira [[@rhapsodyv](https://github.com/rhapsodyv)] - Brazil
12792
- Chris Pepper [[@p3p](https://github.com/p3p)] - UK
93+
- Jason Smith [[@sjasonsmith](https://github.com/sjasonsmith)] - USA
94+
- Luu Lac [[@shitcreek](https://github.com/shitcreek)] - USA
12895
- Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - USA
129-
- João Brazio [[@jbrazio](https://github.com/jbrazio)] - Portugal
130-
- 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)
13197

13298
## License
13399

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)