josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3615 from wavexx/line_cnt_reset_fix 

Do not reset line on serial commands without N
This commit is contained in:
Yuri D'Elia 2022-09-21 14:45:46 +02:00 committed by GitHub
parent 9f1f396c18 129df6dd4a
commit bccdab4c22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/cmdqueue.cpp
View File

@ -26,10 +26,7 @@ bool comment_mode = false;
char *strchr_pointer; // just a pointer to find chars in the command string like X, Y, Z, E, etc char *strchr_pointer; // just a pointer to find chars in the command string like X, Y, Z, E, etc
ShortTimer serialTimeoutTimer; ShortTimer serialTimeoutTimer;
long gcode_N = 0;
long gcode_LastN = 0; long gcode_LastN = 0;
uint32_t sdpos_atomic = 0; uint32_t sdpos_atomic = 0;
@ -403,7 +400,7 @@ void get_command()
cmdbuffer[bufindw+serial_count+CMDHDRSIZE] = 0; //terminate string cmdbuffer[bufindw+serial_count+CMDHDRSIZE] = 0; //terminate string
if(!comment_mode){ if(!comment_mode){
gcode_N = 0; long gcode_N = -1;
// Line numbers must be first in buffer // Line numbers must be first in buffer
@ -490,7 +487,7 @@ void get_command()
// Command is complete: store the current line into buffer, move to the next line. // Command is complete: store the current line into buffer, move to the next line.
// Store type of entry // Store type of entry
cmdbuffer[bufindw] = gcode_N ? CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR : CMDBUFFER_CURRENT_TYPE_USB; cmdbuffer[bufindw] = gcode_N >= 0 ? CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR : CMDBUFFER_CURRENT_TYPE_USB;
#ifdef CMDBUFFER_DEBUG #ifdef CMDBUFFER_DEBUG
SERIAL_ECHO_START; SERIAL_ECHO_START;
@ -506,7 +503,8 @@ void get_command()
++ buflen; ++ buflen;
// Update the processed gcode line // Update the processed gcode line
gcode_LastN = gcode_N; if (gcode_N >= 0)
gcode_LastN = gcode_N;
#ifdef CMDBUFFER_DEBUG #ifdef CMDBUFFER_DEBUG
SERIAL_ECHOPGM("Number of commands in the buffer: "); SERIAL_ECHOPGM("Number of commands in the buffer: ");

1
Firmware/cmdqueue.h
View File

@ -52,7 +52,6 @@ extern int serial_count;
extern bool comment_mode; extern bool comment_mode;
extern char *strchr_pointer; extern char *strchr_pointer;
extern long gcode_N;
extern long gcode_LastN; extern long gcode_LastN;
extern bool cmdqueue_pop_front(); extern bool cmdqueue_pop_front();