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

Attempt to resolve #1568 and add basic escape character support #1570

Merged
merged 3 commits into from
Mar 6, 2015

Conversation

C-o-r-E
Copy link
Contributor

@C-o-r-E C-o-r-E commented Mar 5, 2015

This is to fix #1568 regarding use of a colon. I've also modified the routine to allow for escaped characters.

Extra testing apreciated ;-]

C-o-r-E and others added 3 commits March 5, 2015 15:22
  * "G1 X1 ; test" was not executing "G1 X1" due to never leaving comment mode.
  * "M117 Hello \;)" printed "Hello \" to the display due to not replacing serial_char properly.

Tested with the following commands:
    * M117 Hello ; test => displays "Hello" on display, ignores "test"
    * G1 X1 ; foo => moves 1mm in X, ignores "foo"
    * ; test => completely ignored, not even acknowledged
    * M117 Hello \;) => displays "Hello ;)" on display
    * M117 Hello \\;) => displays "Hello \" on display, ignores ")"
In-line comments and escaping fixed by foosel
@foosel
Copy link
Contributor

foosel commented Mar 5, 2015

Tested with the following commands:

  • M117 Hello ; test => displays "Hello" on display, ignores "test"
  • G1 X1 ; foo => moves 1mm in X, ignores "foo"
  • ; test => completely ignored, not even acknowledged
  • M117 Hello \;) => displays "Hello ;)" on display
  • M117 Hello \\;) => displays "Hello " on display, ignores ")"

Also M117 foo : bar isn't magically turned into two commands anymore (original issue described in #1568)

@thinkyhead
Copy link
Member

Very good catch & fix. This will be merged very soon, after I give it a test run also!

thinkyhead added a commit that referenced this pull request Mar 6, 2015
Fixes gCode handling of comments and escaped characters
@thinkyhead thinkyhead merged commit 254970c into MarlinFirmware:Development Mar 6, 2015
joaquin-herrero pushed a commit to bq/Marlin that referenced this pull request Nov 27, 2015
…e character support MarlinFirmware#1570 from upstream Marlin.

Related commits:

	'99fb1bc' by C-o-r-E
	'63b62d8' by foosel
	'ba27f90' by C-o-r-E
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

Successfully merging this pull request may close these issues.

3 participants