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

M220 M221

This commit is contained in:
Alex Voinea 2020-06-19 15:39:16 +03:00
parent 45e182911d
commit a0cf5714ce
No known key found for this signature in database
GPG Key ID: F5034E7CFCF2F973
1 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Firmware/Marlin_main.cpp
View File

@ -7300,16 +7300,25 @@ Sigma_Exit:
*/ */
case 220: // M220 S<factor in percent>- set speed factor override percentage case 220: // M220 S<factor in percent>- set speed factor override percentage
{ {
bool codesWereSeen = false;
if (code_seen('B')) //backup current speed factor if (code_seen('B')) //backup current speed factor
{ {
saved_feedmultiply_mm = feedmultiply; saved_feedmultiply_mm = feedmultiply;
codesWereSeen = true;
} }
if (code_seen('S')) if (code_seen('S'))
{ {
feedmultiply = code_value(); feedmultiply = code_value();
codesWereSeen = true;
} }
if (code_seen('R')) { //restore previous feedmultiply if (code_seen('R')) //restore previous feedmultiply
{
feedmultiply = saved_feedmultiply_mm; feedmultiply = saved_feedmultiply_mm;
codesWereSeen = true;
}
if (!codesWereSeen)
{
printf_P(PSTR("%i%%\n"), feedmultiply);
} }
} }
break; break;
@ -7332,9 +7341,8 @@ Sigma_Exit:
if (code_seen('T')) if (code_seen('T'))
{ {
uint8_t extruder; uint8_t extruder;
if(setTargetedHotend(221, extruder)){ if (setTargetedHotend(221, extruder))
break; break;
}
extruder_multiply[extruder] = tmp_code; extruder_multiply[extruder] = tmp_code;
} }
else else
@ -7342,6 +7350,10 @@ Sigma_Exit:
extrudemultiply = tmp_code ; extrudemultiply = tmp_code ;
} }
} }
else
{
printf_P(PSTR("%i%%\n"), extrudemultiply);
}
calculate_extruder_multipliers(); calculate_extruder_multipliers();
} }
break; break;