|
@@ -64,7 +64,7 @@ uint8_t GCodeQueue::length = 0, // Count of commands in the queue
|
64
|
64
|
GCodeQueue::index_r = 0, // Ring buffer read position
|
65
|
65
|
GCodeQueue::index_w = 0; // Ring buffer write position
|
66
|
66
|
|
67
|
|
-char GCodeQueue::buffer[BUFSIZE][MAX_CMD_SIZE];
|
|
67
|
+char GCodeQueue::command_buffer[BUFSIZE][MAX_CMD_SIZE];
|
68
|
68
|
|
69
|
69
|
/*
|
70
|
70
|
* The port that the command was received on
|
|
@@ -135,7 +135,7 @@ bool GCodeQueue::_enqueue(const char* cmd, bool say_ok/*=false*/
|
135
|
135
|
#endif
|
136
|
136
|
) {
|
137
|
137
|
if (*cmd == ';' || length >= BUFSIZE) return false;
|
138
|
|
- strcpy(buffer[index_w], cmd);
|
|
138
|
+ strcpy(command_buffer[index_w], cmd);
|
139
|
139
|
_commit_command(say_ok
|
140
|
140
|
#if NUM_SERIAL > 1
|
141
|
141
|
, pn
|
|
@@ -242,7 +242,7 @@ void GCodeQueue::ok_to_send() {
|
242
|
242
|
if (!send_ok[index_r]) return;
|
243
|
243
|
SERIAL_ECHOPGM(MSG_OK);
|
244
|
244
|
#if ENABLED(ADVANCED_OK)
|
245
|
|
- char* p = buffer[index_r];
|
|
245
|
+ char* p = command_buffer[index_r];
|
246
|
246
|
if (*p == 'N') {
|
247
|
247
|
SERIAL_ECHO(' ');
|
248
|
248
|
SERIAL_ECHO(*p++);
|
|
@@ -553,7 +553,7 @@ void GCodeQueue::get_serial_commands() {
|
553
|
553
|
// Skip empty lines and comments
|
554
|
554
|
if (!sd_count) { thermalManager.manage_heater(); continue; }
|
555
|
555
|
|
556
|
|
- buffer[index_w][sd_count] = '\0'; // terminate string
|
|
556
|
+ command_buffer[index_w][sd_count] = '\0'; // terminate string
|
557
|
557
|
sd_count = 0; // clear sd line buffer
|
558
|
558
|
|
559
|
559
|
_commit_command(false);
|
|
@@ -574,7 +574,7 @@ void GCodeQueue::get_serial_commands() {
|
574
|
574
|
#if ENABLED(PAREN_COMMENTS)
|
575
|
575
|
&& ! sd_comment_paren_mode
|
576
|
576
|
#endif
|
577
|
|
- ) buffer[index_w][sd_count++] = sd_char;
|
|
577
|
+ ) command_buffer[index_w][sd_count++] = sd_char;
|
578
|
578
|
}
|
579
|
579
|
}
|
580
|
580
|
}
|
|
@@ -610,7 +610,7 @@ void GCodeQueue::advance() {
|
610
|
610
|
#if ENABLED(SDSUPPORT)
|
611
|
611
|
|
612
|
612
|
if (card.flag.saving) {
|
613
|
|
- char* command = buffer[index_r];
|
|
613
|
+ char* command = command_buffer[index_r];
|
614
|
614
|
if (is_M29(command)) {
|
615
|
615
|
// M29 closes the file
|
616
|
616
|
card.closefile();
|