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.

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

Fix the compile error with the case light menu #26976

Merged

Conversation

javlonsodikov
Copy link
Contributor

Fix the error with the case light menu

Description

Fix the error with the case light menu

Requirements

no

Benefits

fix issue with

Compiling .pio\build\LPC1768\src\src\module\settings.cpp.o
In file included from Marlin\src\lcd\e3v2\proui\dwin.cpp:35:
Marlin\src\lcd\e3v2\proui\dwin.cpp: In function 'void drawControlMenu()':
Marlin\src\lcd\e3v2\proui\menus.h:60:60: error: no matching function for call to 'menuItemAdd(int, FSTR_P, <unresolved overloaded function type>, void (&)(), bool*)'
   60 | #define MENU_ITEM(I,L,V...) menuItemAdd(I, GET_TEXT_F(L), V)
      |                                                            ^
Marlin\src\lcd\e3v2\proui\dwin.cpp:3207:9: note: in expansion of macro 'MENU_ITEM'
 3207 |         MENU_ITEM(ICON_CaseLight, MSG_CASE_LIGHT, onDrawChkbMenu, setCaseLight, &caselight.on);
      |         ^~~~~~~~~
In file included from Marlin\src\lcd\e3v2\proui\dwin.cpp:35:
Marlin\src\lcd\e3v2\proui\menus.h:205:17: note: candidate: 'CustomMenuItem* menuItemAdd(OnDrawItem, OnClickItem)'
  205 | CustomMenuItem* menuItemAdd(OnDrawItem ondraw=nullptr, OnClickItem onclick=nullptr);
      |                 ^~~~~~~~~~~
Marlin\src\lcd\e3v2\proui\menus.h:205:17: note:   candidate expects 2 arguments, 5 provided
Marlin\src\lcd\e3v2\proui\menus.h:206:11: note: candidate: 'MenuItem* menuItemAdd(uint8_t, const char*, OnDrawItem, OnClickItem)'
  206 | MenuItem* menuItemAdd(uint8_t cicon, const char * const text=nullptr, OnDrawItem ondraw=nullptr, OnClickItem onclick=nullptr);
      |           ^~~~~~~~~~~
Marlin\src\lcd\e3v2\proui\menus.h:206:11: note:   candidate expects 4 arguments, 5 provided
Marlin\src\lcd\e3v2\proui\menus.h:207:18: note: candidate: 'MenuItem* menuItemAdd(uint8_t, FSTR_P, OnDrawItem, OnClickItem)'
  207 | inline MenuItem* menuItemAdd(uint8_t cicon, FSTR_P text=nullptr, OnDrawItem ondraw=nullptr, OnClickItem onclick=nullptr) {
      |                  ^~~~~~~~~~~
Marlin\src\lcd\e3v2\proui\menus.h:207:18: note:   candidate expects 4 arguments, 5 provided
Marlin\src\lcd\e3v2\proui\menus.h:210:11: note: candidate: 'MenuItem* menuItemAdd(uint8_t, uint8_t, uint16_t, uint16_t, uint16_t, uint16_t, OnDrawItem, OnClickItem)'
  210 | MenuItem* menuItemAdd(uint8_t cicon, uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, OnDrawItem ondraw=nullptr, OnClickItem onclick=nullptr);

Configurations

Configurations.zip

Related Issues

bugfix with proui caselight

javlonsodikov and others added 2 commits April 17, 2024 08:12
Fix the compile error with the case light menu
@sjasonsmith
Copy link
Contributor

Thanks for the patch @javlonsodikov. I went ahead and modified one of our compilation tests so that it fails without your change, which should help prevent regression in this area in the future.

@sjasonsmith sjasonsmith merged commit 07ebb81 into MarlinFirmware:bugfix-2.1.x Apr 17, 2024
62 checks passed
blu28 added a commit to blu28/Marlin-blu that referenced this pull request Apr 20, 2024
commit 02ba6f9
Author: thinkyhead <[email protected]>
Date:   Fri Apr 19 00:21:25 2024 +0000

    [cron] Bump distribution date (2024-04-19)

commit dba0010
Author: Andrew <[email protected]>
Date:   Thu Apr 18 19:04:03 2024 -0400

    🎨 Rename some G-code files (MarlinFirmware#26981)

commit 90667f6
Author: I3DBeeTech <[email protected]>
Date:   Fri Apr 19 02:24:17 2024 +0530

    🐛 Fix BLACKBEEZMINI fan, info (MarlinFirmware#26983)

commit d6961b2
Author: thinkyhead <[email protected]>
Date:   Wed Apr 17 06:06:51 2024 +0000

    [cron] Bump distribution date (2024-04-17)

commit 07ebb81
Author: Javlon Sodikov <[email protected]>
Date:   Wed Apr 17 10:25:22 2024 +0500

    🩹Fix ProUI error when !CASELIGHT_USES_BRIGHTNESS (MarlinFirmware#26976)

    * Fix the compile error with the case light menu

    Fix the compile error with the case light menu

    * Add failing test

    ---------

    Co-authored-by: Jason Smith <[email protected]>

commit 245db73
Author: thinkyhead <[email protected]>
Date:   Tue Apr 16 18:06:16 2024 +0000

    [cron] Bump distribution date (2024-04-16)

commit 9342dae
Author: Scott Lahteine <[email protected]>
Date:   Tue Apr 16 12:17:47 2024 -0500

    📝 Remove dead PDF links

commit 1f84f50
Author: thinkyhead <[email protected]>
Date:   Mon Apr 15 02:38:10 2024 +0000

    [cron] Bump distribution date (2024-04-15)

commit 3326c74
Author: Scott Lahteine <[email protected]>
Date:   Sun Apr 14 16:26:16 2024 -0500

    📝 Minor README changes

commit 0269106
Author: Scott Lahteine <[email protected]>
Date:   Sun Apr 14 16:24:14 2024 -0500

    🎨 Dagoma D6 followup

commit 95d38a8
Author: Sophist <[email protected]>
Date:   Sun Apr 14 21:04:52 2024 +0100

    ✨ Add Dagoma D6 as found in DiscoUltimate v2 TMC (MarlinFirmware#26874)

    * Add Dagoma D6 board as used in their DiscoUltimate v2 TMC.

    Taken from the Dagoma fork of Marlin DU_MC branch where it is called FYSETC_DAGOMA_F5 and explicitly confirmed by Dagoma as being the D6:

    "the BOARD_FYSETC_DAGOMA_F5 is effectively the definition for the D6"

    ---------

    Co-authored-by: thisiskeithb <[email protected]>
    Co-authored-by: Orel <[email protected]>

commit dca6afc
Author: Chris <[email protected]>
Date:   Sun Apr 14 20:42:57 2024 +0200

    ✨🐛 HC32 - Add SERIAL_DMA, fix SDIO and MEATPACK (MarlinFirmware#26845)

    * fix meatpack on hc32

    * add support for SERIAL_DMA on HC32

    * add additional checks in HC32 HAL

    * migrate HC32 HAL to use app_config.h

    * fix memory leak in HC32 sdio HAL
    MarlinFirmware#26845 (comment)

    * hc32: fail if both EMERGENCY_PARSER and SERIAL_DMA are enabled

commit 19684f2
Author: Jason Smith <[email protected]>
Date:   Sat Apr 13 17:49:08 2024 -0700

    ✅ Add unit tests for macros.h (MarlinFirmware#26968)

commit 52a5613
Author: Keith Bennett <[email protected]>
Date:   Sat Apr 13 17:47:16 2024 -0700

    ⏪️ Revert unintended README changes (MarlinFirmware#26967)

    * Revert all the changes that went in with the unit test framework
    This restored broken links and other changes. Restoring to the prior revision seems the most appropriate action until the intentions of those file changes are known.
    ---------

    Co-authored-by: Jason Smith <[email protected]>

commit 0683e8a
Author: thinkyhead <[email protected]>
Date:   Sun Apr 14 00:24:15 2024 +0000

    [cron] Bump distribution date (2024-04-14)

commit 1bb4a04
Author: Jason Smith <[email protected]>
Date:   Sat Apr 13 14:11:51 2024 -0700

    ✅Unit test improvements (MarlinFirmware#26965)

    * Do not warn about display in unit tests

    * Treat warnings as errors in unit tests

    * Report actual filenames with unit tests

commit d10861e
Author: Jason Smith <[email protected]>
Date:   Sat Apr 13 12:06:08 2024 -0700

    ✅ Add unit testing framework (MarlinFirmware#26948)

    - Add a framework to build and execute unit tests for Marlin.
    - Enable unit test execution as part of PR checks.

    ---------

    Co-authored-by: Costas Basdekis <[email protected]>
    Co-authored-by: Scott Lahteine <[email protected]>

commit cf7c86d
Author: Andrew <[email protected]>
Date:   Sat Apr 13 14:59:59 2024 -0400

    🔧Fix M936 in features.ini (MarlinFirmware#26957)

commit d99e150
Author: David Buezas <[email protected]>
Date:   Sat Apr 13 18:54:25 2024 +0200

    ⚡️Reduce DISPLAY_SLEEP_MINUTES overhead (MarlinFirmware#26964)
RPGFabi pushed a commit to RPGFabi/Marlin that referenced this pull request Jun 15, 2024
* Fix the compile error with the case light menu

Fix the compile error with the case light menu

* Add failing test

---------

Co-authored-by: Jason Smith <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants