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

Consolidate PSU_CONTROL into features/power, add M80 T for toggling PSU #22304

Merged
merged 7 commits into from
Jul 12, 2021
Merged

Consolidate PSU_CONTROL into features/power, add M80 T for toggling PSU #22304

merged 7 commits into from
Jul 12, 2021

Commits on Jul 7, 2021

  1. Consolidate PSU_CONTROL into features/power, add M80 T for toggling PSU.

    @slowbro
    slowbro committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    1e1c443 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2021

  1. Update marlinui.cpp

    @thinkyhead
    thinkyhead authored Jul 12, 2021
    Configuration menu
    Copy the full SHA
    d224543 View commit details
    Browse the repository at this point in the history

  2. Power timeout fallback to never

    @thinkyhead
    thinkyhead committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    b6a5361 View commit details
    Browse the repository at this point in the history

  3. tweaks

    @thinkyhead
    thinkyhead committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    1ef284a View commit details
    Browse the repository at this point in the history

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

    @thinkyhead
    thinkyhead committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    d531199 View commit details
    Browse the repository at this point in the history

  5. tweak style

    @thinkyhead
    thinkyhead committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    64bf1b9 View commit details
    Browse the repository at this point in the history

  6. Remove M80 T option

    @thinkyhead
    thinkyhead committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    9a23669 View commit details
    Browse the repository at this point in the history