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

Merge pull request #3009 from leptun/PFW-1144-LongPathName 

"M27 P" support. Get current file absolute filename (file path)
This commit is contained in:
DRracer 2021-02-01 14:41:15 +01:00 committed by GitHub
parent 58c217a340 7e09df6a34
commit 40e45c5eaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Firmware/Marlin_main.cpp
View File

@ -5841,9 +5841,15 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
/*! /*!
### M27 - Get SD status <a href="https://reprap.org/wiki/G-code#M27:_Report_SD_print_status">M27: Report SD print status</a> ### M27 - Get SD status <a href="https://reprap.org/wiki/G-code#M27:_Report_SD_print_status">M27: Report SD print status</a>
#### Usage
M27 [ P ]
#### Parameters
- `P` - Show full SFN path instead of LFN only.
*/ */
case 27: case 27:
card.getStatus(); card.getStatus(code_seen('P'));
break; break;
/*! /*!

55
Firmware/cardreader.cpp
View File

@ -502,31 +502,38 @@ uint32_t CardReader::getFileSize()
return filesize; return filesize;
} }
void CardReader::getStatus() void CardReader::getStatus(bool arg_P)
{ {
if(sdprinting) if (isPrintPaused)
{ {
if (isPrintPaused) { if (saved_printing && (saved_printing_type == PRINTING_TYPE_SD))
SERIAL_PROTOCOLLNPGM("SD print paused"); SERIAL_PROTOCOLLNPGM("SD print paused");
} else
else if (saved_printing) { SERIAL_PROTOCOLLNPGM("Print saved");
SERIAL_PROTOCOLLNPGM("Print saved"); }
} else if (sdprinting)
else { {
SERIAL_PROTOCOLLN(LONGEST_FILENAME); if (arg_P)
SERIAL_PROTOCOLRPGM(_N("SD printing byte "));////MSG_SD_PRINTING_BYTE {
SERIAL_PROTOCOL(sdpos); SERIAL_PROTOCOL('/');
SERIAL_PROTOCOL('/'); for (uint8_t i = 0; i < getWorkDirDepth(); i++)
SERIAL_PROTOCOLLN(filesize); printf_P(PSTR("%s/"), dir_names[i]);
uint16_t time = ( _millis() - starttime ) / 60000U; puts(filename);
SERIAL_PROTOCOL(itostr2(time/60)); }
SERIAL_PROTOCOL(':'); else
SERIAL_PROTOCOLLN(itostr2(time%60)); SERIAL_PROTOCOLLN(LONGEST_FILENAME);
}
} SERIAL_PROTOCOLRPGM(_N("SD printing byte "));////MSG_SD_PRINTING_BYTE
else { SERIAL_PROTOCOL(sdpos);
SERIAL_PROTOCOLLNPGM("Not SD printing"); SERIAL_PROTOCOL('/');
} SERIAL_PROTOCOLLN(filesize);
uint16_t time = ( _millis() - starttime ) / 60000U;
SERIAL_PROTOCOL(itostr2(time/60));
SERIAL_PROTOCOL(':');
SERIAL_PROTOCOLLN(itostr2(time%60));
}
else
SERIAL_PROTOCOLLNPGM("Not SD printing");
} }
void CardReader::write_command(char *buf) void CardReader::write_command(char *buf)
{ {

2
Firmware/cardreader.h
View File

@ -26,7 +26,7 @@ public:
void release(); void release();
void startFileprint(); void startFileprint();
uint32_t getFileSize(); uint32_t getFileSize();
void getStatus(); void getStatus(bool arg_P);
void printingHasFinished(); void printingHasFinished();
void getfilename(uint16_t nr, const char* const match=NULL); void getfilename(uint16_t nr, const char* const match=NULL);