SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move M380_M381 to cpp, solenoid feature

Browse source
This commit is contained in:
Scott Lahteine 2017-09-17 03:43:45 -05:00
parent 9be8cb0ac9
commit 4a220a8b79
6 changed files with 82 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/Marlin.cpp
View file

@ -352,10 +352,6 @@ bool pin_is_protected(const int8_t pin) {
return false;
}
#if ENABLED(EXT_SOLENOID)
#include "gcode/control/M380_M381.h"
#endif
#include "gcode/control/M400.h"
#if HAS_BED_PROBE

26
Marlin/src/gcode/control/M380_M381.h → Marlin/src/feature/solenoid.cpp
View file

@ -20,9 +20,15 @@
*
*/
#include "../inc/MarlinConfig.h"
#if ENABLED(EXT_SOLENOID)
void enable_solenoid(const uint8_t num) {
#include "solenoid.h"
#include "../module/motion.h" // for active_extruder
inline void enable_solenoid(const uint8_t num) {
switch (num) {
case 0:
OUT_WRITE(SOL0_PIN, HIGH);
@ -72,22 +78,4 @@ void disable_all_solenoids() {
#endif
}
/**
* M380: Enable solenoid on the active extruder
*/
void gcode_M380() {
enable_solenoid_on_active_extruder();
}
/**
* M381: Disable all solenoids
*/
void gcode_M381() {
disable_all_solenoids();
}
#endif // EXT_SOLENOID

29
Marlin/src/feature/solenoid.h Normal file
View file

@ -0,0 +1,29 @@
/**
* 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/>.
*
*/
#ifndef __SOLENOID_H__
#define __SOLENOID_H__
void enable_solenoid_on_active_extruder();
void disable_all_solenoids();
#endif // __SOLENOID_H__

40
Marlin/src/gcode/control/M380_M381.cpp Normal file
View file

@ -0,0 +1,40 @@
/**
* 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 ENABLED(EXT_SOLENOID)
#include "../gcode.h"
#include "../../feature/solenoid.h"
/**
* M380: Enable solenoid on the active extruder
*/
void GcodeSuite::M380() { enable_solenoid_on_active_extruder(); }
/**
* M381: Disable all solenoids
*/
void GcodeSuite::M381() { disable_all_solenoids(); }
#endif // EXT_SOLENOID

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

@ -122,8 +122,6 @@ extern void gcode_M165();
extern void gcode_M350();
extern void gcode_M351();
extern void gcode_M355();
extern void gcode_M380();
extern void gcode_M381();
extern void gcode_M400();
extern void gcode_M401();
extern void gcode_M402();
@ -597,12 +595,8 @@ void GcodeSuite::process_next_command() {
#endif
#if ENABLED(EXT_SOLENOID)
case 380: // M380: Activate solenoid on active extruder
gcode_M380();
break;
case 381: // M381: Disable all solenoids
gcode_M381();
break;
case 380: M380(); break; // M380: Activate solenoid on active extruder
case 381: M381(); break; // M381: Disable all solenoids
#endif
case 400: // M400: Finish all moves

4
Marlin/src/module/tool_change.cpp
View file

@ -34,6 +34,10 @@
#include "../gcode/gcode.h" // for dwell()
#endif
#if ENABLED(EXT_SOLENOID) && !ENABLED(PARKING_EXTRUDER)
#include "../feature/solenoid.h"
#endif
#if ENABLED(SWITCHING_EXTRUDER)
#if EXTRUDERS > 3