josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove T parameter from M221 

Fixes #3852
This commit is contained in:
Guðni Már Gilbert 2022-12-24 14:33:12 +00:00 committed by DRracer
parent 4219beed71
commit 797513d3c5
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/Marlin.h
View File

@ -272,7 +272,6 @@ extern uint8_t axis_relative_modes;
extern float feedrate; extern float feedrate;
extern int feedmultiply; extern int feedmultiply;
extern int extrudemultiply; // Sets extrude multiply factor (in percent) for all extruders 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 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 current_position[NUM_AXIS] ;
extern float destination[NUM_AXIS] ; extern float destination[NUM_AXIS] ;

27
Firmware/Marlin_main.cpp
View File

@ -170,15 +170,6 @@ uint8_t axis_relative_modes = 0;
int feedmultiply=100; //100->1 200->2 int feedmultiply=100; //100->1 200->2
int extrudemultiply=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; bool homing_flag = false;
@ -7187,34 +7178,22 @@ Sigma_Exit:
### M221 - Set extrude factor override percentage <a href="https://reprap.org/wiki/G-code#M221:_Set_extrude_factor_override_percentage">M221: Set extrude factor override percentage</a> ### M221 - Set extrude factor override percentage <a href="https://reprap.org/wiki/G-code#M221:_Set_extrude_factor_override_percentage">M221: Set extrude factor override percentage</a>
#### Usage #### Usage
M221 [ S | T ] M221 [ S ]
#### Parameters #### Parameters
- `S` - Extrude factor override percentage (0..100 or higher), default 100% - `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<factor in percent>- set extrude factor override percentage case 221: // M221 S<factor in percent>- set extrude factor override percentage
{ {
if (code_seen('S')) if (code_seen('S'))
{ {
int tmp_code = code_value_short(); extrudemultiply = code_value_short();
if (code_seen('T')) calculate_extruder_multipliers();
{
uint8_t extruder;
if (setTargetedHotend(221, extruder))
break;
extruder_multiply[extruder] = tmp_code;
}
else
{
extrudemultiply = tmp_code ;
}
} }
else else
{ {
printf_P(PSTR("%i%%\n"), extrudemultiply); printf_P(PSTR("%i%%\n"), extrudemultiply);
} }
calculate_extruder_multipliers();
} }
break; break;