Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 2 commits into from
Sep 10, 2018
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e8088f
Fix ambiguous function call when using Arduino_Core_STM32
ktand Sep 6, 2018
34cb4c4
Update bedlevel.cpp
thinkyhead Sep 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Marlin/src/feature/bedlevel/bedlevel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ void reset_bed_level() {
for (uint8_t x = 0; x < sx; x++) {
for (uint8_t i = 0; i < precision + 2 + (x < 10 ? 1 : 0); i++)
SERIAL_PROTOCOLCHAR(' ');
SERIAL_PROTOCOL((int)x);
SERIAL_PROTOCOL(int(x));
}
SERIAL_EOL();
#endif
Expand All @@ -226,14 +226,14 @@ void reset_bed_level() {
SERIAL_PROTOCOLPGM(" ["); // open sub-array
#else
if (y < 10) SERIAL_PROTOCOLCHAR(' ');
SERIAL_PROTOCOL((int)y);
SERIAL_PROTOCOL(int(y));
#endif
for (uint8_t x = 0; x < sx; x++) {
SERIAL_PROTOCOLCHAR(' ');
const float offset = fn(x, y);
if (!isnan(offset)) {
if (offset >= 0) SERIAL_PROTOCOLCHAR('+');
SERIAL_PROTOCOL_F(offset, precision);
SERIAL_PROTOCOL_F(offset, int(precision));
}
else {
#ifdef SCAD_MESH_OUTPUT
Expand Down