Spi flash backup update#27934
Merged
thinkyhead merged 3 commits intoMarlinFirmware:bugfix-2.1.xfrom Jun 21, 2025
Merged
Conversation
thinkyhead
force-pushed
the
SPI_FLASH_BACKUP-update
branch
from
f3a8896 to
1a6fed6
Compare
thinkyhead
merged commit f1f9bb2
into
MarlinFirmware:bugfix-2.1.x
42 of 67 checks passed
Contributor
Author
* Conditionals-4-adv.h
* Conditionals set before pins.h and which depend on Configuration_adv.h.SPI_FLASH is set in the boards pins.h file This test does not work from Marlin/src/inc/Conditionals-4-adv.h And I verified it does not work. |
thinkyhead
pushed a commit
that referenced
this pull request
Jun 22, 2025
thinkyhead
pushed a commit
that referenced
this pull request
Jun 22, 2025
Crazy-Charles
pushed a commit
to Crazy-Charles/Marlin
that referenced
this pull request
Jun 28, 2025
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
The test for SPI_FLASH_BACKUP is in Marlin/src/inc/Conditionals-3-etc.h
#if ALL(SPI_FLASH, HAS_MEDIA, MARLIN_DEV_MODE)But SPI_FLASH is set in pins and MARLIN_DEV_MODE is set in Configuration_adv.h
These two are not set before Conditionals-3-etc.h is called.
Moved the test to Marlin/src/inc/Conditionals-5-post.h
Now the the test works as expected M993 and M994 cause a watchdog timout.
So watchdog_refresh was added.
Requirements
A board that has SPI flash (such as BOARD_MKS_ROBIN_NANO_V3_1
MARLIN_DEV_MODE to add M993 aand M994
SDSUPPORT required for these gcodes
Benefits
Builds and works as expected
Related Issues