Move M280 to cpp
This commit is contained in:
parent
d4d3d92f8a
commit
6ed5252884
3 changed files with 12 additions and 10 deletions
|
@ -352,10 +352,6 @@ bool pin_is_protected(const int8_t pin) {
|
|||
return false;
|
||||
}
|
||||
|
||||
#if HAS_SERVOS
|
||||
#include "gcode/control/M280.h"
|
||||
#endif
|
||||
|
||||
#if HAS_BUZZER
|
||||
#include "gcode/lcd/M300.h"
|
||||
#endif
|
||||
|
|
|
@ -20,10 +20,17 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "../../inc/MarlinConfig.h"
|
||||
|
||||
#if HAS_SERVOS
|
||||
|
||||
#include "../gcode.h"
|
||||
#include "../../Marlin.h" // for servo[]
|
||||
|
||||
/**
|
||||
* M280: Get or set servo position. P<index> [S<angle>]
|
||||
*/
|
||||
void gcode_M280() {
|
||||
void GcodeSuite::M280() {
|
||||
if (!parser.seen('P')) return;
|
||||
const int servo_index = parser.value_int();
|
||||
if (WITHIN(servo_index, 0, NUM_SERVOS - 1)) {
|
||||
|
@ -41,3 +48,5 @@ void gcode_M280() {
|
|||
SERIAL_ECHOLNPGM(" out of range");
|
||||
}
|
||||
}
|
||||
|
||||
#endif // HAS_SERVOS
|
|
@ -121,7 +121,6 @@ extern void gcode_M164();
|
|||
extern void gcode_M165();
|
||||
extern void gcode_M240();
|
||||
extern void gcode_M250();
|
||||
extern void gcode_M280();
|
||||
extern void gcode_M300();
|
||||
extern void gcode_M301();
|
||||
extern void gcode_M302();
|
||||
|
@ -564,10 +563,8 @@ void GcodeSuite::process_next_command() {
|
|||
case 226: M226(); break; // M226: Wait until a pin reaches a state
|
||||
|
||||
#if HAS_SERVOS
|
||||
case 280: // M280: Set servo position absolute
|
||||
gcode_M280();
|
||||
break;
|
||||
#endif // HAS_SERVOS
|
||||
case 280: M280(); break; // M280: Set servo position absolute
|
||||
#endif
|
||||
|
||||
#if HAS_BUZZER
|
||||
case 300: // M300: Play beep tone
|
||||
|
|
Reference in a new issue