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

Official Marlin and mrisoc version dropped EITHER and BOTH macros #11

Open
laugmanuel opened this issue Aug 27, 2023 · 0 comments
Open

Comments

@laugmanuel
Copy link

This commit: MarlinFirmware/Marlin@2691167 removed the EITHER and BOTH macros still used in the files provided in this repo.

Also, a lot of other things changed which breaks the compile with at least:

In file included from c:\users\user\desktop\ender3v2s1-20230805\marlin\src\inc\MarlinConfigPre.h:39,
                 from c:\users\user\desktop\ender3v2s1-20230805\marlin\src\inc\marlinconfig.h:28,
                 from buildroot/share/PlatformIO/scripts/common-dependencies.h:29:
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration.h:972:11: error: missing binary operator before token "("
  972 | #if EITHER(MORGAN_SCARA, MP_SCARA)
      |           ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration.h:1828:11: error: missing binary operator before token "("
 1828 | #if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
      |           ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration.h:2024:11: error: missing binary operator before token "("
 2024 | #if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
      |           ^
In file included from c:\users\user\desktop\ender3v2s1-20230805\marlin\src\inc\MarlinConfigPre.h:39,
                 from c:\users\user\desktop\ender3v2s1-20230805\marlin\src\inc\marlinconfig.h:28,
                 from buildroot/share/PlatformIO/scripts/common-dependencies.h:29:
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration.h:3098:11: error: missing binary operator before token "("
 3098 | #if EITHER(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON)
      |           ^
In file included from c:\users\user\desktop\ender3v2s1-20230805\marlin\src\inc\MarlinConfigPre.h:39,
                 from c:\users\user\desktop\ender3v2s1-20230805\marlin\src\inc\marlinconfig.h:28,
                 from buildroot/share/PlatformIO/scripts/common-dependencies.h:29:
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration.h:3414:11: error: missing binary operator before token "("
 3414 | #if EITHER(RGB_LED, RGBW_LED)
      |           ^
In file included from c:\users\user\desktop\ender3v2s1-20230805\marlin\src\inc\MarlinConfigPre.h:56,
                 from c:\users\user\desktop\ender3v2s1-20230805\marlin\src\inc\marlinconfig.h:28,
                 from buildroot/share/PlatformIO/scripts/common-dependencies.h:29:
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration_adv.h:310:46: error: missing binary operator before token "("
  310 |   #if ENABLED(ADAPTIVE_FAN_SLOWING) && EITHER(MPCTEMP, PIDTEMP)
      |                                              ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration_adv.h:1091:11: error: missing binary operator before token "("
 1091 | #if EITHER(INPUT_SHAPING_X, INPUT_SHAPING_Y)
      |           ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration_adv.h:1324:11: error: missing binary operator before token "("
 1324 | #if EITHER(DIGIPOT_MCP4018, DIGIPOT_MCP4451)
      |           ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration_adv.h:1382:28: error: missing binary operator before token "("
 1382 | #if HAS_BED_PROBE && EITHER(HAS_MARLINUI_MENU, HAS_TFT_LVGL_UI)
      |                            ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration_adv.h:1444:15: error: missing binary operator before token "("
 1444 |     #if EITHER(HAS_MARLINUI_U8GLIB, TFT_COLOR_UI)
      |               ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration_adv.h:1499:11: error: missing binary operator before token "("
 1499 |   #if BOTH(M73_REPORT, SDSUPPORT)
      |           ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration_adv.h:1505:26: error: missing binary operator before token "("
 1505 | #if HAS_DISPLAY && EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
      |                          ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration_adv.h:2153:11: error: missing binary operator before token "("
 2153 | #if EITHER(AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
      |           ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration_adv.h:2188:11: error: missing binary operator before token "("
 2188 | #if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
      |           ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration_adv.h:2196:9: error: missing binary operator before token "("
 2196 | #if BOTH(AUTO_BED_LEVELING_UBL, EEPROM_SETTINGS)
      |         ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration_adv.h:2308:11: error: missing binary operator before token "("
 2308 | #if EITHER(ARC_SUPPORT, BEZIER_CURVE_SUPPORT)
      |           ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration_adv.h:2394:9: error: missing binary operator before token "("
 2394 | #if BOTH(SDSUPPORT, DIRECT_STEPPING)
      |         ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration_adv.h:3340:11: error: missing binary operator before token "("
 3340 | #if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
      |           ^
c:\users\user\desktop\ender3v2s1-20230805\marlin\configuration_adv.h:4088:11: error: missing binary operator before token "("
 4088 | #if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
      |           ^
In file included from c:\users\user\desktop\ender3v2s1-20230805\marlin\src\inc\MarlinConfigPre.h:66,
                 from c:\users\user\desktop\ender3v2s1-20230805\marlin\src\inc\marlinconfig.h:28,
                 from buildroot/share/PlatformIO/scripts/common-dependencies.h:29:
c:\users\user\desktop\ender3v2s1-20230805\marlin\src\lcd\e3v2\proui\dwin_defines.h:77:4: error: #error "HAS_GCODE_PREVIEW requires PROUI_EX."
   77 |   #error "HAS_GCODE_PREVIEW requires PROUI_EX."
      |    ^~~~~
c:\users\user\desktop\ender3v2s1-20230805\marlin\src\lcd\e3v2\proui\dwin_defines.h:80:4: error: #error "HAS_TOOLBAR requires PROUI_EX."
   80 |   #error "HAS_TOOLBAR requires PROUI_EX."
      |    ^~~~~
Error: Failed to parse Marlin features. See previous error messages.
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

No branches or pull requests

1 participant