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

Merge pull request #2807 from leptun/MK3_Polling 

M220 M221 polling of values
This commit is contained in:
DRracer 2020-09-09 10:25:36 +02:00 committed by GitHub
parent 763d2d9849 a0cf5714ce
commit f145769e98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Firmware/Marlin_main.cpp
View File

@ -7300,17 +7300,26 @@ Sigma_Exit:
*/
case 220: // M220 S<factor in percent>- set speed factor override percentage
{
if (code_seen('B')) //backup current speed factor
{
saved_feedmultiply_mm = feedmultiply;
}
if(code_seen('S'))
{
feedmultiply = code_value() ;
}
if (code_seen('R')) { //restore previous feedmultiply
feedmultiply = saved_feedmultiply_mm;
}
bool codesWereSeen = false;
if (code_seen('B')) //backup current speed factor
{
saved_feedmultiply_mm = feedmultiply;
codesWereSeen = true;
}
if (code_seen('S'))
{
feedmultiply = code_value();
codesWereSeen = true;
}
if (code_seen('R')) //restore previous feedmultiply
{
feedmultiply = saved_feedmultiply_mm;
codesWereSeen = true;
}
if (!codesWereSeen)
{
printf_P(PSTR("%i%%\n"), feedmultiply);
}
}
break;
@ -7326,23 +7335,26 @@ Sigma_Exit:
*/
case 221: // M221 S<factor in percent>- set extrude factor override percentage
{
if(code_seen('S'))
{
int tmp_code = code_value();
if (code_seen('T'))
if (code_seen('S'))
{
uint8_t extruder;
if(setTargetedHotend(221, extruder)){
break;
}
extruder_multiply[extruder] = tmp_code;
int tmp_code = code_value();
if (code_seen('T'))
{
uint8_t extruder;
if (setTargetedHotend(221, extruder))
break;
extruder_multiply[extruder] = tmp_code;
}
else
{
extrudemultiply = tmp_code ;
}
}
else
{
extrudemultiply = tmp_code ;
printf_P(PSTR("%i%%\n"), extrudemultiply);
}
}
calculate_extruder_multipliers();
calculate_extruder_multipliers();
}
break;