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

Allow from 0 to 5 preheat setups (bugfix) #18488

Merged
merged 58 commits into from
Jul 9, 2020
Merged

Allow from 0 to 5 preheat setups (bugfix) #18488

merged 58 commits into from
Jul 9, 2020

Commits on Jul 1, 2020

  1. Allow from 0 to 5 preheats setup 

    This will complete "more than 2" preheats integration
Fix also #18450
    @GMagician
    GMagician committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    455ea93 View commit details
    Browse the repository at this point in the history

  2. Fix Japanese typo

    @GMagician
    GMagician committed Jul 1, 2020
    Configuration menu
    Copy the full SHA
    c739649 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2020

  1. Update language_an.h

    @thinkyhead
    thinkyhead authored Jul 3, 2020
    Configuration menu
    Copy the full SHA
    5eaee87 View commit details
    Browse the repository at this point in the history

  2. Update language_bg.h

    @thinkyhead
    thinkyhead authored Jul 3, 2020
    Configuration menu
    Copy the full SHA
    c72eda5 View commit details
    Browse the repository at this point in the history

  3. Fix spacing with regex

    @thinkyhead
    thinkyhead committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    ebb09a3 View commit details
    Browse the repository at this point in the history

  4. And more strings

    @thinkyhead
    thinkyhead committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    ec0970e View commit details
    Browse the repository at this point in the history

  5. Update menu_configuration.cpp

    @thinkyhead
    thinkyhead authored Jul 3, 2020
    Configuration menu
    Copy the full SHA
    0285052 View commit details
    Browse the repository at this point in the history

  6. Simplify setting preset temps 

    Add an I parameter to M104, M106, M109, M140, and M190 so temperatures can be set from presets.
    @thinkyhead
    thinkyhead committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    a665662 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'allow-more-than-2-preheat-options' of https://github.co… 

    …m/GMagician/Marlin into pr/18488
    @thinkyhead
    thinkyhead committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    3a14706 View commit details
    Browse the repository at this point in the history

  8. Update comments, preset

    @thinkyhead
    thinkyhead committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    1779389 View commit details
    Browse the repository at this point in the history

  9. Use indexed presets

    @thinkyhead
    thinkyhead authored Jul 3, 2020
    Configuration menu
    Copy the full SHA
    3771f40 View commit details
    Browse the repository at this point in the history

  10. Update language_zh_TW.h

    @thinkyhead
    thinkyhead authored Jul 3, 2020
    Configuration menu
    Copy the full SHA
    234f60f View commit details
    Browse the repository at this point in the history

  11. Update language_test.h

    @thinkyhead
    thinkyhead authored Jul 3, 2020
    Configuration menu
    Copy the full SHA
    6ee8c31 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2020

  1. Add ultralcd include

    @thinkyhead
    thinkyhead committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    0a9fd17 View commit details
    Browse the repository at this point in the history

  2. Add G26 I for material preset

    @thinkyhead
    thinkyhead committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    1e56659 View commit details
    Browse the repository at this point in the history

  3. Fewer boolies

    @thinkyhead
    thinkyhead committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    2f23a6f View commit details
    Browse the repository at this point in the history

  4. Fix a typo

    @thinkyhead
    thinkyhead committed Jul 4, 2020
    Configuration menu
    Copy the full SHA
    d630405 View commit details
    Browse the repository at this point in the history

  5. Uniform define argument

    @GMagician
    GMagician authored Jul 4, 2020
    Configuration menu
    Copy the full SHA
    0e1d31e View commit details
    Browse the repository at this point in the history

  6. enforce base 0 argument

    @GMagician
    GMagician authored Jul 4, 2020
    Configuration menu
    Copy the full SHA
    f30dc31 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2020

  1. Update M140_M190.cpp

    @thinkyhead
    thinkyhead authored Jul 6, 2020
    Configuration menu
    Copy the full SHA
    c6f843f View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2020

  1. String list substitution

    @thinkyhead
    thinkyhead committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    07295ac View commit details
    Browse the repository at this point in the history

  2. Remove unused messages

    @GMagician
    GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    1936c7f View commit details
    Browse the repository at this point in the history

  3. Revert "Remove unused messages" 

    This reverts commit 1936c7f.
    @GMagician
    GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    2406047 View commit details
    Browse the repository at this point in the history

  4. Remove duplicated if test

    @GMagician
    GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    edfc821 View commit details
    Browse the repository at this point in the history

  5. Update some languages

    @GMagician
    GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    4bbcb16 View commit details
    Browse the repository at this point in the history

  6. Allow from 0 to 5 preheats setup 

    This will complete "more than 2" preheats integration
Fix also #18450
    @GMagician
    GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    aa20f99 View commit details
    Browse the repository at this point in the history

  7. Fix Japanese typo

    @GMagician
    GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    39e868a View commit details
    Browse the repository at this point in the history

  8. Update language_an.h

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    88948be View commit details
    Browse the repository at this point in the history

  9. Update language_bg.h

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    18c65d5 View commit details
    Browse the repository at this point in the history

  10. Fix spacing with regex

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    691c5e0 View commit details
    Browse the repository at this point in the history

  11. And more strings

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    3e21775 View commit details
    Browse the repository at this point in the history

  12. Simplify setting preset temps 

    Add an I parameter to M104, M106, M109, M140, and M190 so temperatures can be set from presets.
    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    7ddb310 View commit details
    Browse the repository at this point in the history

  13. Update menu_configuration.cpp

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    032e5c8 View commit details
    Browse the repository at this point in the history

  14. Update comments, preset

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    acd7283 View commit details
    Browse the repository at this point in the history

  15. Use indexed presets

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    9324190 View commit details
    Browse the repository at this point in the history

  16. Update language_zh_TW.h

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    e123f68 View commit details
    Browse the repository at this point in the history

  17. Update language_test.h

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    24500d9 View commit details
    Browse the repository at this point in the history

  18. Add ultralcd include

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    9bdc6fa View commit details
    Browse the repository at this point in the history

  19. Add G26 I for material preset

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    9fa060e View commit details
    Browse the repository at this point in the history

  20. Fewer boolies

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    55ae371 View commit details
    Browse the repository at this point in the history

  21. Fix a typo

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    b474e12 View commit details
    Browse the repository at this point in the history

  22. Uniform define argument

    @GMagician
    GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    f57afd5 View commit details
    Browse the repository at this point in the history

  23. enforce base 0 argument

    @GMagician
    GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    c5c2967 View commit details
    Browse the repository at this point in the history

  24. Update M140_M190.cpp

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    98239df View commit details
    Browse the repository at this point in the history

  25. String list substitution

    @thinkyhead @GMagician
    thinkyhead authored and GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    5992173 View commit details
    Browse the repository at this point in the history

  26. Remove unused messages

    @GMagician
    GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    601fc3b View commit details
    Browse the repository at this point in the history

  27. Revert "Remove unused messages" 

    This reverts commit 1936c7f.
    @GMagician
    GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    04ca1b8 View commit details
    Browse the repository at this point in the history

  28. Remove duplicated if test

    @GMagician
    GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    fb0a68d View commit details
    Browse the repository at this point in the history

  29. Update some languages

    @GMagician
    GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    5a7b91d View commit details
    Browse the repository at this point in the history

  30. Fix new messages display

    @GMagician
    GMagician committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    301e05b View commit details
    Browse the repository at this point in the history

  31. Simpler array

    @thinkyhead
    thinkyhead committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    45e6f45 View commit details
    Browse the repository at this point in the history

  32. Merge commit '301e05b' into pr/18488

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

  33. Prevent endless loop, add continue

    @thinkyhead
    thinkyhead committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    09a6b2f View commit details
    Browse the repository at this point in the history

  34. Patch and clean up macros

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

  35. Move fonts info to lcdprint.h, with dummy

    @thinkyhead
    thinkyhead committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    9be26d7 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2020

  1. char char center char

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

  2. More macro cleanup

    @thinkyhead
    thinkyhead committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    74378f5 View commit details
    Browse the repository at this point in the history

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

    @thinkyhead
    thinkyhead committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    90532d7 View commit details
    Browse the repository at this point in the history