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

M110 and M29 rework #3108

Merged
merged 1 commit into from
Mar 8, 2016
Merged

M110 and M29 rework #3108

merged 1 commit into from
Mar 8, 2016

Conversation

AnHardt
Copy link
Member

@AnHardt AnHardt commented Mar 7, 2016

Add 'ok' output for M29 actually closing the file.
M29 now with ADVANCED_OK, if defined.
Handle M110 when received without linenumber/checksum.

Tested with Octoprint 1.2.9, RH V1.6.1, Pronterface 03-Feb-2015.

Proposal for a fix of #3055

Add 'ok' output for G29 actually closing the file.
Handle M110 when received without linenumber/checksumm.
@AnHardt AnHardt changed the title M110 ang M29 rework M110 and M29 rework Mar 7, 2016
@AnHardt
Copy link
Member Author

AnHardt commented Mar 8, 2016

   M110       -> ok    -> next line unchanged
   M110 Nx    -> ok    -> next line = x+1
Ny M110    *c -> ok    -> next line = y+1
Ny M110 Nx *c -> ok    -> next line = x+1
My M110    *w -> error -> next line unchanged // checksum mismatch, Last Line:
My M110 Nx *w -> error -> next line unchanged // checksum mismatch, Last Line:
My M110       -> error -> next line unchanged // No Checksum with line number, Last Line:
My M110 Nx    -> error -> next line unchanged // No Checksum with line number, Last Line:
   M110    *c -> error -> next line unchanged // No Line Number with checksum, Last Line:
   M110 Nx *c -> error -> next line unchanged // No Line Number with checksum, Last Line:

@thinkyhead
Copy link
Member

In our discussion on #3055 we both generally concluded that complaints about M29 are probably now outmoded. You can double-check, but I'm pretty sure that M29 is already fine and already sends "ok" because it goes through the normal command processor in process_next_command, it is recognized by the switch(), and it does fall through to the end where process_next_command calls ok_to_send().

@Blue-Marlin
Copy link
Contributor

@thinkyhead

if (M110) {
  char* n2pos = strchr(command + 4, 'N');
  if (n2pos) {
    npos = n2pos;
    *npos = '\0'; // don't process this 'N' again!
  }
}

would ruin the checksum.

@thinkyhead
Copy link
Member

@Blue-Marlin Yes, I figured that out a while ago.

thinkyhead added a commit that referenced this pull request Mar 8, 2016
@thinkyhead thinkyhead merged commit b7928a0 into MarlinFirmware:RCBugFix Mar 8, 2016
@AnHardt AnHardt deleted the M110+ branch March 10, 2016 14:31
@jbrazio jbrazio modified the milestone: 1.1.0 Jul 18, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants