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

Move DWIN_CompletedLeveling() to within the IF HAS_MESH #22851

Merged
merged 4 commits into from
Sep 29, 2021
Merged

Move DWIN_CompletedLeveling() to within the IF HAS_MESH #22851

merged 4 commits into from
Sep 29, 2021

Commits on Sep 28, 2021

  1. Move DWIN_CompletedLeveling() to within the IF HAS_MESH 

    Should fix:

```
Marlin/src/lcd/e3v2/enhanced/dwin.cpp: In function 'void DWIN_CompletedLeveling()':
Marlin/src/lcd/e3v2/enhanced/dwin.cpp:1668:33: error: 'DWIN_MeshViewer' was not declared in this scope; did you mean 'ICON_MeshViewer'?
 1668 | void DWIN_CompletedLeveling() { DWIN_MeshViewer(); }
      |                                 ^~~~~~~~~~~~~~~
      |                                 ICON_MeshViewer
*** [.pio/build/STM32F103RET6_creality/src/src/lcd/e3v2/enhanced/dwin.cpp.o] Error 1
```
    @CRCinAU
    CRCinAU authored Sep 28, 2021
    Configuration menu
    Copy the full SHA
    55344b5 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2021

  1. Merge 'upstream/bugfix-2.0.x' into pr/22851

    @thinkyhead
    thinkyhead committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    9a2f1cb View commit details
    Browse the repository at this point in the history

  2. Restore DWIN_CompletedLeveling

    @thinkyhead
    thinkyhead committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    93565cd View commit details
    Browse the repository at this point in the history

  3. Revert some JyersUI strings

    @thinkyhead
    thinkyhead committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    b3c4d9b View commit details
    Browse the repository at this point in the history