Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 7615ea4fbadcfff007bbf526bd291fb6177ca291
Merge: 0b2d0e4 a006752
Author: Emanuel Garcês <[email protected]>
Date:   Sun Jun 20 12:00:11 2021 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 0b2d0e4
Author: Emanuel Garcês <[email protected]>
Date:   Sun May 16 18:49:40 2021 +0100

    Update configuration.h

commit 13f190b
Merge: 743cf11 533ba2a
Author: Emanuel Garcês <[email protected]>
Date:   Sun May 16 18:41:53 2021 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 743cf11
Merge: b7db397 376f0be
Author: Emanuel Garcês <[email protected]>
Date:   Sat May 15 12:36:51 2021 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit b7db397
Author: Emanuel Garcês <[email protected]>
Date:   Wed Dec 9 15:40:24 2020 +0000

    Updated the touchscreen calibration

commit c7476aa
Merge: 0f2aae7 465840e
Author: Emanuel Garcês <[email protected]>
Date:   Fri Dec 4 11:40:42 2020 +0000

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 0f2aae7
Merge: e26103f 0d080ce
Author: Emanuel Garcês <[email protected]>
Date:   Tue Dec 1 18:16:58 2020 +0000

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit e26103f
Merge: 0e065ae 48b0abc
Author: Emanuel Garcês <[email protected]>
Date:   Sun Nov 22 17:31:18 2020 +0000

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 0e065ae
Author: Emanuel Garcês <[email protected]>
Date:   Sat Nov 14 11:19:43 2020 +0000

    Fixed fan declaration

commit 0a5651c
Merge: 568fca2 0465e0a
Author: Emanuel Garcês <[email protected]>
Date:   Sat Nov 14 11:09:14 2020 +0000

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 568fca2
Author: Emanuel Garcês <[email protected]>
Date:   Sat Nov 14 11:05:44 2020 +0000

    Decreased controller fan, dor noise related issues.

commit c9e2277
Merge: 3656bc2 a4a487b
Author: Emanuel Garcês <[email protected]>
Date:   Sat Oct 31 08:30:58 2020 +0000

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 3656bc2
Merge: 205e3bc 12dec25
Author: Emanuel Garcês <[email protected]>
Date:   Wed Oct 28 09:10:44 2020 +0000

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 205e3bc
Author: Emanuel Garcês <[email protected]>
Date:   Sat Oct 17 12:16:48 2020 +0100

    version numbers were incorrect

commit eb0f051
Author: Emanuel Garcês <[email protected]>
Date:   Sat Oct 17 12:03:41 2020 +0100

    Disable babystep total - not working with colorui

commit 81a8ec6
Merge: 4c31951 263f29a
Author: Emanuel Garcês <[email protected]>
Date:   Sat Oct 17 12:00:09 2020 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 4c31951
Author: Emanuel Garcês <[email protected]>
Date:   Sat Oct 10 23:49:00 2020 +0100

    Changes for dual extrusion

commit 6ac7d0a
Author: Emanuel Garcês <[email protected]>
Date:   Sat Oct 10 21:31:15 2020 +0100

    Enable probe offset wizard

commit 8cf0a83
Merge: 23309ea e4c23f8
Author: Emanuel Garcês <[email protected]>
Date:   Sat Oct 10 21:25:23 2020 +0100

    Merge remote-tracking branch 'upstream/2.0.x' into X5SA-2E-Bugfix-ColorUI

commit e4c23f8
Author: Scott Lahteine <[email protected]>
Date:   Sat Oct 10 01:17:34 2020 -0500

    Marlin 2.0.7.1

commit a14e26c
Author: Serhiy-K <[email protected]>
Date:   Sat Oct 10 13:01:46 2020 +0300

    Fixes for TFTGLCD Panel, FastIO (MarlinFirmware#19614)

commit 9ab7c05
Author: ellensp <[email protected]>
Date:   Sat Oct 10 22:39:12 2020 +1300

    HAS_CHARACTER_LCD => HAS_MARLINUI_HD44780 (MarlinFirmware#19673)

commit 23da765
Merge: a7f3343 8e03a4c
Author: Scott Lahteine <[email protected]>
Date:   Sat Oct 10 00:26:40 2020 -0500

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x

commit a7f3343
Author: Victor Oliveira <[email protected]>
Date:   Sat Oct 10 01:35:41 2020 -0300

    Keep HAL tasks running during PID Autotune (MarlinFirmware#19671)

commit e817773
Author: Scott Lahteine <[email protected]>
Date:   Mon Sep 28 21:02:09 2020 -0500

    Marlin 2.0.7

commit aac0326
Merge: a52afd2 41774ec
Author: Scott Lahteine <[email protected]>
Date:   Mon Sep 28 20:59:49 2020 -0500

    Merge bugfix-2.0.x into 2.0.x

commit a52afd2
Author: Jason Smith <[email protected]>
Date:   Thu Sep 17 04:35:10 2020 -0700

    Update stale issue message and parameters (MarlinFirmware#19412)

    * Update stale issue bot

    * Update close-stale.yml

    * Update close-stale.yml

    Co-authored-by: Scott Lahteine <[email protected]>

commit 23309ea
Merge: b8ce0ca 1917ed8
Author: Emanuel Garcês <[email protected]>
Date:   Sat Sep 12 15:41:37 2020 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit b8ce0ca
Merge: daf5ed2 1d6a927
Author: Emanuel Garcês <[email protected]>
Date:   Fri Sep 4 12:53:39 2020 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 9913333
Author: Keith Bennett <[email protected]>
Date:   Thu Sep 3 21:27:59 2020 -0700

    Auto-label Feature Requests (MarlinFirmware#19258)

commit daf5ed2
Merge: 8672e36 2979da7
Author: Emanuel Garcês <[email protected]>
Date:   Tue Sep 1 16:10:54 2020 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 8672e36
Merge: c48c8f8 6ac8f5a
Author: Emanuel Garcês <[email protected]>
Date:   Fri Aug 28 09:52:25 2020 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit ca194ca
Author: Scott Lahteine <[email protected]>
Date:   Thu Aug 27 22:19:41 2020 -0500

    Version 2.0.6.1

commit b90e7c4
Merge: 96e29cd 6ac8f5a
Author: Scott Lahteine <[email protected]>
Date:   Thu Aug 27 22:17:50 2020 -0500

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x

commit c48c8f8
Merge: 0ad4c86 195d20c
Author: Emanuel Garcês <[email protected]>
Date:   Wed Aug 26 22:57:03 2020 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 0ad4c86
Author: Emanuel Garcês <[email protected]>
Date:   Wed Aug 26 22:56:32 2020 +0100

    Changes to the runout sensor

commit 0e5e47f
Merge: 6111a37 c488070
Author: Emanuel Garcês <[email protected]>
Date:   Mon Aug 24 11:15:02 2020 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 6111a37
Author: Emanuel Garcês <[email protected]>
Date:   Wed Aug 19 12:29:17 2020 +0100

    Disabled Linear Advance to enable S Curve acceleration

commit 281e3e9
Author: Emanuel Garcês <[email protected]>
Date:   Wed Aug 19 10:57:41 2020 +0100

    Added Junction deviation and S curve acceleration

commit 813838c
Merge: 58a9945 d3c5161
Author: Emanuel Garcês <[email protected]>
Date:   Wed Aug 19 10:56:51 2020 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 58a9945
Merge: fbfe586 c55f477
Author: Emanuel Garcês <[email protected]>
Date:   Tue Aug 18 22:06:17 2020 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit fbfe586
Author: Emanuel Garcês <[email protected]>
Date:   Mon Aug 17 14:43:33 2020 +0100

    Updated config values

commit 871530d
Merge: b263177 ed775ac
Author: Emanuel Garcês <[email protected]>
Date:   Mon Aug 17 13:18:01 2020 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit b263177
Merge: a6b5c71 19818a9
Author: Emanuel Garcês <[email protected]>
Date:   Sun Aug 16 11:36:26 2020 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 96e29cd
Author: Julius Mumme <[email protected]>
Date:   Sun Aug 16 05:50:28 2020 +0200

    Fix IS_PROBE_PIN macro (MarlinFirmware#19024)

commit a6b5c71
Author: Emanuel Garcês <[email protected]>
Date:   Thu Aug 13 12:51:49 2020 +0100

    Added PID Autotune menu

commit 3565e10
Merge: 2f1c1bb 3b9e0c3
Author: Emanuel Garcês <[email protected]>
Date:   Thu Aug 13 12:38:15 2020 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-ColorUI

commit 2f1c1bb
Author: Emanuel Garcês <[email protected]>
Date:   Tue Aug 11 09:50:51 2020 +0100

    Changes to build Color UI

commit 142cb2e
Merge: 32f694b bd690f1
Author: Emanuel Garcês <[email protected]>
Date:   Tue Aug 11 09:28:54 2020 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-2.0.x

commit 32f694b
Merge: ae3df4e 911cdd4
Author: Emanuel Garcês <[email protected]>
Date:   Tue Aug 11 00:24:39 2020 +0100

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bugfix-2.0.x

commit ae3df4e
Author: Emanuel Garcês <[email protected]>
Date:   Mon Aug 10 00:13:58 2020 +0100

    QOL Adjustments

commit cfc143e
Author: Emanuel Garcês <[email protected]>
Date:   Sun Aug 9 20:16:46 2020 +0100

    X5SA-2E Multiple fixes

commit c88bf98
Author: Emanuel Garcês <[email protected]>
Date:   Sun Aug 9 20:06:10 2020 +0100

    X5SA-2E Initial Config

commit fd9c698
Author: ellensp <[email protected]>
Date:   Sat Aug 8 10:59:09 2020 +1200

    HW PWM sanity checks for SPINDLE_LASER_FREQUENCY (MarlinFirmware#18947)

commit da144dc
Author: Roman Moravčík <[email protected]>
Date:   Tue Aug 4 07:32:47 2020 +0200

    Update Slovak language (MarlinFirmware#18884)

commit 1d92bad
Author: Giuliano Zaro <[email protected]>
Date:   Tue Aug 4 07:32:25 2020 +0200

    Update Italian language (MarlinFirmware#18886)

commit 242064f
Author: swissnorp <[email protected]>
Date:   Thu Aug 6 05:38:23 2020 +0200

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

commit ad2d1b6
Author: cbaugher <[email protected]>
Date:   Fri Aug 7 18:06:25 2020 -0500

    Fix Z height after tool change (MarlinFirmware#18951)

commit 978e0e4
Author: Claus Näveke <[email protected]>
Date:   Mon Aug 3 03:17:43 2020 +0200

    No mks_robin extra_scripts in Trigorilla build (MarlinFirmware#18872)

commit 02a500d
Author: ellensp <[email protected]>
Date:   Mon Aug 3 13:16:12 2020 +1200

    Fix Spindle/Laser PWM DC (MarlinFirmware#18871)

commit fa5ca86
Author: FLYmaker <[email protected]>
Date:   Mon Aug 3 09:13:57 2020 +0800

    Fix FLYF407ZG pins (MarlinFirmware#18865)

commit 01359cf
Author: Sebastien Andrivet <[email protected]>
Date:   Mon Aug 3 03:10:16 2020 +0200

    Fix Duplicator i3 Plus pin diagram (MarlinFirmware#18862)

commit 37b56d6
Author: Scott Lahteine <[email protected]>
Date:   Thu Jul 30 02:07:29 2020 -0500

    Add monitor_flags

commit ad59adf
Author: Scott Lahteine <[email protected]>
Date:   Tue Jul 28 18:13:20 2020 -0500

    Update include_tree

commit 121cd42
Author: Scott Lahteine <[email protected]>
Date:   Wed Jul 29 20:50:10 2020 -0500

    In G28 Z is sort-of known

commit cf1c57a
Author: Scott Lahteine <[email protected]>
Date:   Wed Jul 29 20:43:35 2020 -0500

    Fix UNKNOWN_Z_NO_RAISE in G28

    Bug introduced in 73fc077

commit 5804761
Author: swissnorp <[email protected]>
Date:   Wed Jul 29 04:28:58 2020 +0200

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

commit 3dd21a2
Author: natemason <[email protected]>
Date:   Wed Jul 29 09:18:02 2020 +0800

    Add TEMP_PROBE_PIN for Einsy Rambo (MarlinFirmware#18823)

commit b160e8b
Author: MoellerDi <[email protected]>
Date:   Wed Jul 29 03:19:12 2020 +0200

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

commit de37196
Author: Victor Oliveira <[email protected]>
Date:   Tue Jul 28 23:15:17 2020 -0300

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

commit 84b96d3
Merge: 92076c6 5d14c37
Author: Scott Lahteine <[email protected]>
Date:   Mon Jul 27 20:16:34 2020 -0500

    Hotfix for first round of post-release hiccups

commit 92076c6
Author: Scott Lahteine <[email protected]>
Date:   Sun Jul 26 20:03:06 2020 -0500

    Marlin Release 2.0.6

commit 5e5daf1
Merge: 8b637e4 de68b37
Author: Scott Lahteine <[email protected]>
Date:   Sun Jul 26 20:01:40 2020 -0500

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into release_206

commit 8b637e4
Author: Scott Lahteine <[email protected]>
Date:   Thu Jul 23 20:59:43 2020 -0500

    Update links, README, contributing, etc.

commit b73ac40
Author: Chris Pepper <[email protected]>
Date:   Tue Jul 14 15:15:19 2020 +0100

    LPC fix NeoPixel fork

commit 7ed66d0
Author: Scott Lahteine <[email protected]>
Date:   Sun Jul 12 22:35:13 2020 -0500

    [email protected] for LPC

commit c1b2379
Author: Scott Lahteine <[email protected]>
Date:   Sat Jul 11 07:38:19 2020 -0500

    Specify supported library versions

commit 5e0958e
Author: Scott Lahteine <[email protected]>
Date:   Sat Jul 11 07:14:54 2020 -0500

    Fix pid_debug_flag

commit 5513e67
Author: Scott Lahteine <[email protected]>
Date:   Wed Jul 8 19:36:09 2020 -0500

    2.0.5.4 : Use ststm32 < 6.2

commit 354a9e5
Author: Scott Lahteine <[email protected]>
Date:   Wed Jul 8 04:38:35 2020 -0500

    Lock threads updated

commit ee4910c
Author: Scott Lahteine <[email protected]>
Date:   Sun Jul 5 19:56:33 2020 -0500

    Temporarily use patched lock-threads

commit 697ef26
Author: Scott Lahteine <[email protected]>
Date:   Sun Jul 5 15:45:14 2020 -0500

    Add CI for pushed commits

    Co-Authored-By: thisiskeithb <[email protected]>

commit 481b8ff
Author: Scott Lahteine <[email protected]>
Date:   Sun Jul 5 15:23:07 2020 -0500

    Limit actions to main

commit 7bf89f2
Author: Scott Lahteine <[email protected]>
Date:   Sat Jul 4 17:28:23 2020 -0500

    Two lock-closed per day

commit ed71108
Author: Scott Lahteine <[email protected]>
Date:   Thu Jul 2 18:10:33 2020 -0500

    Patch Bad PR action

commit 842dea4
Author: Scott Lahteine <[email protected]>
Date:   Tue Jun 30 18:18:58 2020 -0500

    Updated lock / unlock actions

commit a73e610
Author: Scott Lahteine <[email protected]>
Date:   Tue Jun 23 19:58:00 2020 -0500

    Add Close / Lock actions

commit c352aeb
Author: Daniel Aléxis <[email protected]>
Date:   Tue Jun 9 21:27:57 2020 +0100

    Remove "dev" branch reference (for now) (MarlinFirmware#18242)

commit e4d8336
Author: Mathias Gartner <[email protected]>
Date:   Sat May 2 23:15:49 2020 +0200

    Fix XYZ types multiplication/division (MarlinFirmware#17826)

commit 0518dec
Author: thisiskeithb <[email protected]>
Date:   Wed Apr 1 12:16:01 2020 -0700

    Correct link to Configurations (MarlinFirmware#17370)

commit 015c4e6
Author: Scott Lahteine <[email protected]>
Date:   Tue Mar 31 14:40:06 2020 -0500

    Version 2.0.5.3

commit 0f9a14d
Merge: 7124b21 e7f020f
Author: Scott Lahteine <[email protected]>
Date:   Tue Mar 31 14:43:42 2020 -0500

    Merge latest patches

commit 7124b21
Author: Scott Lahteine <[email protected]>
Date:   Tue Mar 24 16:22:12 2020 -0500

    Version 2.0.5.2

commit efc1926
Merge: d37bfa3 68face8
Author: Scott Lahteine <[email protected]>
Date:   Tue Mar 24 17:10:53 2020 -0500

    Merge patches from bugfix-2.0.x

commit d37bfa3
Author: Scott Lahteine <[email protected]>
Date:   Mon Mar 16 17:52:41 2020 -0500

    Version 2.0.5.1 Release

commit 129b1bb
Merge: 8dbbcfd f6e80d5
Author: Scott Lahteine <[email protected]>
Date:   Mon Mar 16 17:50:43 2020 -0500

    Merge nightly patches

commit 8dbbcfd
Author: Scott Lahteine <[email protected]>
Date:   Sat Mar 14 00:49:12 2020 -0500

    Version 2.0.5 Release

commit fa48fbb
Merge: d6e767e 8b2d55e
Author: Scott Lahteine <[email protected]>
Date:   Sat Mar 14 00:35:11 2020 -0500

    Merge bugfix-2.0.x into 2.0.x

commit d6e767e
Author: Scott Lahteine <[email protected]>
Date:   Wed Feb 26 13:00:26 2020 -0600

    Version 2.0.4.4 Release

commit b29aae6
Merge: 1955eea 9f8ee31
Author: Scott Lahteine <[email protected]>
Date:   Thu Feb 27 04:14:33 2020 -0600

    Merge 'bugfix-2.0.x' into 2.0.x

commit 1955eea
Author: Scott Lahteine <[email protected]>
Date:   Mon Feb 24 06:13:18 2020 -0600

    Version 2.0.4.3 Release

commit 42fa9fc
Author: Scott Lahteine <[email protected]>
Date:   Mon Feb 24 10:58:54 2020 -0600

    Fix card_eof error

commit 130d039
Author: Marcio T <[email protected]>
Date:   Mon Feb 24 09:42:12 2020 -0700

    Restore tabs in Makefile (MarlinFirmware#16944)

commit c5f1ff9
Author: Marcio T <[email protected]>
Date:   Mon Feb 24 09:40:12 2020 -0700

    Allow Z_SAFE_HOMING_POINT outside bed (MarlinFirmware#16945)

commit 089cc68
Merge: 2b759b9 a254354
Author: Scott Lahteine <[email protected]>
Date:   Mon Feb 24 06:12:15 2020 -0600

    Merge nightly patches

commit 2b759b9
Author: Scott Lahteine <[email protected]>
Date:   Sat Feb 22 19:26:52 2020 -0600

    Suppress "packed member" warning

commit 5f27f7d
Author: Scott Lahteine <[email protected]>
Date:   Sat Feb 22 18:49:59 2020 -0600

    Version 2.0.4.2 Release

commit 282f467
Merge: c41f3f8 2471a8b
Author: Scott Lahteine <[email protected]>
Date:   Sat Feb 22 18:47:09 2020 -0600

    Merge nightly patches

commit c41f3f8
Author: Scott Lahteine <[email protected]>
Date:   Sat Feb 22 02:58:05 2020 -0600

    Version 2.0.4.1 Release

commit 8670df0
Author: Scott Lahteine <[email protected]>
Date:   Sat Feb 22 02:52:59 2020 -0600

    CoreXY Babystepping hotfix

commit 730690e
Author: Scott Lahteine <[email protected]>
Date:   Sat Feb 22 02:52:21 2020 -0600

    Hotfix for Babystepping

commit 3543873
Author: Scott Lahteine <[email protected]>
Date:   Fri Feb 21 07:24:58 2020 -0600

    Use moves_free in ok_to_send

commit c505626
Author: thinkyhead <[email protected]>
Date:   Sat Feb 22 00:03:47 2020 +0000

    [cron] Bump distribution date (2020-02-22)

commit 7e8505f
Author: Scott Lahteine <[email protected]>
Date:   Fri Feb 21 08:38:14 2020 -0600

    Version 2.0.4 Release

commit f9aec26
Merge: dd6a7ca 5d16497
Author: Scott Lahteine <[email protected]>
Date:   Fri Feb 21 08:37:02 2020 -0600

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x

commit dd6a7ca
Author: Scott Lahteine <[email protected]>
Date:   Mon Feb 10 16:33:21 2020 -0600

    Fix out-of-order M0 after SD printing

    Fixes MarlinFirmware#14774

    Co-Authored-By: tol2cj <[email protected]>

commit 62b9d7d
Author: Scott Lahteine <[email protected]>
Date:   Wed Feb 5 00:47:24 2020 -0600

    Direct link to version configs

commit d83382e
Author: Scott Lahteine <[email protected]>
Date:   Tue Feb 4 09:41:26 2020 -0600

    Add "PR Bad Target" workflow action

commit 4c76314
Author: Scott Lahteine <[email protected]>
Date:   Mon Feb 3 19:31:41 2020 -0600

    Scheduled action to bump the date on bugfix-2.0.x

commit 64ab254
Author: Scott Lahteine <[email protected]>
Date:   Mon Feb 3 18:06:04 2020 -0600

    Use a different Configurations branch for CI

commit e6a7be9
Author: Scott Lahteine <[email protected]>
Date:   Thu Jan 30 18:18:46 2020 -0600

    Version 2.0.3

commit 1525c25
Merge: 016e4c0 dabf393
Author: Scott Lahteine <[email protected]>
Date:   Fri Jan 31 04:23:45 2020 -0600

    Merge commit 'dabf3939209fd8ea7f6a6327d764c16743aa22aa' into look_at_201

commit 016e4c0
Author: Scott Lahteine <[email protected]>
Date:   Mon Jan 27 05:34:56 2020 -0600

    Version 2.0.2

commit be64261
Merge: ee17051 8bd6b60
Author: Scott Lahteine <[email protected]>
Date:   Fri Jan 31 04:22:09 2020 -0600

    Merge commit '8bd6b60a0141fa892984f2d5b61f06eadbbf9a5f' into look_at_201

commit ee17051
Author: Scott Lahteine <[email protected]>
Date:   Tue Dec 24 00:06:32 2019 -0600

    Version 2.0.1

commit 0673f33
Merge: ac7ee4b 1c9ccce
Author: Scott Lahteine <[email protected]>
Date:   Tue Dec 24 00:05:04 2019 -0600

    Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x

commit ac7ee4b
Author: Scott Lahteine <[email protected]>
Date:   Sun Dec 1 13:56:18 2019 -0600

    Release version 2.0.0
  • Loading branch information
@effgarces
effgarces committed Jun 20, 2021
1 parent a006752 commit cc869ab
Show file tree
Hide file tree
Showing 11 changed files with 373 additions and 148 deletions.
43 changes: 43 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
---
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 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
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 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
name: Feature request
about: Request a Feature
title: "[FR] (feature request title)"
labels: 'T: Feature Request'
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.
30 changes: 3 additions & 27 deletions .github/issue_template.md
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,11 @@
<!--
# NO SUPPORT REQUESTS PLEASE

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
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!

Do you want to ask a question? Are you looking for support? Please don't post here. Instead use one of the following options:
Instead use one of the following options:

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

Before filing an issue be sure to test the latest "bugfix" branch to see whether the issue is already addressed.
-->

### 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](#how-can-i-contribute) for additional guidelines.
35 changes: 35 additions & 0 deletions .github/workflows/bump-date.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#
# bump-date.yml
# Bump the distribution date once per day
#

name: Bump Distribution Date

on:
schedule:
- cron: '0 0 * * *'

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

runs-on: ubuntu-latest

steps:

- name: Check out bugfix-2.0.x
uses: actions/checkout@v2
with:
ref: bugfix-2.0.x

- name: Bump Distribution Date
run: |
# Inline Bump Script
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}" && \
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \
git add . && \
git commit -m "[cron] Bump distribution date ($DIST)" && \
git push
33 changes: 33 additions & 0 deletions .github/workflows/check-pr.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#
# check-pr.yml
# Close PRs directed at release branches
#

name: PR Bad Target

on:
pull_request:
branches:
- 1.0.x
- 1.1.x
- 2.0.x

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

runs-on: ubuntu-latest

steps:
- 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
View file
Original file line number Diff line number Diff line change
@@ -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 has had no activity in the last 30 days. Please add a reply if you want to keep this issue active, otherwise it will be automatically closed within 7 days.'
days-before-stale: 30
days-before-close: 7
stale-issue-label: 'stale-closing-soon'
exempt-issue-labels: 'T: Feature Request'
32 changes: 32 additions & 0 deletions .github/workflows/lock-closed.yml
View file
Original file line number Diff line number Diff line change
@@ -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: ''
22 changes: 22 additions & 0 deletions .github/workflows/unlock-reopened.yml
View file
Original file line number Diff line number Diff line change
@@ -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/[email protected]
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
Loading

0 comments on commit cc869ab

Please sign in to comment.