bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Latest upstream commits

Browse Source
This commit is contained in:
Scott Lahteine
2015-03-26 15:30:51 -07:00
parent 04328d7537 d2e73545ba
commit 06eb7f5b3c
3 changed files with 84 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/Marlin_main.cpp
View File

@ -395,7 +395,9 @@ static long gcode_N, gcode_LastN, Stopped_gcode_LastN = 0;
static bool relative_mode = false; //Determines Absolute or Relative Coordinates
static char cmdbuffer[BUFSIZE][MAX_CMD_SIZE];
#ifdef SDSUPPORT
static bool fromsd[BUFSIZE];
#endif //!SDSUPPORT
static int bufindr = 0;
static int bufindw = 0;
static int buflen = 0;
@ -655,10 +657,12 @@ void setup()
SERIAL_ECHO(freeMemory());
SERIAL_ECHOPGM(MSG_PLANNER_BUFFER_BYTES);
SERIAL_ECHOLN((int)sizeof(block_t)*BLOCK_BUFFER_SIZE);
#ifdef SDSUPPORT
for(int8_t i = 0; i < BUFSIZE; i++)
{
fromsd[i] = false;
}
#endif //!SDSUPPORT
// loads data from EEPROM if available else uses defaults (and resets step acceleration rate)
Config_RetrieveSettings();
@ -764,8 +768,9 @@ void get_command()
return;
}
cmdbuffer[bufindw][serial_count] = 0; //terminate string
#ifdef SDSUPPORT
fromsd[bufindw] = false;
#endif //!SDSUPPORT
if(strchr(cmdbuffer[bufindw], 'N') != NULL)
{
strchr_pointer = strchr(cmdbuffer[bufindw], 'N');
@ -1775,7 +1780,7 @@ inline void gcode_G28() {
enable_endstops(true);
for (int i = X_AXIS; i <= NUM_AXIS; i++) destination[i] = current_position[i];
for (int i = X_AXIS; i < NUM_AXIS; i++) destination[i] = current_position[i];
feedrate = 0.0;