CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #425 from kefir-/m928_logging

Browse Source 
M928 logging
This commit is contained in:
ErikZalm 2013-03-30 08:50:34 -07:00
commit 7f622467fc
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Marlin/Marlin_main.cpp
View File

@ -133,6 +133,7 @@
// M908 - Control digital trimpot directly. // M908 - Control digital trimpot directly.
// M350 - Set microstepping mode. // M350 - Set microstepping mode.
// M351 - Toggle MS1 MS2 pins directly. // M351 - Toggle MS1 MS2 pins directly.
// M928 - Start SD logging (M928 filename.g) - ended by M29
// M999 - Restart after being stopped by error // M999 - Restart after being stopped by error
//Stepper Movement Variables //Stepper Movement Variables
@ -403,7 +404,14 @@ void loop()
if(strstr_P(cmdbuffer[bufindr], PSTR("M29")) == NULL) if(strstr_P(cmdbuffer[bufindr], PSTR("M29")) == NULL)
{ {
card.write_command(cmdbuffer[bufindr]); card.write_command(cmdbuffer[bufindr]);
SERIAL_PROTOCOLLNPGM(MSG_OK); if(card.logging)
{
process_commands();
}
else
{
SERIAL_PROTOCOLLNPGM(MSG_OK);
}
} }
else else
{ {
@ -958,6 +966,15 @@ void process_commands()
card.removeFile(strchr_pointer + 4); card.removeFile(strchr_pointer + 4);
} }
break; break;
case 928: //M928 - Start SD write
starpos = (strchr(strchr_pointer + 5,'*'));
if(starpos != NULL){
char* npos = strchr(cmdbuffer[bufindr], 'N');
strchr_pointer = strchr(npos,' ') + 1;
*(starpos-1) = '\0';
}
card.openLogFile(strchr_pointer+5);
break;
#endif //SDSUPPORT #endif //SDSUPPORT

7
Marlin/cardreader.cpp
View File

@ -16,6 +16,7 @@ CardReader::CardReader()
sdprinting = false; sdprinting = false;
cardOK = false; cardOK = false;
saving = false; saving = false;
logging = false;
autostart_atmillis=0; autostart_atmillis=0;
autostart_stilltocheck=true; //the sd start is delayed, because otherwise the serial cannot answer fast enought to make contact with the hostsoftware. autostart_stilltocheck=true; //the sd start is delayed, because otherwise the serial cannot answer fast enought to make contact with the hostsoftware.
@ -212,6 +213,11 @@ void CardReader::pauseSDPrint()
} }
void CardReader::openLogFile(char* name)
{
logging = true;
openFile(name, false);
}
void CardReader::openFile(char* name,bool read) void CardReader::openFile(char* name,bool read)
{ {
@ -471,6 +477,7 @@ void CardReader::closefile()
file.sync(); file.sync();
file.close(); file.close();
saving = false; saving = false;
logging = false;
} }
void CardReader::getfilename(const uint8_t nr) void CardReader::getfilename(const uint8_t nr)