zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Move M106_M107 to cpp

Browse source
This commit is contained in:
Scott Lahteine 2017-09-16 13:14:44 -05:00
parent 99c4b9050a
commit df031ab100
4 changed files with 21 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/src/Marlin.cpp
View file

@ -391,11 +391,6 @@ bool pin_is_protected(const int8_t pin) {
#endif // AUTO_REPORT_TEMPERATURES && (HAS_TEMP_HOTEND || HAS_TEMP_BED)
#if FAN_COUNT > 0
#include "gcode/temperature/M106.h"
#include "gcode/temperature/M107.h"
#endif
#if DISABLED(EMERGENCY_PARSER)
#include "gcode/control/M108.h"
#include "gcode/control/M112.h"

12
Marlin/src/gcode/gcode.cpp
View file

@ -124,8 +124,6 @@ extern void gcode_M83();
extern void gcode_M85();
extern void gcode_M92();
extern void gcode_M100();
extern void gcode_M106();
extern void gcode_M107();
extern void gcode_M108();
extern void gcode_M110();
extern void gcode_M111();
@ -509,13 +507,9 @@ void GcodeSuite::process_next_command() {
#endif // HAS_TEMP_BED
#if FAN_COUNT > 0
case 106: // M106: Fan On
gcode_M106();
break;
case 107: // M107: Fan Off
gcode_M107();
break;
#endif // FAN_COUNT > 0
case 106: M106(); break; // M106: Fan On
case 107: M107(); break; // M107: Fan Off
#endif
#if ENABLED(PARK_HEAD_ON_PAUSE)
case 125: // M125: Store current position and move to filament change position

19
Marlin/src/gcode/temperature/M106.h → Marlin/src/gcode/temperature/M106_M107.cpp
View file

@ -20,15 +20,32 @@
*
*/
#include "../../inc/MarlinConfig.h"
#if FAN_COUNT > 0
#include "../gcode.h"
#include "../../Marlin.h" // for fanSpeeds — should move those to Planner
/**
* M106: Set Fan Speed
*
* S<int> Speed between 0-255
* P<index> Fan index, if more than one fan
*/
void gcode_M106() {
void GcodeSuite::M106() {
uint16_t s = parser.ushortval('S', 255);
NOMORE(s, 255);
const uint8_t p = parser.byteval('P', 0);
if (p < FAN_COUNT) fanSpeeds[p] = s;
}
/**
* M107: Fan Off
*/
void GcodeSuite::M107() {
const uint16_t p = parser.ushortval('P');
if (p < FAN_COUNT) fanSpeeds[p] = 0;
}
#endif // FAN_COUNT > 0

29
Marlin/src/gcode/temperature/M107.h
View file

@ -1,29 +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/>.
*
*/
/**
* M107: Fan Off
*/
void gcode_M107() {
const uint16_t p = parser.ushortval('P');
if (p < FAN_COUNT) fanSpeeds[p] = 0;
}