Skip to content

Commit

Permalink
Updating personal fork for 2.0.6 release. (#4)
Browse files Browse the repository at this point in the history
* Fix material preset type

* Fix material preset editing

* NO_LCD_REINIT for FSMC (or, no SD_DETECT_PIN)

* Clean up preheat edit items

* [cron] Bump distribution date (2020-06-26)

* Minor LCD cleanup, improvement

* Fix typo in DWIN, preheat array

* Update Italian language (MarlinFirmware#18414)

* [samd51] Manifest assigned timers priority (MarlinFirmware#18402)

* Update MKS Robin Nano auto-build env (MarlinFirmware#18417)

* SAMD51 cleanup (MarlinFirmware#18419)

* BTT SKR Pro runout pins (MarlinFirmware#18416)

* Update Brazilian Portuguese language (MarlinFirmware#18411)

* Fix Fan Speed menu items (MarlinFirmware#18400)

* Patch some DGUS warnings

* Allow larger ADC debounce

Reference MarlinFirmware#17205

* [cron] Bump distribution date (2020-06-27)

* [cron] Bump distribution date (2020-06-28)

* Update language fonts

* Tool Change Migration fixes and debugging (MarlinFirmware#18448)

* ExtUI additions (MarlinFirmware#18447)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* Add Romanian language (MarlinFirmware#18455)

Co-authored-by: cristyanul <47246451+cristyanul@users.noreply.github.com>

* Fix "probing failed" false positives (MarlinFirmware#18435)

* Adjustable delta_diagonal_rod_trim (MarlinFirmware#18423)

* Russian, Ukranian for wide LCD (MarlinFirmware#18433)

* Tweak pins formatting

* Suppress unused var warning

* ClosedLoop as singleton

* [cron] Bump distribution date (2020-06-29)

* MKS Robin Nano flash-based EEPROM (MarlinFirmware#18466)

* Use "reset reason" defines (MarlinFirmware#18462)

* [cron] Bump distribution date (2020-06-30)

* [cron] Bump distribution date (2020-07-01)

* Fix missing parenthesis (MarlinFirmware#18473)

* Fix FYSETC CHEETAH V1.2 SD re-insert (MarlinFirmware#18474)

Include this board with other Cheetah stepper reset.

* Hide menu item with no fan (MarlinFirmware#18470)

* Permit independent X2,Y2,Z2,Z3,Z4 endstop inverting (MarlinFirmware#18481)

* Add TFT_LVGL_UI support (MarlinFirmware#18438)

* Per-Hotend Default PIDs (MarlinFirmware#18483)

* Enforce sensor range for temperature target (MarlinFirmware#18465)

* Mitigate stepper timeout

* Add CHAMBER PWM code

* Structured thermistor tables

* Fix reversed sensor ranges

* Prevent temps outside sensor range

* [cron] Bump distribution date (2020-07-02)

* Tweak stepper shutdown test

* Extend thermistor 1047 to 500°C

* Updated lock / unlock actions

* [cron] Bump distribution date (2020-07-03)

* Keep filament runout pin for Creality Melzi (MarlinFirmware#18504)

* Add FYSETC 2.42 inch OLED support (MarlinFirmware#18485)

* Option to set manual Babystepping distance in mm (MarlinFirmware#18503)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

* Clean up LCD Manual Move / UBL Mesh Edit (MarlinFirmware#18373)

* FYSETC OLED followup (MarlinFirmware#18519)

* Ensure Git applies Unix line-endings in tests (MarlinFirmware#18495)

* Fix axis name in serial output (MarlinFirmware#18522)

* Fix env:mks_robin_nano35 (MarlinFirmware#18516)

* FIx Sanguino/1284p board_upload.maximum_size (MarlinFirmware#18502)

* M150 I to set Neopixel by index (MarlinFirmware#18490)

* [cron] Bump distribution date (2020-07-04)

* PID Accelerated Edit (MarlinFirmware#18532)

* Patch Bad PR action

* Two lock-closed per day

* [cron] Bump distribution date (2020-07-05)

* Fix "'ubl' not declared" error (MarlinFirmware#18541)

* Fix thermistors exist-for-reading tests (MarlinFirmware#18533)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* Fix "Probing mesh point" message

Closes MarlinFirmware#17770

Co-Authored-By: Jan-Gerard van der Toorn <jan-gerard@users.noreply.github.com>

* Limit actions to main

* Probing points followup (MarlinFirmware#18552)

* Update actions on bugfix branch

* Add CI for pushed commits

Co-Authored-By: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>

* Add CI for pushed commits (MarlinFirmware#18549)

* Fix Neopixel set_color (MarlinFirmware#18544)

* Fix stall sensitivity adjustment for FTDI screens (MarlinFirmware#18554)

* Minor pins cleanup

* Add comment to M412

* Reduce string duplication

* STM32: No compile-time check for PWM_PIN (MarlinFirmware#18539)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* Filament Runout Inverting => State (MarlinFirmware#18537)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* Simplify home_z_safely, respect HOME_AFTER_DEACTIVATE

* [cron] Bump distribution date (2020-07-06)

* Temporarily use patched lock-threads

* Filament state followup

* Get SAMD51 CXX flags from script

* Use Material Preset 1 for PID autotune (MarlinFirmware#18446)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* Fix broken POWER_LOSS_RECOVERY prompt (MarlinFirmware#18557)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

* Add Lerdge S,X,K (MarlinFirmware#18302)

* Fix TMC homing phase coils alignment (MarlinFirmware#18528)

Co-authored-by: Fabio Santos <fabiosan@live.com>

* Scale runout distance setting for editable range (MarlinFirmware#18567)

* 0.7.1 <= TMCStepper <= 0.7.9 (MarlinFirmware#18564)

* Reduce 'first loop' temperature residency time (MarlinFirmware#18421)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* Update and fix POWER_MONITOR (MarlinFirmware#18561)

* [cron] Bump distribution date (2020-07-07)

* Temp Residency followup

* Whitespace cleanup

* Combine command macros

* Fix typo in Configuration_adv.h (MarlinFirmware#18570)

* [cron] Bump distribution date (2020-07-08)

* Tweak PLR debug

* Fix warning with PIO

* SKR 1.4 alert for unsupported LCD

* Update Chinese (zh_CN) language (MarlinFirmware#18580)

* Lock threads updated

* Show fixed V in Power Display with no V sensor (MarlinFirmware#18579)

* Fix User Temp Sensor (1000), reversed Pt100 / Pt1000 (MarlinFirmware#18590)

* Fix some comments

* Add `Cap:RUNOUT`

Co-Authored-By: Julius ter Pelkwijk <mrseeker@users.noreply.github.com>

* [cron] Bump distribution date (2020-07-09)

* Fix missing controller fan include

* 2.0.5.4 : Use ststm32 < 6.2

* Consolidate probe clearance, add section debug (MarlinFirmware#18576)

* Better section / function log
* Add do_z_clearance motion function

* Remove outdated comment (MarlinFirmware#18597)

* Clean up some MMU comments

* MarlinUI support for up to 5 Material Presets (MarlinFirmware#18488)

- Add `I` preset parameter to `G26`, `M106`, `M140`, and `M190`.
- Extend menu items to permit a string interpolation.
- Keep material names in a list and interpolate in menu items.
- Extend material presets to support up to 5 predefined materials.

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* "M122 I" to reinitialize TMC (MarlinFirmware#18571)

* [cron] Bump distribution date (2020-07-10)

* Add current offset for POWER_MONITOR sensor (MarlinFirmware#18600)

* Fix CMSIS / USB-FD regression (MarlinFirmware#18602)

* Fix Chitu V6 with LVGL UI (MarlinFirmware#18608)

* Fix CHITU_F103 pio.board name (MarlinFirmware#18486)

* Capitalize "G-code"

* [cron] Bump distribution date (2020-07-11)

* Option to assist thermocouple debug (MarlinFirmware#18621)

* Fix pid_debug_flag

* Specify supported library versions

* [cron] Bump distribution date (2020-07-12)

* Clarify MICROSTEP_MODES

* Option for extra endstop check (MarlinFirmware#18424)

* Fix G35 output formatting (MarlinFirmware#18631)

* [cron] Bump distribution date (2020-07-13)

* LiquidCrystal@1.0.0 for LPC

* Creality V4 cleanup

* [cron] Bump distribution date (2020-07-14)

* Fix / improve menu items (MarlinFirmware#18644)

* LPC fix NeoPixel fork

* Fix leveling "Point n of 3" message (MarlinFirmware#18639)

* Increase STM32F1 Servo Timer Interrupt Priority (MarlinFirmware#18637)

* [cron] Bump distribution date (2020-07-15)

* Specify ststm32 @ 6.1.x

* Tool-change debug option

* Add REPORT_FAN_CHANGE as an option

* Clean up DWIN code

* General cleanup

* Fix some Power Loss Recovery behaviors (MarlinFirmware#18558)

* PLR followup

* Fix Hotend Idle Timeout trigger (MarlinFirmware#18657)

* [cron] Bump distribution date (2020-07-16)

* Fix SKR 1.4 LCD / ADC Keypad sanity-check (MarlinFirmware#18670)

* Broadcast host actions

Fixes MarlinFirmware#18565

* Sanity-check BABYSTEP_MULTIPLICATOR_*

* [cron] Bump distribution date (2020-07-17)

* Fix material_preset reference issue

* Chopper Timing Preset for 24V 0.9° (MarlinFirmware#18662)

* Fix passive Chamber Temp reading (MarlinFirmware#18674)

* Fix check_hotends with > 1 hotend

* Tweak and use SD_ORDER

* ExtUI for Anycubic I3 Mega (MarlinFirmware#18655)

* Support FT81050 with FYSETC F6 (MarlinFirmware#18678)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* Smaller SD EEPROM file on Ender 3 V2

* Use safe_delay for PSU_POWERUP_DELAY (MarlinFirmware#18680)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* Fix E3V2 M0/M1 and wait_for_user

* [cron] Bump distribution date (2020-07-18)

* Chitu V6 - Stepper Z2 pins (MarlinFirmware#18683)

* Fix DGUS write variable endianness (MarlinFirmware#18689)

* Trigorilla Pro board (MarlinFirmware#18692)

* Prettier BLTouch menu items (MarlinFirmware#18682)

* Return to Status on PID Autotune (MarlinFirmware#18695)

* Misc formatting, cleanup

* [cron] Bump distribution date (2020-07-19)

* More customizable DGUSDisplay (MarlinFirmware#18700)

* Fix encoder reverse, partial steps handling (MarlinFirmware#18694)

* Update Chinese (cn) language (MarlinFirmware#18705)

* Fix endian DGUS WriteVariable (MarlinFirmware#18703)

* Fix BLTouch PWM reliability in HAL/STM32 (MarlinFirmware#18702)

* [cron] Bump distribution date (2020-07-20)

* SAMD51: More reliable Servo/BLTouch PWM (MarlinFirmware#18710)

* Only download & compile required libraries (MarlinFirmware#18699)

* Reduce Step Smoothing ceiling to 50% CPU usage (MarlinFirmware#18719)

* Fix some LVGL warnings

* Patch auto-deps for Windows CXX (MarlinFirmware#18721)

* [cron] Bump distribution date (2020-07-21)

* Matching mat.bed_temp condition

* Ignore unused (but downloaded) libraries (MarlinFirmware#18728)

* Use development version of PlatformIO (MarlinFirmware#18724)

* Fix build for Windows path edge case

* Filter some unused Marlin/src subfolders (MarlinFirmware#18729)

* New DGUS UI var / definition syntax (MarlinFirmware#18718)

* Optimize LCD, Wifi, etc. libraries (MarlinFirmware#18730)

* Fix inline AnycubicSerial method

* Anycubic followup

* [cron] Bump distribution date (2020-07-22)

* Fix Spanish preheat strings (MarlinFirmware#18743)

* Explicit SdFat

* Custom Nozzle Wipe (MarlinFirmware#18736)

* [cron] Bump distribution date (2020-07-23)

* Linear Advance: Only change E DIR when needed (MarlinFirmware#18744)

* Fix links to secure sites (MarlinFirmware#18745)

* Fast Filament Change temperature check (MarlinFirmware#18738)

* General cleanup

* [cron] Bump distribution date (2020-07-24)

* Update FYSETC AIO II TMC UART pins (MarlinFirmware#18749)

* Update links, README, contributing, etc.

* Update links, README, contributing, etc.

* ibid.

* Add CONTROLLER_FAN_IGNORE_Z (MarlinFirmware#18735)

* Simplify encoder handling (MarlinFirmware#18754)

* Fix ESP3D_WIFISUPPORT ini typo

* Apply lib_ignore from [features] (MarlinFirmware#18762)

* Ender 3 V2 BL24C16 EEPROM support (MarlinFirmware#18758)

* Filament Runout pin for Creality v4.2.2 board (MarlinFirmware#18763)

* [cron] Bump distribution date (2020-07-25)

* Ender 3 V2: Inject 'G28 O' before G29 (MarlinFirmware#18767)

* Fix Lerdge variant script (MarlinFirmware#18771)

* G425/G35 menu items; G425 pre- and post- scripts (MarlinFirmware#18737)

* Robin nano V2, TFT LVGL UI parameters, and more (MarlinFirmware#18500)

* Clean up after changes

* Update (c)

* Fix ui.external_control compile error (MarlinFirmware#18778)

* [cron] Bump distribution date (2020-07-26)

* Fix search for best compiler (MarlinFirmware#18779)

* Close host's Filament Change dialog (MarlinFirmware#18785)

* More folders only compiled when their feature is Enabled (MarlinFirmware#18780)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

* Randomize firmware.bin, fix unflag

* Fix MKS Robin Nano V2 build / upload (MarlinFirmware#18784)

* Fix compile-time PWM_PIN (MarlinFirmware#18793)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

* Prevent ESP3D_WIFISUPPORT with non-ESP32 board (MarlinFirmware#18792)

* Add 0 to EXTRUDERS :[json] (MarlinFirmware#18786)

* [cron] Bump distribution date (2020-07-27)

* Config for Anycubic Mega TFT

* Marlin Release 2.0.6

* [cron] Bump distribution date (2020-07-28)

* Fix WiFi / ESP32 sanity check (MarlinFirmware#18808)

* Fix garbled print_xyz output (MarlinFirmware#18810)

* Fix DELTA + TMC sensorless homing + SPI endstops (MarlinFirmware#18811)

* DISABLE_DEBUG required to free Robin nano Z_DIR_PIN (MarlinFirmware#18832)

* Fix NEOPIXEL_LED compile w/out PRINTER_EVENT_LEDS (MarlinFirmware#18824)

* Add TEMP_PROBE_PIN for Einsy Rambo (MarlinFirmware#18823)

* Fix Cancel Objects index display (zero-based) (MarlinFirmware#18841)

* Fix UNKNOWN_Z_NO_RAISE in G28

Bug introduced in 73fc077

* In G28 Z is sort-of known

* Update include_tree

* Add monitor_flags

* Fix Duplicator i3 Plus pin diagram (MarlinFirmware#18862)

* Fix FLYF407ZG pins (MarlinFirmware#18865)

* Fix Spindle/Laser PWM DC (MarlinFirmware#18871)

* No mks_robin extra_scripts in Trigorilla build (MarlinFirmware#18872)

* Fix Z height after tool change (MarlinFirmware#18951)

* Move Cancel Object menu, fix canceled item index (MarlinFirmware#18930)

* Update Italian language (MarlinFirmware#18886)

* Update Slovak language (MarlinFirmware#18884)

* HW PWM sanity checks for SPINDLE_LASER_FREQUENCY (MarlinFirmware#18947)

* Fix IS_PROBE_PIN macro (MarlinFirmware#19024)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
Co-authored-by: thinkyhead <thinkyhead@users.noreply.github.com>
Co-authored-by: Giuliano Zaro <3684609+GMagician@users.noreply.github.com>
Co-authored-by: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com>
Co-authored-by: Johnny Eshak <info@johnnytheone.com>
Co-authored-by: Lucas Seiki Oshiro <lucasseikioshiro@gmail.com>
Co-authored-by: Jason Smith <jason.inet@gmail.com>
Co-authored-by: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
Co-authored-by: cristyanul <47246451+cristyanul@users.noreply.github.com>
Co-authored-by: JP Flouret <jflouret@microsoft.com>
Co-authored-by: Fabio Santos <fabiosan@live.com>
Co-authored-by: Serhiy-K <52166448+Serhiy-K@users.noreply.github.com>
Co-authored-by: ellensp <ellensp@hotmail.com>
Co-authored-by: George Fu <nailao_5918@163.com>
Co-authored-by: Robby Candra <robbycandra.mail@gmail.com>
Co-authored-by: Victor Oliveira <rhapsodyv@gmail.com>
Co-authored-by: cbteeple <cbteeple@g.harvard.edu>
Co-authored-by: notabucketofspam <43456540+notabucketofspam@users.noreply.github.com>
Co-authored-by: Jan-Gerard van der Toorn <jan-gerard@users.noreply.github.com>
Co-authored-by: Oliver Jean Eifler <olli.eifler@gmail.com>
Co-authored-by: ManuelMcLure <manuel@mclure.org>
Co-authored-by: GhostlyCrowd <jeffjiggens@gmail.com>
Co-authored-by: Luc Hoang Long <i.me.mine@luchoanglong.com>
Co-authored-by: J.C. Nelson <32139633+xC0000005@users.noreply.github.com>
Co-authored-by: shuttercat <67816426+shuttercat@users.noreply.github.com>
Co-authored-by: espr14 <espr14@gmail.com>
Co-authored-by: cccc <cuiwei_cv@163.com>
Co-authored-by: Julius ter Pelkwijk <mrseeker@users.noreply.github.com>
Co-authored-by: Axel <ansepulveda@uc.cl>
Co-authored-by: Speaka <48431623+Speaka@users.noreply.github.com>
Co-authored-by: Chris Pepper <p3p@p3psoft.co.uk>
Co-authored-by: Leo <leo@nutz.de>
Co-authored-by: Evgeny Z <Evg33@users.noreply.github.com>
Co-authored-by: Sergey1560 <53866542+Sergey1560@users.noreply.github.com>
Co-authored-by: JBA <44487003+hub-jba@users.noreply.github.com>
Co-authored-by: Markus Towara <mtowara@gmail.com>
Co-authored-by: yufanyufan <yufanyufan@gmail.com>
Co-authored-by: Claus Näveke <github@naeveke.de>
Co-authored-by: cr20-123 <66994235+cr20-123@users.noreply.github.com>
Co-authored-by: Pascal de Bruijn <pmjdebruijn@pcode.nl>
Co-authored-by: Mark Langezaal <mark.langezaal@gmail.com>
Co-authored-by: Ivan Kravets <me@ikravets.com>
Co-authored-by: Diego von Deschwanden <68632259+Diegovd@users.noreply.github.com>
Co-authored-by: fleek <flee7100@gmail.com>
Co-authored-by: MKS-Sean <56996910+MKS-Sean@users.noreply.github.com>
Co-authored-by: giryan <giryan@users.noreply.github.com>
Co-authored-by: Victor Tseng <palatis@gmail.com>
Co-authored-by: MoellerDi <MoellerDi@users.noreply.github.com>
Co-authored-by: natemason <natemason@live.com.au>
Co-authored-by: swissnorp <67485708+swissnorp@users.noreply.github.com>
Co-authored-by: Sebastien Andrivet <sebastien@andrivet.com>
Co-authored-by: FLYmaker <49380822+FLYmaker@users.noreply.github.com>
Co-authored-by: Claus Näveke <nitek@blickt.es>
Co-authored-by: cbaugher <kb9ydn@gmail.com>
Co-authored-by: Roman Moravčík <roman.moravcik@gmail.com>
Co-authored-by: Julius Mumme <jufimu12@gmail.com>
  • Loading branch information
Show file tree
Hide file tree
Showing 1,609 changed files with 69,204 additions and 19,832 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
@@ -1,3 +1,3 @@
github: [thinkyhead]
patreon: thinkyhead
custom: ["http://www.thinkyhead.com/donate-to-marlin"]
custom: ["https://www.thinkyhead.com/donate-to-marlin"]
21 changes: 10 additions & 11 deletions .github/contributing.md
Expand Up @@ -34,16 +34,15 @@ This project and everyone participating in it is governed by the [Marlin Code of
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](http://forums.reprap.org/list.php?415)
* [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 Slack team:
If chat is more your speed, you can join the MarlinFirmware Discord server:

* Join the Marlin Slack Team
* To obtain group access, please [send a request](http://www.thinkyhead.com/contact/9) to @thinkyhead.
* Even though Slack is a chat service, sometimes it takes several hours for community members to respond &mdash; please be patient!
* Use the `#general` channel for general questions or discussion about Marlin.
* Other channels exist for certain topics. Check the channel list.
* 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 &mdash; 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?

Expand Down Expand Up @@ -93,7 +92,7 @@ Before creating a suggestion, please check [this list](#before-submitting-a-sugg

#### Before Submitting a Feature Request

* **Check the [Marlin website](http://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](http://marlinfw.org/docs/configuration/configuration.html).
* **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?
Expand All @@ -117,12 +116,12 @@ Unsure where to begin contributing to Marlin? You can start by looking through t

### 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](http://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
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](http://marlinfw.org/docs/development/coding_standards.html) posted on our website.
* 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.

Expand All @@ -137,7 +136,7 @@ Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x

### C++ Coding Standards

* Please read and follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) posted on our website. Failure to follow these guidelines will delay evaluation and acceptance of Pull Requests.
* 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

Expand Down
17 changes: 6 additions & 11 deletions .github/issue_template.md
@@ -1,16 +1,11 @@
# NO SUPPORT REQUESTS PLEASE

Support Requests posted here will be automatically closed!
Do you want to ask a question? Are you looking for support? Please don't post here. Support Requests posted here will be automatically closed!

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.
Instead use one of the following options:

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

- 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).
Before filing an issue be sure to test the latest "bugfix" branch to see whether the issue is already addressed.
40 changes: 40 additions & 0 deletions .github/lock.yml
@@ -0,0 +1,40 @@
#
# 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
7 changes: 0 additions & 7 deletions .github/workflows/bad-target.md

This file was deleted.

3 changes: 2 additions & 1 deletion .github/workflows/bump-date.yml
Expand Up @@ -11,6 +11,8 @@ on:

jobs:
bump_date:
name: Bump Distribution Date
if: github.repository == 'MarlinFirmware/Marlin'

runs-on: ubuntu-latest

Expand All @@ -24,7 +26,6 @@ jobs:
- name: Bump Distribution Date
run: |
# Inline Bump Script
[[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0
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}" && \
Expand Down
24 changes: 15 additions & 9 deletions .github/workflows/check-pr.yml
@@ -1,6 +1,6 @@
#
# comment-pr.yml
# Add a comment to any PR directed to a release branch
# check-pr.yml
# Close PRs directed at release branches
#

name: PR Bad Target
Expand All @@ -14,14 +14,20 @@ on:

jobs:
bad_target:

name: PR Bad Target
if: github.repository == 'MarlinFirmware/Marlin'

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: harupy/comment-on-pr@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
filename: bad-target.md
- uses: peter-evans/close-pull@v1
with:
delete-branch: false
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.
27 changes: 27 additions & 0 deletions .github/workflows/close-stale.yml
@@ -0,0 +1,27 @@
#
# 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 is stale because it has been open 30 days with no activity. Remove stale label / comment or this will be closed in 5 days.'
days-before-stale: 30
days-before-close: 5
stale-issue-label: 'stale-closing-soon'
exempt-issue-labels: 'T: Feature Request'
32 changes: 32 additions & 0 deletions .github/workflows/lock-closed.yml
@@ -0,0 +1,32 @@
#
# 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: ''
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: ''
32 changes: 24 additions & 8 deletions .github/workflows/test-builds.yml
Expand Up @@ -9,7 +9,14 @@ on:
pull_request:
branches:
- bugfix-2.0.x
- dev-2.1.x
paths-ignore:
- config/**
- data/**
- docs/**
- '**/*.md'
push:
branches:
- bugfix-2.0.x
paths-ignore:
- config/**
- data/**
Expand All @@ -18,6 +25,8 @@ on:

jobs:
test_builds:
name: Run All Tests
if: github.repository == 'MarlinFirmware/Marlin'

runs-on: ubuntu-latest

Expand Down Expand Up @@ -49,14 +58,25 @@ jobs:
- STM32F103RE_btt
- STM32F103RE_btt_USB
- STM32F103RC_fysetc
- STM32F103RC_meeb
- jgaurora_a5s_a1
- STM32F103VE_longer
- STM32F407VE_black
- STM32F401VE_STEVAL
- BIGTREE_BTT002
- BIGTREE_SKR_PRO
- BIGTREE_GTR_V1_0
- mks_robin
- ARMED
- FYSETC_S6
- STM32F070RB_malyan
- malyan_M300
- mks_robin_lite
- FLYF407ZG
- rumba32
- mks_robin_pro
- STM32F103RET6_creality
- LERDGEX

# Put lengthy tests last

Expand All @@ -69,12 +89,9 @@ jobs:
#- STM32F7

# Non-working environment tests

#- BIGTREE_BTT002
#- at90usb1286_cdc
#- at90usb1286_dfu
#- STM32F103CB_malyan
#- mks_robin_lite
#- mks_robin_mini
#- mks_robin_nano

Expand All @@ -88,7 +105,7 @@ jobs:

- name: Install PlatformIO
run: |
pip install -U https://github.com/platformio/platformio-core/archive/master.zip
pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
platformio update
- name: Check out the PR
Expand All @@ -97,8 +114,7 @@ jobs:
- name: Run ${{ matrix.test-platform }} Tests
run: |
# Inline tests script
[[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0
chmod +x buildroot/bin/*
chmod +x buildroot/share/tests/*
export PATH=./buildroot/bin/:./buildroot/share/tests/:${PATH}
chmod +x buildroot/tests/*
export PATH=./buildroot/bin/:./buildroot/tests/:${PATH}
run_tests . ${{ matrix.test-platform }}
22 changes: 22 additions & 0 deletions .github/workflows/unlock-reopened.yml
@@ -0,0 +1,22 @@
#
# 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 }}"
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -16,7 +16,7 @@
# 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 <http://www.gnu.org/licenses/>.
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#

# Our automatic versioning scheme generates the following file
Expand Down
8 changes: 4 additions & 4 deletions LICENSE
Expand Up @@ -3,7 +3,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (c) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Copyright (c) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down Expand Up @@ -647,7 +647,7 @@ the "copyright" line and a pointer to where the full notice is found.
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 <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.

Also add information on how to contact you by electronic and paper mail.

Expand All @@ -666,12 +666,12 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
<https://www.gnu.org/licenses/>.

The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
<https://www.gnu.org/philosophy/why-not-lgpl.html>.

0 comments on commit e5efb7a

Please sign in to comment.