ManuelW/grbl-LPC-CoreXY
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Replace some constants with N_AXIS.

Browse Source
This commit is contained in:
Alexander Danilov
2013-01-10 02:22:45 +04:00
parent 53286744d5
commit 7c6162b90a
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
report.c
View File

@ -292,9 +292,9 @@ void report_realtime_status()
// to be added are distance to go on block, processed block id, and feed rate. Also a settings bitmask
// for a user to select the desired real-time data.
uint8_t i;
int32_t current_position[3]; // Copy current state of the system position variable
int32_t current_position[N_AXIS]; // Copy current state of the system position variable
memcpy(current_position,sys.position,sizeof(sys.position));
float print_position[3];
float print_position[N_AXIS];
// Report current machine state
switch (sys.state) {
@ -310,7 +310,7 @@ void report_realtime_status()
// Report machine position
printPgmString(PSTR(",MPos:"));
for (i=0; i<= 2; i++) {
for (i=0; i< N_AXIS; i++) {
print_position[i] = current_position[i]/settings.steps_per_mm[i];
if (bit_istrue(settings.flags,BITFLAG_REPORT_INCHES)) { print_position[i] *= INCH_PER_MM; }
printFloat(print_position[i]);
@ -319,14 +319,14 @@ void report_realtime_status()
// Report work position
printPgmString(PSTR("WPos:"));
for (i=0; i<= 2; i++) {
for (i=0; i< N_AXIS; i++) {
if (bit_istrue(settings.flags,BITFLAG_REPORT_INCHES)) {
print_position[i] -= (gc.coord_system[i]+gc.coord_offset[i])*INCH_PER_MM;
} else {
print_position[i] -= gc.coord_system[i]+gc.coord_offset[i];
}
printFloat(print_position[i]);
if (i < 2) { printPgmString(PSTR(",")); }
if (i < N_AXIS-1) { printPgmString(PSTR(",")); }
}
printPgmString(PSTR(">\r\n"));