add additional obsolete files to preflight test. - #27990
Merged
thinkyhead merged 1 commit intoAug 8, 2025
Merged
Conversation
thinkyhead
merged commit Aug 8, 2025
1244a21
into
MarlinFirmware:bugfix-2.1.x
130 of 131 checks passed
bsdnomad
pushed a commit
to bsdnomad/Marlin
that referenced
this pull request
Sep 25, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
A user decided to extract bugfix 2.1.x over Marlin 2.1.2.5 creating many code conflicts.
These are part of bugfix 2.1.x (note the u8g subdirectory)
\src\lcd\dogm\u8g\u8g_dev_ssd1306_sh1106_128x64_I2C.cpp
\src\lcd\dogm\u8g\u8g_dev_ssd1306_sh1106_128x64_SWSPI.cpp
\src\lcd\dogm\u8g\u8g_dev_ssd1309_12864.cpp
\src\lcd\dogm\u8g\u8g_dev_st7565_64128n_HAL.cpp
\src\lcd\dogm\u8g\u8g_dev_st7920_128x64_HAL.cpp
\src\lcd\dogm\u8g\u8g_dev_tft_upscale_from_128x64.cpp
\src\lcd\dogm\u8g\u8g_dev_uc1701_mini12864_HAL.cpp
\src\lcd\dogm\u8g\ultralcd_st7920_u8glib_rrd_AVR.cpp
These are part of 2.1.2.5
\src\lcd\dogm\u8g_dev_ssd1306_sh1106_128x64_I2C.cpp
\src\lcd\dogm\u8g_dev_ssd1309_12864.cpp
\src\lcd\dogm\u8g_dev_st7565_64128n_HAL.cpp
\src\lcd\dogm\u8g_dev_st7920_128x64_HAL.cpp
\src\lcd\dogm\u8g_dev_tft_upscale_from_128x64.cpp
\src\lcd\dogm\u8g_dev_uc1701_mini12864_HAL.cpp
\src\lcd\dogm\ultralcd_st7920_u8glib_rrd_AVR.cpp
the 2.1.2.5 files should not be part of bugfix
Added the 2.1.2.5 files to the existing preflight-checks.py to make sure the user deletes them from newer versions of Marlin.
Benefits
Code has a chance of building
Related Issues