0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

getStatus => report_status

Browse source
This commit is contained in:
Scott Lahteine 2019-01-11 19:50:52 -06:00
parent 2919f3045d
commit fb8111553e
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp
View file

@ -145,7 +145,7 @@ void GcodeSuite::M27() {
#endif #endif
else else
card.getStatus( card.report_status(
#if NUM_SERIAL > 1 #if NUM_SERIAL > 1
port port
#endif #endif

4
Marlin/src/sd/cardreader.cpp
View file

@ -556,7 +556,7 @@ void CardReader::removeFile(const char * const name) {
} }
} }
void CardReader::getStatus( void CardReader::report_status(
#if NUM_SERIAL > 1 #if NUM_SERIAL > 1
const int8_t port/*= -1*/ const int8_t port/*= -1*/
#endif #endif
@ -1045,7 +1045,7 @@ void CardReader::printingHasFinished() {
millis_t current_ms = millis(); millis_t current_ms = millis();
if (auto_report_sd_interval && ELAPSED(current_ms, next_sd_report_ms)) { if (auto_report_sd_interval && ELAPSED(current_ms, next_sd_report_ms)) {
next_sd_report_ms = current_ms + 1000UL * auto_report_sd_interval; next_sd_report_ms = current_ms + 1000UL * auto_report_sd_interval;
getStatus( report_status(
#if NUM_SERIAL > 1 #if NUM_SERIAL > 1
serialport serialport
#endif #endif

2
Marlin/src/sd/cardreader.h
View file

@ -70,7 +70,7 @@ public:
const bool re_sort=false const bool re_sort=false
#endif #endif
); );
static void getStatus( static void report_status(
#if NUM_SERIAL > 1 #if NUM_SERIAL > 1
const int8_t port = -1 const int8_t port = -1
#endif #endif