andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[2.0.x] Fix ambiguous function call (SERIAL_PROTOCOL_F) when using Arduino_Core_STM32 (#11747)

pull/1/head
Karl Andersson 6 years ago
committed by Scott Lahteine
parent
d32c4efc77
commit
69d0ed5791
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Marlin/src/feature/bedlevel/bedlevel.cpp

6
Marlin/src/feature/bedlevel/bedlevel.cpp
View File

@ -214,7 +214,7 @@ void reset_bed_level() {
for (uint8_t x = 0; x < sx; x++) { for (uint8_t x = 0; x < sx; x++) {
for (uint8_t i = 0; i < precision + 2 + (x < 10 ? 1 : 0); i++) for (uint8_t i = 0; i < precision + 2 + (x < 10 ? 1 : 0); i++)
SERIAL_PROTOCOLCHAR(' '); SERIAL_PROTOCOLCHAR(' ');
SERIAL_PROTOCOL((int)x); SERIAL_PROTOCOL(int(x));
} }
SERIAL_EOL(); SERIAL_EOL();
#endif #endif
@ -226,14 +226,14 @@ void reset_bed_level() {
SERIAL_PROTOCOLPGM(" ["); // open sub-array SERIAL_PROTOCOLPGM(" ["); // open sub-array
#else #else
if (y < 10) SERIAL_PROTOCOLCHAR(' '); if (y < 10) SERIAL_PROTOCOLCHAR(' ');
SERIAL_PROTOCOL((int)y); SERIAL_PROTOCOL(int(y));
#endif #endif
for (uint8_t x = 0; x < sx; x++) { for (uint8_t x = 0; x < sx; x++) {
SERIAL_PROTOCOLCHAR(' '); SERIAL_PROTOCOLCHAR(' ');
const float offset = fn(x, y); const float offset = fn(x, y);
if (!isnan(offset)) { if (!isnan(offset)) {
if (offset >= 0) SERIAL_PROTOCOLCHAR('+'); if (offset >= 0) SERIAL_PROTOCOLCHAR('+');
SERIAL_PROTOCOL_F(offset, precision); SERIAL_PROTOCOL_F(offset, int(precision));
} }
else { else {
#ifdef SCAD_MESH_OUTPUT #ifdef SCAD_MESH_OUTPUT

Write Preview
Loading…
Cancel
Save