Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MarlinFirmware/Marlin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bugfix-2.1.x
Choose a base ref
...
head repository: MarlinFirmware/Marlin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: lts-2.1.0
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.

Commits on Dec 23, 2019

  1. Release version 2.0.0

    thinkyhead committed Dec 23, 2019
    Copy the full SHA
    ac7ee4b View commit details

Commits on Dec 24, 2019

  1. Copy the full SHA
    0673f33 View commit details

Commits on Jan 13, 2020

  1. Version 2.0.1

    thinkyhead committed Jan 13, 2020
    Copy the full SHA
    ee17051 View commit details

Commits on Jan 31, 2020

  1. Copy the full SHA
    be64261 View commit details
  2. Version 2.0.2

    thinkyhead committed Jan 31, 2020
    Copy the full SHA
    016e4c0 View commit details
  3. Copy the full SHA
    1525c25 View commit details
  4. Version 2.0.3

    thinkyhead committed Jan 31, 2020
    Copy the full SHA
    e6a7be9 View commit details

Commits on Feb 4, 2020

  1. Copy the full SHA
    64ab254 View commit details
  2. Copy the full SHA
    4c76314 View commit details
  3. Copy the full SHA
    d83382e View commit details

Commits on Feb 5, 2020

  1. Copy the full SHA
    62b9d7d View commit details

Commits on Feb 10, 2020

  1. Fix out-of-order M0 after SD printing

    Fixes #14774
    
    Co-Authored-By: tol2cj <tol2cj@users.noreply.github.com>
    thinkyhead and tol2cj committed Feb 10, 2020
    Copy the full SHA
    dd6a7ca View commit details

Commits on Feb 21, 2020

  1. Copy the full SHA
    f9aec26 View commit details
  2. Version 2.0.4 Release

    thinkyhead committed Feb 21, 2020
    Copy the full SHA
    7e8505f View commit details

Commits on Feb 22, 2020

  1. Copy the full SHA
    c505626 View commit details
  2. Copy the full SHA
    3543873 View commit details
  3. Hotfix for Babystepping

    thinkyhead committed Feb 22, 2020
    Copy the full SHA
    730690e View commit details
  4. CoreXY Babystepping hotfix

    thinkyhead committed Feb 22, 2020
    Copy the full SHA
    8670df0 View commit details
  5. Version 2.0.4.1 Release

    thinkyhead committed Feb 22, 2020
    Copy the full SHA
    c41f3f8 View commit details

Commits on Feb 23, 2020

  1. Merge nightly patches

    thinkyhead committed Feb 23, 2020
    Copy the full SHA
    282f467 View commit details
  2. Version 2.0.4.2 Release

    thinkyhead committed Feb 23, 2020
    Copy the full SHA
    5f27f7d View commit details
  3. Copy the full SHA
    2b759b9 View commit details

Commits on Feb 24, 2020

  1. Merge nightly patches

    thinkyhead committed Feb 24, 2020
    Copy the full SHA
    089cc68 View commit details
  2. Copy the full SHA
    c5f1ff9 View commit details
  3. Restore tabs in Makefile (#16944)

    marciot authored and thinkyhead committed Feb 24, 2020
    Copy the full SHA
    130d039 View commit details
  4. Fix card_eof error

    thinkyhead committed Feb 24, 2020
    Copy the full SHA
    42fa9fc View commit details
  5. Version 2.0.4.3 Release

    thinkyhead committed Feb 24, 2020
    Copy the full SHA
    1955eea View commit details

Commits on Feb 27, 2020

  1. Copy the full SHA
    b29aae6 View commit details
  2. Version 2.0.4.4 Release

    thinkyhead committed Feb 27, 2020
    Copy the full SHA
    d6e767e View commit details

Commits on Mar 14, 2020

  1. 2
    Copy the full SHA
    fa48fbb View commit details
  2. Version 2.0.5 Release

    thinkyhead committed Mar 14, 2020
    Copy the full SHA
    8dbbcfd View commit details

Commits on Mar 16, 2020

  1. Merge nightly patches

    thinkyhead committed Mar 16, 2020
    Copy the full SHA
    129b1bb View commit details
  2. Version 2.0.5.1 Release

    thinkyhead committed Mar 16, 2020
    Copy the full SHA
    d37bfa3 View commit details

Commits on Mar 24, 2020

  1. Copy the full SHA
    efc1926 View commit details
  2. Version 2.0.5.2

    thinkyhead committed Mar 24, 2020
    Copy the full SHA
    7124b21 View commit details

Commits on Mar 31, 2020

  1. Merge latest patches

    thinkyhead committed Mar 31, 2020
    Copy the full SHA
    0f9a14d View commit details
  2. Version 2.0.5.3

    thinkyhead committed Mar 31, 2020
    Copy the full SHA
    015c4e6 View commit details

Commits on Apr 1, 2020

  1. 9
    Copy the full SHA
    0518dec View commit details

Commits on May 2, 2020

  1. Copy the full SHA
    e4d8336 View commit details

Commits on Jun 9, 2020

  1. Remove "dev" branch reference (for now) (#18242)

    Daniel Aléxis authored Jun 9, 2020
    Copy the full SHA
    c352aeb View commit details

Commits on Jun 24, 2020

  1. Add Close / Lock actions

    thinkyhead committed Jun 24, 2020
    Copy the full SHA
    a73e610 View commit details

Commits on Jul 2, 2020

  1. Copy the full SHA
    842dea4 View commit details

Commits on Jul 4, 2020

  1. Patch Bad PR action

    thinkyhead committed Jul 4, 2020
    Copy the full SHA
    ed71108 View commit details
  2. Two lock-closed per day

    thinkyhead committed Jul 4, 2020
    Copy the full SHA
    7bf89f2 View commit details

Commits on Jul 5, 2020

  1. Limit actions to main

    thinkyhead committed Jul 5, 2020
    Copy the full SHA
    481b8ff View commit details
  2. Add CI for pushed commits

    Co-Authored-By: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>
    thinkyhead and thisiskeithb committed Jul 5, 2020
    Copy the full SHA
    697ef26 View commit details

Commits on Jul 6, 2020

  1. Copy the full SHA
    ee4910c View commit details

Commits on Jul 8, 2020

  1. Lock threads updated

    thinkyhead committed Jul 8, 2020
    Copy the full SHA
    354a9e5 View commit details

Commits on Jul 9, 2020

  1. 2
    Copy the full SHA
    5513e67 View commit details

Commits on Jul 11, 2020

  1. Fix pid_debug_flag

    thinkyhead committed Jul 11, 2020
    Copy the full SHA
    5e0958e View commit details
Showing 2,060 changed files with 181,154 additions and 58,583 deletions.
10 changes: 5 additions & 5 deletions .github/contributing.md
Original file line number Diff line number Diff line change
@@ -50,13 +50,13 @@ If chat is more your speed, you can join the MarlinFirmware Discord server:

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.

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

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

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

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

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

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.

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

#### Before Submitting a Feature Request

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

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

@@ -116,7 +116,7 @@ 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](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.
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.

* Fill in [the required template](pull_request_template.md).
* Don't include issue numbers in the PR title.
35 changes: 0 additions & 35 deletions .github/issue_template.md

This file was deleted.

40 changes: 0 additions & 40 deletions .github/lock.yml

This file was deleted.

22 changes: 16 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,33 @@
### Requirements
<!--
Submitting a Pull Request
- Please fill out all sections of this form. You can delete the helpful comments.
- Pull Requests without clear information will take longer and may even be rejected.
- We get a high volume of submissions so please be patient during review.
* Filling out this template is required. Pull Requests without a clear description may be closed at the maintainers' discretion.
-->

### Description

<!--
We must be able to understand your proposed change from this description. If we can't understand what the code will do from this description, the Pull Request may be closed at the maintainers' discretion. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code recently, so please walk us through the concepts.
Clearly describe the submitted changes with lots of details. Include images where helpful. Initial reviewers may not be familiar with the subject, so be as thorough as possible. You can use MarkDown syntax to improve readability with bullet lists, code blocks, and so on. PREVIEW and fix up formatting before submitting.
-->

### Requirements

<!-- Does this PR require a specific board, LCD, etc.? -->

### Benefits

<!-- What does this fix or improve? -->
<!-- What does this PR fix or improve? -->

### Configurations

<!-- Attach any Configuration.h, Configuration_adv.h, or platformio.ini files needed to compile/test your Pull Request. -->
<!-- Attach Configurations ZIP and any other files needed to test this PR. -->

### Related Issues

<!-- Whether this fixes a bug or fulfills a feature request, please list any related Issues here. -->
<!-- Does this PR fix a bug or fulfill a Feature Request? Link related Issues here. -->
124 changes: 0 additions & 124 deletions .github/workflows/test-builds.yml

This file was deleted.

73 changes: 37 additions & 36 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Marlin 3D Printer Firmware
# Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
# Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
#
# Based on Sprinter and grbl.
# Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,32 +21,21 @@

# Generated files
_Version.h
bdf2u8g
bdf2u8g.exe
genpages.exe
marlin_config.json
mczip.h
language*.csv
out-csv/
out-language/
*.gen
*.sublime-workspace

#
# OS
#
applet/
*.DS_Store
.DS_Store

#
# Misc
#
*~
*.orig
*.rej
*.bak
*.idea
*.s
*.i
*.ii
*.swp
tags

#
# C++
#
# Compiled Object files
# Compiled C++ Object files
*.slo
*.lo
*.o
@@ -77,10 +66,7 @@ tags
*.out
*.app

#
# C
#
# Object files
# Compiled C Object files
*.o
*.ko
*.obj
@@ -137,16 +123,22 @@ __vm/
vc-fileutils.settings

# Visual Studio Code
.vscode
.vscode/.browse.c_cpp.db*
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/*.db
.vscode/*
!.vscode/extensions.json

# Simulation files
imgui.ini
eeprom.dat
spi_flash.bin
fs.img

# cmake
# CMake
buildroot/share/cmake/*
CMakeLists.txt
!buildroot/share/cmake/CMakeLists.txt
src/CMakeLists.txt
CMakeListsPrivate.txt
build/

# CLion
cmake-build-*
@@ -164,6 +156,15 @@ __pycache__
# IOLogger logs
*_log.csv

# Simulation / Native
eeprom.dat
imgui.ini
# Misc.
*~
*.orig
*.rej
*.bak
*.idea
*.i
*.ii
*.swp
tags
*.logs
*.bak
Loading