Merge commit 'cd71a90ce8a770e0030ed6c9bac805b89724e275' into dev
Conflicts: limits.c motion_control.c report.c
This commit is contained in:
19
report.c
19
report.c
@ -32,6 +32,7 @@
|
||||
#include "settings.h"
|
||||
#include "gcode.h"
|
||||
#include "coolant_control.h"
|
||||
#include "planner.h"
|
||||
#include "spindle_control.h"
|
||||
|
||||
|
||||
@ -261,9 +262,9 @@ void report_gcode_modes()
|
||||
}
|
||||
|
||||
switch (gc.spindle_direction) {
|
||||
case SPINDLE_ENABLE_CW : printPgmString(PSTR(" M3")); break;
|
||||
case SPINDLE_ENABLE_CCW : printPgmString(PSTR(" M4")); break;
|
||||
case SPINDLE_DISABLE : printPgmString(PSTR(" M5")); break;
|
||||
case 1 : printPgmString(PSTR(" M3")); break;
|
||||
case -1 : printPgmString(PSTR(" M4")); break;
|
||||
case 0 : printPgmString(PSTR(" M5")); break;
|
||||
}
|
||||
|
||||
switch (gc.coolant_mode) {
|
||||
@ -350,5 +351,17 @@ void report_realtime_status()
|
||||
if (i < (N_AXIS-1)) { printPgmString(PSTR(",")); }
|
||||
}
|
||||
|
||||
#ifdef USE_LINE_NUMBERS
|
||||
// Report current line number
|
||||
printPgmString(PSTR(","));
|
||||
printPgmString(PSTR("Ln:"));
|
||||
uint32_t ln=0;
|
||||
plan_block_t * pb = plan_get_current_block();
|
||||
if(pb != NULL) {
|
||||
ln = pb->line_number;
|
||||
}
|
||||
printInteger(ln);
|
||||
#endif
|
||||
|
||||
printPgmString(PSTR(">\r\n"));
|
||||
}
|
||||
|
Reference in New Issue
Block a user