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.

Sign up for GitHub

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

Jump to bottom

Updated Marlin Buffer - works with Marlin / Smoothie and Repetier Now #3

Merged
merged 1 commit into from Apr 4, 2016
Merged

Updated Marlin Buffer - works with Marlin / Smoothie and Repetier Now #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions bufferflow_marlin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ func (b *BufferflowMarlin) OnIncomingData(data string) {

//Check for report output, compare to last report output, if different return to client to update status; otherwise ignore status.
} else if b.rpt.MatchString(element) {
if element == b.LastStatus {
log.Println("Marlin status has not changed, not reporting to client")
continue //skip this element as the cnc position has not changed, and move on to the next element.
}
//if element == b.LastStatus {
// log.Println("Marlin status has not changed, not reporting to client")
// continue //skip this element as the cnc position has not changed, and move on to the next element.
//}

b.LastStatus = element //if we make it here something has changed with the status string and laststatus needs updating
}
Expand Down Expand Up @@ -378,7 +378,7 @@ func (b *BufferflowMarlin) rptQueryLoop(p *serport) {
select {
case <-ticker.C:

n2, err := p.portIo.Write([]byte("M114"))
n2, err := p.portIo.Write([]byte("M114\n"))

log.Print("Just wrote ", n2, " bytes to serial: M114")

Expand Down