bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Combine G-code files into fewer units

Browse Source 
Addressing #7707
This commit is contained in:
Scott Lahteine
2017-09-23 18:09:14 -05:00
parent bfd1e75c04
commit 1587962547
52 changed files with 709 additions and 1719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Marlin/src/gcode/control/M108.cpp
View File

@ -1,39 +0,0 @@
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2016 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 DISABLED(EMERGENCY_PARSER)
#include "../gcode.h"
#include "../../Marlin.h" // for wait_for_heatup
/**
* M108: Stop the waiting for heaters in M109, M190, M303. Does not affect the target temperature.
*/
void GcodeSuite::M108() {
wait_for_heatup = false;
}
#endif // !EMERGENCY_PARSER

18
Marlin/src/gcode/control/M410.cpp → Marlin/src/gcode/control/M108_M112_M410.cpp
View File

@ -25,7 +25,21 @@
#if DISABLED(EMERGENCY_PARSER)
#include "../gcode.h"
#include "../../Marlin.h" // for quickstop_stepper
#include "../../Marlin.h" // for wait_for_heatup, kill, quickstop_stepper
/**
* M108: Stop the waiting for heaters in M109, M190, M303. Does not affect the target temperature.
*/
void GcodeSuite::M108() {
wait_for_heatup = false;
}
/**
* M112: Emergency Stop
*/
void GcodeSuite::M112() {
kill(PSTR(MSG_KILLED));
}
/**
* M410: Quickstop - Abort all planned moves
@ -34,9 +48,7 @@
* will be out of sync with the stepper position after this.
*/
void GcodeSuite::M410() {
quickstop_stepper();
}
#endif // !EMERGENCY_PARSER

39
Marlin/src/gcode/control/M112.cpp
View File

@ -1,39 +0,0 @@
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2016 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 DISABLED(EMERGENCY_PARSER)
#include "../gcode.h"
#include "../../Marlin.h" // for kill
/**
* M112: Emergency Stop
*/
void GcodeSuite::M112() {
kill(PSTR(MSG_KILLED));
}
#endif // !EMERGENCY_PARSER

33
Marlin/src/gcode/control/M17.cpp
View File

@ -1,33 +0,0 @@
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2016 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 "../gcode.h"
#include "../../lcd/ultralcd.h"
#include "../../Marlin.h"
/**
* M17: Enable power on all stepper motors
*/
void GcodeSuite::M17() {
LCD_MESSAGEPGM(MSG_NO_MOVE);
enable_all_steppers();
}

10
Marlin/src/gcode/control/M18_M84.cpp → Marlin/src/gcode/control/M17_M18_M84.cpp
View File

@ -22,13 +22,21 @@
#include "../gcode.h"
#include "../../Marlin.h" // for stepper_inactive_time
#include "../../lcd/ultralcd.h"
#include "../../module/stepper.h"
#if ENABLED(AUTO_BED_LEVELING_UBL) && ENABLED(ULTRA_LCD)
#include "../../feature/bedlevel/bedlevel.h"
#include "../../lcd/ultralcd.h"
#endif
/**
* M17: Enable power on all stepper motors
*/
void GcodeSuite::M17() {
LCD_MESSAGEPGM(MSG_NO_MOVE);
enable_all_steppers();
}
/**
* M18, M84: Disable stepper motors
*/