From 7717ae96060e414b091c449162405c475dc85146 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 13 Sep 2021 21:48:47 -0500 Subject: [PATCH] change option name --- Marlin/Configuration.h | 2 +- Marlin/src/gcode/control/M282.cpp | 4 ++-- Marlin/src/gcode/gcode.cpp | 2 +- Marlin/src/gcode/gcode.h | 4 ++-- Marlin/src/inc/Conditionals_post.h | 2 +- ini/features.ini | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 5e957f843207..fb189627d68c 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -2948,4 +2948,4 @@ //#define EDITABLE_SERVO_ANGLES // Disable servo with M282 to reduce power consumption, noise, and heat when not in use -//#define SERVOS_CAN_BE_DISABLED +//#define SERVO_DETACH_GCODE diff --git a/Marlin/src/gcode/control/M282.cpp b/Marlin/src/gcode/control/M282.cpp index 09a8019bb933..5fe2e6e328a9 100644 --- a/Marlin/src/gcode/control/M282.cpp +++ b/Marlin/src/gcode/control/M282.cpp @@ -22,7 +22,7 @@ #include "../../inc/MarlinConfig.h" -#if ENABLED(SERVOS_CAN_BE_DISABLED) +#if ENABLED(SERVO_DETACH_GCODE) #include "../gcode.h" #include "../../module/servo.h" @@ -42,4 +42,4 @@ void GcodeSuite::M282() { } -#endif // SERVOS_CAN_BE_DISABLED +#endif // SERVO_DETACH_GCODE diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index 525ce9972f22..46d09f407253 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/Marlin/src/gcode/gcode.cpp @@ -717,7 +717,7 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) { #if ENABLED(EDITABLE_SERVO_ANGLES) case 281: M281(); break; // M281: Set servo angles #endif - #if ENABLED(SERVOS_CAN_BE_DISABLED) + #if ENABLED(SERVO_DETACH_GCODE) case 282: M282(); break; // M282: Detach servo #endif #endif diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h index e7edca76151d..aa38b7de4a3d 100644 --- a/Marlin/src/gcode/gcode.h +++ b/Marlin/src/gcode/gcode.h @@ -192,7 +192,7 @@ * M261 - i2c Request Data (Requires EXPERIMENTAL_I2CBUS) * M280 - Set servo position absolute: "M280 P S". (Requires servos) * M281 - Set servo min|max position: "M281 P L U". (Requires EDITABLE_SERVO_ANGLES) - * M282 - Detach servo: "M282 P". (Requires SERVOS_CAN_BE_DISABLED) + * M282 - Detach servo: "M282 P". (Requires SERVO_DETACH_GCODE) * M290 - Babystepping (Requires BABYSTEPPING) * M300 - Play beep sound S P * M301 - Set PID parameters P I and D. (Requires PIDTEMP) @@ -863,7 +863,7 @@ class GcodeSuite { static void M281(); static void M281_report(const bool forReplay=true); #endif - #if ENABLED(SERVOS_CAN_BE_DISABLED) + #if ENABLED(SERVO_DETACH_GCODE) static void M282(); #endif #endif diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index ea8672f8db32..5b7526b74b41 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -2600,7 +2600,7 @@ #undef SERVO_DELAY #undef DEACTIVATE_SERVOS_AFTER_MOVE #undef EDITABLE_SERVO_ANGLES - #undef SERVOS_CAN_BE_DISABLED + #undef SERVO_DETACH_GCODE #endif // Sensors diff --git a/ini/features.ini b/ini/features.ini index f930c0c8f977..b4398378adac 100644 --- a/ini/features.ini +++ b/ini/features.ini @@ -173,7 +173,7 @@ HAS_SMART_EFF_MOD = src_filter=+ COOLANT_CONTROL|AIR_ASSIST = src_filter=+ AIR_EVACUATION = src_filter=+ HAS_SOFTWARE_ENDSTOPS = src_filter=+ -SERVOS_CAN_BE_DISABLED = src_filter=+ +SERVO_DETACH_GCODE = src_filter=+ HAS_DUPLICATION_MODE = src_filter=+ LIN_ADVANCE = src_filter=+ PHOTO_GCODE = src_filter=+