Add MACHINE_COMMAND_MACROS

This commit is contained in:
Scott Lahteine 2019-12-12 18:57:04 -06:00 committed by Scott Lahteine
parent f17394d677
commit f9112dc272
4 changed files with 66 additions and 0 deletions

View file

@ -1345,6 +1345,10 @@
*/ */
//#define SDCARD_CONNECTION LCD //#define SDCARD_CONNECTION LCD
// Emulate RepRapFirmware with macro files stored in /sys and /macros
// Provide the M98 command to run a macro file as a sub-program
//#define MACHINE_COMMAND_MACROS
#endif // SDSUPPORT #endif // SDSUPPORT
/** /**

View file

@ -0,0 +1,49 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include "../../inc/MarlinConfig.h"
#if ENABLED(MACHINE_COMMAND_MACROS)
#include "../gcode.h"
#include "../../sd/cardreader.h"
/**
* M98: Select file and run as sub-procedure
*
* P<path> - The plain (DOS 8.3) filepath
*
* Example:
* M98 P/macros/home.g ; Run home.g (as a procedure)
*
*/
void GcodeSuite::M98() {
if (card.isMounted() && parser.seen('P')) {
char *path = parser.value_string();
char *lb = strchr(p, ' ');
if (!lb) lb = strchr(p, ';');
if (lb) *lb = '\0';
card.runMacro(path);
}
}
#endif // MACHINE_COMMAND_MACROS

View file

@ -650,6 +650,15 @@ bool CardReader::fileExists(const char * const path) {
return !!fname; return !!fname;
} }
#if ENABLED(MACHINE_COMMAND_MACROS)
void CardReader::runMacro(const char * const path) {
openFileRead(path, 2);
startFileprint();
}
#endif
// //
// Delete a file by name in the working directory // Delete a file by name in the working directory
// //

View file

@ -102,6 +102,10 @@ public:
static bool fileExists(const char * const name); static bool fileExists(const char * const name);
static void removeFile(const char * const name); static void removeFile(const char * const name);
#if ENABLED(MACHINE_COMMAND_MACROS)
static void runMacro(const char * const path);
#endif
static inline char* longest_filename() { return longFilename[0] ? longFilename : filename; } static inline char* longest_filename() { return longFilename[0] ? longFilename : filename; }
#if ENABLED(LONG_FILENAME_HOST_SUPPORT) #if ENABLED(LONG_FILENAME_HOST_SUPPORT)
static void printLongPath(char * const path); // Used by M33 static void printLongPath(char * const path); // Used by M33