Fix the USE_EMBEDDED_FILES build - #1261
Open
meeloo wants to merge 1 commit into
Open
Conversation
Pins_Duet3_MB6HC.h has always had a USE_EMBEDDED_FILES branch, but nothing builds it and on 3.7.0-beta.3 it does not compile: the TLS code in LwipEthernetInterface and WiFiInterface calls MassStorage::SecureDelete, which is declared only under HAS_MASS_STORAGE || HAS_SBC_INTERFACE - both of which USE_EMBEDDED_FILES turns off. Guarded those two blocks with the same condition the declaration uses. An embedded filesystem is read-only, so there is nothing to wipe and the reply now says so instead of the build failing. The normal Duet3_MB6HC build is byte-for-byte the same size afterwards (text 998468), so the guards are inert on that path.
|
All contributors have signed the CLA ✍️ ✅ |
Author
|
I have read the Duet3D CLA v2.0 and I hereby sign it |
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
1 participant
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.
Pins_Duet3_MB6HC.hhas always had aUSE_EMBEDDED_FILESbranch, but nothing builds it and on3.7-devit does not compile: the TLS code inLwipEthernetInterfaceandWiFiInterfacecallsMassStorage::SecureDelete, which is declared only underHAS_MASS_STORAGE || HAS_SBC_INTERFACE- both of whichUSE_EMBEDDED_FILESturns off.Guarded those two blocks with the same condition the declaration uses. An embedded filesystem is read-only, so there is nothing to wipe and the reply now says so instead of the build failing.
Duet3_MB6HCis byte-for-byte the same size afterwards, so the guards are inert on that path.Testing note: nothing upstream builds
USE_EMBEDDED_FILES, so this cannot be exercised without a build config for the embedded variant. I have one atmeeloo/RepRapFirmware:build/embedded-mb6hc-configand can open it as a separate PR, fold it into this one, or leave it out - whichever suits