0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #8314 from thinkyhead/bf2_sprintf_p_fix

Browse source 
[2.0] Patch abuse of sprintf_P in G33
This commit is contained in:
Scott Lahteine 2017-11-07 17:50:55 -06:00 committed by GitHub
parent ed62c621d7 96c9d715f3
commit a34b5a2bfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/gcode/calibrate/G33.cpp
View file

@ -649,7 +649,7 @@ void GcodeSuite::G33() {
} }
SERIAL_EOL(); SERIAL_EOL();
char mess[21]; char mess[21];
sprintf_P(mess, PSTR("Calibration sd:")); strcpy_P(mess, PSTR("Calibration sd:"));
if (zero_std_dev_min < 1) if (zero_std_dev_min < 1)
sprintf_P(&mess[15], PSTR("0.%03i"), (int)round(zero_std_dev_min * 1000.0)); sprintf_P(&mess[15], PSTR("0.%03i"), (int)round(zero_std_dev_min * 1000.0));
else else
@ -664,7 +664,7 @@ void GcodeSuite::G33() {
if (iterations < 31) if (iterations < 31)
sprintf_P(mess, PSTR("Iteration : %02i"), (int)iterations); sprintf_P(mess, PSTR("Iteration : %02i"), (int)iterations);
else else
sprintf_P(mess, PSTR("No convergence")); strcpy_P(mess, PSTR("No convergence"));
SERIAL_PROTOCOL(mess); SERIAL_PROTOCOL(mess);
SERIAL_PROTOCOL_SP(32); SERIAL_PROTOCOL_SP(32);
SERIAL_PROTOCOLPGM("std dev:"); SERIAL_PROTOCOLPGM("std dev:");
@ -683,8 +683,8 @@ void GcodeSuite::G33() {
SERIAL_EOL(); SERIAL_EOL();
char mess[21]; char mess[21];
sprintf_P(mess, enddryrun); strcpy_P(mess, enddryrun);
sprintf_P(&mess[11], PSTR(" sd:")); strcpy_P(&mess[11], PSTR(" sd:"));
if (zero_std_dev < 1) if (zero_std_dev < 1)
sprintf_P(&mess[15], PSTR("0.%03i"), (int)round(zero_std_dev * 1000.0)); sprintf_P(&mess[15], PSTR("0.%03i"), (int)round(zero_std_dev * 1000.0));
else else