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

LCD position in current units #20145

Merged
merged 29 commits into from
Nov 24, 2020
Merged

LCD position in current units #20145

merged 29 commits into from
Nov 24, 2020

Commits on Nov 10, 2020

  1. Merge pull request #1 from MarlinFirmware/bugfix-2.0.x 

    Bugfix 2.0.x
    @rdhoggattjr
    rdhoggattjr authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    42dafaa View commit details
    Browse the repository at this point in the history

  2. INFO_DISPLAY_INCHES 

    Display inches on status screen when using G20
    @rdhoggattjr
    rdhoggattjr committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    2194198 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2020

  1. Fix formatting

    @rdhoggattjr
    rdhoggattjr authored Nov 11, 2020
    Configuration menu
    Copy the full SHA
    d7245b2 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2020

  1. STATUS_DISPLAY_INCHES 

    Display XYZ Coordinate's in Inches when G20 is active. Also turn on 'LCD_DECIMAL_SMALL_XY' and 'XYZ_NO_FRAME' as they are needed for STATUS_DISPLAY_INCHES.
    @rdhoggattjr
    rdhoggattjr committed Nov 15, 2020
    Configuration menu
    Copy the full SHA
    b08cda4 View commit details
    Browse the repository at this point in the history

  2. Re-Push STATUS_DISPLAY_INCHES 

    Push the rest of the changes that Github Desktop missed for some reason.
    @rdhoggattjr
    rdhoggattjr committed Nov 15, 2020
    Configuration menu
    Copy the full SHA
    9cc6a9b View commit details
    Browse the repository at this point in the history

  3. Update Configuration.h

    @rdhoggattjr
    rdhoggattjr committed Nov 15, 2020
    Configuration menu
    Copy the full SHA
    9c7f516 View commit details
    Browse the repository at this point in the history

  4. Remove white space and fix check

    @rdhoggattjr
    rdhoggattjr committed Nov 15, 2020
    Configuration menu
    Copy the full SHA
    2f76e10 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2020

  1. add imperial_units boolean 

    Now checks imperial_units boolean for linear units in use.
    @rdhoggattjr
    rdhoggattjr committed Nov 16, 2020
    Configuration menu
    Copy the full SHA
    21edaeb View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2020

  1. Update Configuration.h

    @rdhoggattjr
    rdhoggattjr committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    f3ce8cf View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3 from rdhoggattjr/bugfix-2.0.x-temp 

    add imperial_units boolean
    @rdhoggattjr
    rdhoggattjr authored Nov 17, 2020
    Configuration menu
    Copy the full SHA
    1b7e561 View commit details
    Browse the repository at this point in the history

  3. added INCH_MANUAL_MOVEMENT 

    added code for INCH_MANUAL_MOVEMENT testing
    @rdhoggattjr
    rdhoggattjr committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    e39263e View commit details
    Browse the repository at this point in the history

  4. Adjust conditions for imperial_units boolean 

    use imperial_units boolean for either STATUS_DISPLAY_INCHES or INCH_MANUAL_MOVEMENT
    @rdhoggattjr
    rdhoggattjr committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    c9254fe View commit details
    Browse the repository at this point in the history

  5. small fixes 

    made small changes
    @rdhoggattjr
    rdhoggattjr committed Nov 17, 2020
    Configuration menu
    Copy the full SHA
    a9f6e36 View commit details
    Browse the repository at this point in the history

  6. fix #include check

    @rdhoggattjr
    rdhoggattjr authored Nov 17, 2020
    Configuration menu
    Copy the full SHA
    de64692 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #4 from rdhoggattjr/bugfix-2.0.x-temp 

    fix #include check
    @rdhoggattjr
    rdhoggattjr authored Nov 17, 2020
    Configuration menu
    Copy the full SHA
    80e4f2e View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2020

  1. More Small Fixes 

    This looks ready to test on the machine.
    @rdhoggattjr
    rdhoggattjr committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    f6dc7d6 View commit details
    Browse the repository at this point in the history

  2. Helper method

    @thinkyhead
    thinkyhead committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    5db27f1 View commit details
    Browse the repository at this point in the history

  3. Merged STATUS_DISPLAY_INCHES into INCH_MODE_SUPPORT 

    Now enabled if INCH_MODE_SUPPORT is enabled and not an option
    @rdhoggattjr
    rdhoggattjr committed Nov 18, 2020
    Configuration menu
    Copy the full SHA
    5aff43e View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2020

  1. Merge branch 'bugfix-2.0.x-inch-manual-movement' into bugfix-2.0.x-temp

    @rdhoggattjr
    rdhoggattjr authored Nov 19, 2020
    Configuration menu
    Copy the full SHA
    9e26439 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5 from rdhoggattjr/bugfix-2.0.x-temp 

    Bugfix 2.0.x temp
    @rdhoggattjr
    rdhoggattjr authored Nov 19, 2020
    Configuration menu
    Copy the full SHA
    1433320 View commit details
    Browse the repository at this point in the history

  3. Convert to INCH_MODE_SUPPORT and using_inch_units() 

    Tied INCH_MANUAL_MOVEMENT into INCH_MODE_SUPPORT and converted unit checks to using_inch_units()
    @rdhoggattjr
    rdhoggattjr committed Nov 19, 2020
    Configuration menu
    Copy the full SHA
    e132f87 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #6 from rdhoggattjr/bugfix-2.0.x-inch-manual-movement 

    Bugfix 2.0.x inch manual movement
    @rdhoggattjr
    rdhoggattjr authored Nov 19, 2020
    Configuration menu
    Copy the full SHA
    52a44e0 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2020

  1. Update to use TERN 

    Condensed IF ENABLED statements to use TERN for cleaner code.
    @rdhoggattjr
    rdhoggattjr committed Nov 20, 2020
    Configuration menu
    Copy the full SHA
    bf62c73 View commit details
    Browse the repository at this point in the history

  2. Remove whitespace

    @rdhoggattjr
    rdhoggattjr authored Nov 20, 2020
    Configuration menu
    Copy the full SHA
    29a53fb View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2020

  1. Simplify

    @thinkyhead
    thinkyhead committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    0dea5c4 View commit details
    Browse the repository at this point in the history

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

    @thinkyhead
    thinkyhead committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    8f953fa View commit details
    Browse the repository at this point in the history

  3. Better macro

    @thinkyhead
    thinkyhead committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    8046978 View commit details
    Browse the repository at this point in the history

  4. Include parser

    @thinkyhead
    thinkyhead committed Nov 21, 2020
    Configuration menu
    Copy the full SHA
    1dce0a4 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2020

  1. M114 tweak

    @thinkyhead
    thinkyhead committed Nov 22, 2020
    Configuration menu
    Copy the full SHA
    5046224 View commit details
    Browse the repository at this point in the history