3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2026-03-06 18:14:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add MACHINE_COMMAND_MACROS

Browse source
This commit is contained in:
Scott Lahteine 2026-01-08 17:18:04 -06:00
parent 71d5661fe4
commit 13e5b3dec6
4 changed files with 67 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Marlin/Configuration_adv.h
View file

@ -2061,6 +2061,10 @@
#define DEFAULT_SHARED_VOLUME USB_FLASH_DRIVE // :[ 'SD_ONBOARD', 'USB_FLASH_DRIVE' ]
#endif
// 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 // HAS_MEDIA
/**

49
Marlin/src/gcode/sdcard/M98.cpp Normal file
View file

@ -0,0 +1,49 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2026 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 <https://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

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

@ -921,6 +921,15 @@ bool CardReader::fileExists(const char * const path) {
return success;
}
#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
//

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

@ -218,6 +218,10 @@ public:
// The root directory of the current mounted drive
static MediaFile getroot() { return root; }
#if ENABLED(MACHINE_COMMAND_MACROS)
static void runMacro(const char * const path);
#endif
// Basic file ops
static void openFileRead(const char * const path, const uint8_t subcall=0);
static void openFileWrite(const char * const path);
@ -226,6 +230,7 @@ public:
static void removeFile(const char * const name);
static char* longest_filename() { return longFilename[0] ? longFilename : filename; }
#if ENABLED(LONG_FILENAME_HOST_SUPPORT)
static void printLongPath(char * const path); // Used by M33
static void getLongPath(char * const pathLong, char * const pathShort); // Used by anycubic_vyper