From 797513d3c5b0cdf41f449b99e8cc677599f9cb71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 24 Dec 2022 14:33:12 +0000 Subject: [PATCH] Remove T parameter from M221 Fixes #3852 --- Firmware/Marlin.h | 1 - Firmware/Marlin_main.cpp | 27 +++------------------------ 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index da613c383..ecd5fa73b 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -272,7 +272,6 @@ extern uint8_t axis_relative_modes; extern float feedrate; extern int feedmultiply; extern int extrudemultiply; // Sets extrude multiply factor (in percent) for all extruders -extern int extruder_multiply[EXTRUDERS]; // sets extrude multiply factor (in percent) for each extruder individually extern float extruder_multiplier[EXTRUDERS]; // reciprocal of cross-sectional area of filament (in square millimeters), stored this way to reduce computational burden in planner extern float current_position[NUM_AXIS] ; extern float destination[NUM_AXIS] ; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 5b963099c..903891d5f 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -170,15 +170,6 @@ uint8_t axis_relative_modes = 0; int feedmultiply=100; //100->1 200->2 int extrudemultiply=100; //100->1 200->2 -int extruder_multiply[EXTRUDERS] = {100 - #if EXTRUDERS > 1 - , 100 - #if EXTRUDERS > 2 - , 100 - #endif - #endif -}; - bool homing_flag = false; @@ -7187,34 +7178,22 @@ Sigma_Exit: ### M221 - Set extrude factor override percentage M221: Set extrude factor override percentage #### Usage - M221 [ S | T ] + M221 [ S ] #### Parameters - `S` - Extrude factor override percentage (0..100 or higher), default 100% - - `T` - Extruder drive number (Prusa Firmware only), default 0 if not set. */ case 221: // M221 S- set extrude factor override percentage { if (code_seen('S')) { - int tmp_code = code_value_short(); - if (code_seen('T')) - { - uint8_t extruder; - if (setTargetedHotend(221, extruder)) - break; - extruder_multiply[extruder] = tmp_code; - } - else - { - extrudemultiply = tmp_code ; - } + extrudemultiply = code_value_short(); + calculate_extruder_multipliers(); } else { printf_P(PSTR("%i%%\n"), extrudemultiply); } - calculate_extruder_multipliers(); } break;