commit
8988a887a4
|
@ -1308,6 +1308,12 @@ void Commands::processMCode(GCode *com)
|
||||||
UI_STATUS_UPD_RAM(com->text);
|
UI_STATUS_UPD_RAM(com->text);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 118: // M118 message to host
|
||||||
|
if(com->hasString())
|
||||||
|
{
|
||||||
|
Com::printFLN(com->text);
|
||||||
|
}
|
||||||
|
break;
|
||||||
case 119: // M119
|
case 119: // M119
|
||||||
Commands::waitUntilEndOfAllMoves();
|
Commands::waitUntilEndOfAllMoves();
|
||||||
#if (X_MIN_PIN > -1) && MIN_HARDWARE_ENDSTOP_X
|
#if (X_MIN_PIN > -1) && MIN_HARDWARE_ENDSTOP_X
|
||||||
|
|
|
@ -91,6 +91,7 @@ Custom M Codes
|
||||||
- M115- Capabilities string
|
- M115- Capabilities string
|
||||||
- M116 - Wait for all temperatures in a +/- 1 degree range
|
- M116 - Wait for all temperatures in a +/- 1 degree range
|
||||||
- M117 <message> - Write message in status row on lcd
|
- M117 <message> - Write message in status row on lcd
|
||||||
|
- M118 <message> - Write message to host
|
||||||
- M119 - Report endstop status
|
- M119 - Report endstop status
|
||||||
- M140 S<temp> F1 - Set bed target temp, F1 makes a beep when temperature is reached the first time
|
- M140 S<temp> F1 - Set bed target temp, F1 makes a beep when temperature is reached the first time
|
||||||
- M163 S<extruderNum> P<weight> - Set weight for this mixing extruder drive
|
- M163 S<extruderNum> P<weight> - Set weight for this mixing extruder drive
|
||||||
|
|
|
@ -665,7 +665,7 @@ bool GCode::parseAscii(char *line,bool fromSerial)
|
||||||
params |=2;
|
params |=2;
|
||||||
if(M > 255) params |= 4096;
|
if(M > 255) params |= 4096;
|
||||||
// handle non standard text arguments that some M codes have
|
// handle non standard text arguments that some M codes have
|
||||||
if (M == 23 || M == 28 || M == 29 || M == 30 || M == 32 || M == 117)
|
if (M == 23 || M == 28 || M == 29 || M == 30 || M == 32 || M == 117 || M == 118)
|
||||||
{
|
{
|
||||||
// after M command we got a filename or text
|
// after M command we got a filename or text
|
||||||
char digit;
|
char digit;
|
||||||
|
@ -683,7 +683,7 @@ bool GCode::parseAscii(char *line,bool fromSerial)
|
||||||
text = pos;
|
text = pos;
|
||||||
while (*pos)
|
while (*pos)
|
||||||
{
|
{
|
||||||
if((M != 117 && *pos==' ') || *pos=='*') break;
|
if((M != 117 && M != 20 && M != 118 && *pos==' ') || *pos=='*') break;
|
||||||
pos++; // find a space as file name end
|
pos++; // find a space as file name end
|
||||||
}
|
}
|
||||||
*pos = 0; // truncate filename by erasing space with nul, also skips checksum
|
*pos = 0; // truncate filename by erasing space with nul, also skips checksum
|
||||||
|
|
|
@ -2052,6 +2052,11 @@ void Commands::processMCode(GCode *com) {
|
||||||
UI_STATUS_UPD_RAM(com->text);
|
UI_STATUS_UPD_RAM(com->text);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 118: // M118 message to host
|
||||||
|
if(com->hasString()) {
|
||||||
|
Com::printFLN(com->text);
|
||||||
|
}
|
||||||
|
break;
|
||||||
case 119: // M119
|
case 119: // M119
|
||||||
Commands::waitUntilEndOfAllMoves();
|
Commands::waitUntilEndOfAllMoves();
|
||||||
Endstops::update();
|
Endstops::update();
|
||||||
|
|
|
@ -124,6 +124,7 @@ Custom M Codes
|
||||||
- M115- Capabilities string
|
- M115- Capabilities string
|
||||||
- M116 - Wait for all temperatures in a +/- 1 degree range
|
- M116 - Wait for all temperatures in a +/- 1 degree range
|
||||||
- M117 <message> - Write message in status row on lcd
|
- M117 <message> - Write message in status row on lcd
|
||||||
|
- M118 <message> - Write message to host
|
||||||
- M119 - Report endstop status
|
- M119 - Report endstop status
|
||||||
- M120 - Report beeper status
|
- M120 - Report beeper status
|
||||||
- M121 - Report sensors status
|
- M121 - Report sensors status
|
||||||
|
|
|
@ -773,7 +773,7 @@ bool GCode::parseAscii(char *line,bool fromSerial)
|
||||||
params |= 2;
|
params |= 2;
|
||||||
if(M > 255) params |= 4096;
|
if(M > 255) params |= 4096;
|
||||||
// handle non standard text arguments that some M codes have
|
// handle non standard text arguments that some M codes have
|
||||||
if (M == 20 || M == 23 || M == 28 || M == 29 || M == 30 || M == 32 || M == 36 || M == 117)
|
if (M == 20 || M == 23 || M == 28 || M == 29 || M == 30 || M == 32 || M == 36 || M == 117 || M == 118)
|
||||||
{
|
{
|
||||||
// after M command we got a filename or text
|
// after M command we got a filename or text
|
||||||
char digit;
|
char digit;
|
||||||
|
@ -791,7 +791,7 @@ bool GCode::parseAscii(char *line,bool fromSerial)
|
||||||
text = pos;
|
text = pos;
|
||||||
while (*pos)
|
while (*pos)
|
||||||
{
|
{
|
||||||
if((M != 117 && M != 20 && *pos==' ') || *pos=='*') break;
|
if((M != 117 && M != 20 && M != 118 && *pos==' ') || *pos=='*') break;
|
||||||
pos++; // find a space as file name end
|
pos++; // find a space as file name end
|
||||||
}
|
}
|
||||||
*pos = 0; // truncate filename by erasing space with null, also skips checksum
|
*pos = 0; // truncate filename by erasing space with null, also skips checksum
|
||||||
|
|
Ładowanie…
Reference in New Issue