Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge with upstream Marlin Bugfix 2.0.x #38

Merged
merged 15 commits into from
Mar 21, 2021
Merged

Merge with upstream Marlin Bugfix 2.0.x #38

merged 15 commits into from
Mar 21, 2021

Commits on Mar 18, 2021

  1. [cron] Bump distribution date (2021-03-18)

    @thinkyhead
    thinkyhead committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    2fc854e View commit details
    Browse the repository at this point in the history

  2. Update setup() description

    @thinkyhead
    thinkyhead committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    de73b9b View commit details
    Browse the repository at this point in the history

  3. Un-pause fans on STOP

    @thinkyhead
    thinkyhead committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    15bda88 View commit details
    Browse the repository at this point in the history

  4. E1+ Autotemp and Planner comments

    @thinkyhead
    thinkyhead committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    9823a37 View commit details
    Browse the repository at this point in the history

  5. Minor E3 V2 dwin cleanup

    @thinkyhead
    thinkyhead committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    deaefbf View commit details
    Browse the repository at this point in the history

  6. Revert "Fix small wired EEPROM (#21337)" 

    Reverting commit cc3e878 pending further investigation.
    @thinkyhead
    thinkyhead committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    560448a View commit details
    Browse the repository at this point in the history

  7. Move web-ui out of Marlin root folder

    @thinkyhead
    thinkyhead committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    6673359 View commit details
    Browse the repository at this point in the history

  8. Followup to planner cleanup

    @thinkyhead
    thinkyhead committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    ad907a5 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2021

  1. [cron] Bump distribution date (2021-03-19)

    @thinkyhead
    thinkyhead committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    1f52112 View commit details
    Browse the repository at this point in the history

  2. Nextion TFT touch screen (#21324) 

    Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
    @Skorpi08 @thinkyhead
    Skorpi08 and thinkyhead authored Mar 19, 2021
    Configuration menu
    Copy the full SHA
    b51aed8 View commit details
    Browse the repository at this point in the history

  3. Fix preflight motherboard target check (#21372) 

    Co-authored-by: Scott Lahteine <github@thinkyhead.com>
    @ellensp @thinkyhead
    ellensp and thinkyhead authored Mar 19, 2021
    Configuration menu
    Copy the full SHA
    790bba1 View commit details
    Browse the repository at this point in the history

  4. Fix bool++ warning

    @thinkyhead
    thinkyhead committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    d4ab202 View commit details
    Browse the repository at this point in the history

  5. HAL eeprom cleanup

    @thinkyhead
    thinkyhead committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    38b44e3 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2021

  1. [cron] Bump distribution date (2021-03-20)

    @thinkyhead
    thinkyhead committed Mar 20, 2021
    Configuration menu
    Copy the full SHA
    5573d98 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2021

  1. [cron] Bump distribution date (2021-03-21)

    @thinkyhead
    thinkyhead committed Mar 21, 2021
    Configuration menu
    Copy the full SHA
    d0ea2b2 View commit details
    Browse the repository at this point in the history