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

Fix macro expansion error when using ProUI #24064

Merged
merged 3 commits into from
Apr 22, 2022
Merged

Fix macro expansion error when using ProUI #24064

merged 3 commits into from
Apr 22, 2022

Commits on Apr 21, 2022

  1. Fix macro expansion error when using ProUI 

    Fixes compilation error with DWIN_LCD_PROUI enabled:
Marlin\src\module\../lcd/e3v2/proui/dwin_defines.h:141:37: error: token "." is not valid in preprocessor expressions
  141 |   #define LEVELING_BED_TEMP HMI_data.BedLevT
      |                                     ^
Marlin\src\module\probe.cpp:383:48: note: in expansion of macro 'LEVELING_BED_TEMP'
  383 |     #if HAS_HEATED_BED && (PROBING_BED_TEMP || LEVELING_BED_TEMP)
      |                                                ^~~~~~~~~~~~~~~~~
    @mkleina
    mkleina authored Apr 21, 2022
    Configuration menu
    Copy the full SHA
    6269166 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2022

  1. ProUI special case

    @thinkyhead
    thinkyhead committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    16098c4 View commit details
    Browse the repository at this point in the history

  2. Also simplify JyersUI

    @thinkyhead
    thinkyhead committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    68a6550 View commit details
    Browse the repository at this point in the history