Skip to content

Commit

Permalink
M2 and M30 do not pause workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
@MitchBradley
MitchBradley committed Dec 25, 2017
1 parent 80739ef commit 97d778d
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 64 deletions.
20 changes: 4 additions & 16 deletions src/app/controllers/Grbl/GrblController.js
View file
Expand Up @@ -194,20 +194,14 @@ class GrblController {
const data = parser.parseLine(line, { flatten: true });
const words = ensureArray(data.words);

{ // Program Mode: M0, M1, M2, M30
const programMode = _.intersection(words, ['M0', 'M1', 'M2', 'M30'])[0];
{ // Program Mode: M0, M1
const programMode = _.intersection(words, ['M0', 'M1'])[0];
if (programMode === 'M0') {
log.debug('M0 Program Pause');
this.feeder.hold({ data: 'M0' }); // Hold reason
} else if (programMode === 'M1') {
log.debug('M1 Program Pause');
this.feeder.hold({ data: 'M1' }); // Hold reason
} else if (programMode === 'M2') {
log.debug('M2 Program End');
this.feeder.hold({ data: 'M2' }); // Hold reason
} else if (programMode === 'M30') {
log.debug('M30 Program End');
this.feeder.hold({ data: 'M30' }); // Hold reason
}
}

Expand Down Expand Up @@ -279,20 +273,14 @@ class GrblController {
const data = parser.parseLine(line, { flatten: true });
const words = ensureArray(data.words);

{ // Program Mode: M0, M1, M2, M30
const programMode = _.intersection(words, ['M0', 'M1', 'M2', 'M30'])[0];
{ // Program Mode: M0, M1
const programMode = _.intersection(words, ['M0', 'M1'])[0];
if (programMode === 'M0') {
log.debug(`M0 Program Pause: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M0' });
} else if (programMode === 'M1') {
log.debug(`M1 Program Pause: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M1' });
} else if (programMode === 'M2') {
log.debug(`M2 Program End: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M2' });
} else if (programMode === 'M30') {
log.debug(`M30 Program End: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M30' });
}
}

Expand Down
20 changes: 4 additions & 16 deletions src/app/controllers/Marlin/MarlinController.js
View file
Expand Up @@ -368,20 +368,14 @@ class MarlinController {
this.feeder.hold({ data: 'M190' }); // Hold reason
}

{ // Program Mode: M0, M1, M2, M30
const programMode = _.intersection(words, ['M0', 'M1', 'M2', 'M30'])[0];
{ // Program Mode: M0, M1
const programMode = _.intersection(words, ['M0', 'M1'])[0];
if (programMode === 'M0') {
log.debug('M0 Program Pause');
this.feeder.hold({ data: 'M0' }); // Hold reason
} else if (programMode === 'M1') {
log.debug('M1 Program Pause');
this.feeder.hold({ data: 'M1' }); // Hold reason
} else if (programMode === 'M2') {
log.debug('M2 Program End');
this.feeder.hold({ data: 'M2' }); // Hold reason
} else if (programMode === 'M30') {
log.debug('M30 Program End');
this.feeder.hold({ data: 'M30' }); // Hold reason
}
}

Expand Down Expand Up @@ -467,20 +461,14 @@ class MarlinController {
this.sender.hold(reason); // Hold reason
}

{ // Program Mode: M0, M1, M2, M30
const programMode = _.intersection(words, ['M0', 'M1', 'M2', 'M30'])[0];
{ // Program Mode: M0, M1
const programMode = _.intersection(words, ['M0', 'M1'])[0];
if (programMode === 'M0') {
log.debug(`M0 Program Pause: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M0' });
} else if (programMode === 'M1') {
log.debug(`M1 Program Pause: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M1' });
} else if (programMode === 'M2') {
log.debug(`M2 Program End: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M2' });
} else if (programMode === 'M30') {
log.debug(`M30 Program End: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M30' });
}
}

Expand Down
20 changes: 4 additions & 16 deletions src/app/controllers/Smoothie/SmoothieController.js
View file
Expand Up @@ -167,20 +167,14 @@ class SmoothieController {
const data = parser.parseLine(line, { flatten: true });
const words = ensureArray(data.words);

{ // Program Mode: M0, M1, M2, M30
const programMode = _.intersection(words, ['M0', 'M1', 'M2', 'M30'])[0];
{ // Program Mode: M0, M1
const programMode = _.intersection(words, ['M0', 'M1'])[0];
if (programMode === 'M0') {
log.debug('M0 Program Pause');
this.feeder.hold({ data: 'M0' }); // Hold reason
} else if (programMode === 'M1') {
log.debug('M1 Program Pause');
this.feeder.hold({ data: 'M1' }); // Hold reason
} else if (programMode === 'M2') {
log.debug('M2 Program End');
this.feeder.hold({ data: 'M2' }); // Hold reason
} else if (programMode === 'M30') {
log.debug('M30 Program End');
this.feeder.hold({ data: 'M30' }); // Hold reason
}
}

Expand Down Expand Up @@ -249,20 +243,14 @@ class SmoothieController {
const data = parser.parseLine(line, { flatten: true });
const words = ensureArray(data.words);

{ // Program Mode: M0, M1, M2, M30
const programMode = _.intersection(words, ['M0', 'M1', 'M2', 'M30'])[0];
{ // Program Mode: M0, M1
const programMode = _.intersection(words, ['M0', 'M1'])[0];
if (programMode === 'M0') {
log.debug(`M0 Program Pause: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M0' });
} else if (programMode === 'M1') {
log.debug(`M1 Program Pause: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M1' });
} else if (programMode === 'M2') {
log.debug(`M2 Program End: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M2' });
} else if (programMode === 'M30') {
log.debug(`M30 Program End: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M30' });
}
}

Expand Down
20 changes: 4 additions & 16 deletions src/app/controllers/TinyG/TinyGController.js
View file
Expand Up @@ -166,20 +166,14 @@ class TinyGController {
const data = parser.parseLine(line, { flatten: true });
const words = ensureArray(data.words);

{ // Program Mode: M0, M1, M2, M30
const programMode = _.intersection(words, ['M0', 'M1', 'M2', 'M30'])[0];
{ // Program Mode: M0, M1
const programMode = _.intersection(words, ['M0', 'M1'])[0];
if (programMode === 'M0') {
log.debug('M0 Program Pause');
this.feeder.hold({ data: 'M0' }); // Hold reason
} else if (programMode === 'M1') {
log.debug('M1 Program Pause');
this.feeder.hold({ data: 'M1' }); // Hold reason
} else if (programMode === 'M2') {
log.debug('M2 Program End');
this.feeder.hold({ data: 'M2' }); // Hold reason
} else if (programMode === 'M30') {
log.debug('M30 Program End');
this.feeder.hold({ data: 'M30' }); // Hold reason
}
}

Expand Down Expand Up @@ -247,20 +241,14 @@ class TinyGController {
const data = parser.parseLine(line, { flatten: true });
const words = ensureArray(data.words);

{ // Program Mode: M0, M1, M2, M30
const programMode = _.intersection(words, ['M0', 'M1', 'M2', 'M30'])[0];
{ // Program Mode: M0, M1
const programMode = _.intersection(words, ['M0', 'M1'])[0];
if (programMode === 'M0') {
log.debug(`M0 Program Pause: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M0' });
} else if (programMode === 'M1') {
log.debug(`M1 Program Pause: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M1' });
} else if (programMode === 'M2') {
log.debug(`M2 Program End: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M2' });
} else if (programMode === 'M30') {
log.debug(`M30 Program End: line=${sent + 1}, sent=${sent}, received=${received}`);
this.workflow.pause({ data: 'M30' });
}
}

Expand Down

0 comments on commit 97d778d

Please sign in to comment.