Disable CR-adding when transferring files via XModem #528
Conversation
This file contains 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
The UART channel have the feature for adding extra CR on line feeds enabled which will break the XModem protocol. This fix will disable the extra CR adding and restore the setting after the file is sent.
FluidNC/src/ProcessSettings.cpp
Outdated
| @@ -644,8 +644,10 @@ static Error xmodem_send(const char* value, WebUI::AuthenticationLevel auth_leve | |||
| log_info("Cannot open " << value); | |||
| return Error::DownloadFailed; | |||
| } | |||
| bool prevAddCr = out.setCr(false); | |||
There was a problem hiding this comment.
How about changing the name to oldCr so it is the same as the corresponding code in xmodem_receive() ? With that change I will merge the change. Thanks for debugging it.
MitchBradley
pushed a commit
that referenced
this pull request
Aug 5, 2022
* Disable CR-adding when transferring files via XModem The UART channel have the feature for adding extra CR on line feeds enabled which will break the XModem protocol. This fix will disable the extra CR adding and restore the setting after the file is sent. * Changed variable name to be consistent with other code.
MitchBradley
pushed a commit
that referenced
this pull request
Aug 9, 2022
* Disable CR-adding when transferring files via XModem The UART channel have the feature for adding extra CR on line feeds enabled which will break the XModem protocol. This fix will disable the extra CR adding and restore the setting after the file is sent. * Changed variable name to be consistent with other code.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The UART channel have a feature for adding extra CR on line feeds enabled, which will break the XModem protocol. This fix will disable the extra CR adding and restore the setting after the file is sent.
It would be more sensible to toggle this in xmodem.cpp if this would be used in other places. But that function has multiple returns which makes it really hard and would require a bit of refactoring:
https://github.com/bdring/FluidNC/blob/main/FluidNC/src/xmodem.cpp#L243