Browse Source

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

Karl Andersson 7 years ago
parent
commit
69d0ed5791
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      Marlin/src/feature/bedlevel/bedlevel.cpp

+ 3
- 3
Marlin/src/feature/bedlevel/bedlevel.cpp View File

214
       for (uint8_t x = 0; x < sx; x++) {
214
       for (uint8_t x = 0; x < sx; x++) {
215
         for (uint8_t i = 0; i < precision + 2 + (x < 10 ? 1 : 0); i++)
215
         for (uint8_t i = 0; i < precision + 2 + (x < 10 ? 1 : 0); i++)
216
           SERIAL_PROTOCOLCHAR(' ');
216
           SERIAL_PROTOCOLCHAR(' ');
217
-        SERIAL_PROTOCOL((int)x);
217
+        SERIAL_PROTOCOL(int(x));
218
       }
218
       }
219
       SERIAL_EOL();
219
       SERIAL_EOL();
220
     #endif
220
     #endif
226
         SERIAL_PROTOCOLPGM(" [");           // open sub-array
226
         SERIAL_PROTOCOLPGM(" [");           // open sub-array
227
       #else
227
       #else
228
         if (y < 10) SERIAL_PROTOCOLCHAR(' ');
228
         if (y < 10) SERIAL_PROTOCOLCHAR(' ');
229
-        SERIAL_PROTOCOL((int)y);
229
+        SERIAL_PROTOCOL(int(y));
230
       #endif
230
       #endif
231
       for (uint8_t x = 0; x < sx; x++) {
231
       for (uint8_t x = 0; x < sx; x++) {
232
         SERIAL_PROTOCOLCHAR(' ');
232
         SERIAL_PROTOCOLCHAR(' ');
233
         const float offset = fn(x, y);
233
         const float offset = fn(x, y);
234
         if (!isnan(offset)) {
234
         if (!isnan(offset)) {
235
           if (offset >= 0) SERIAL_PROTOCOLCHAR('+');
235
           if (offset >= 0) SERIAL_PROTOCOLCHAR('+');
236
-          SERIAL_PROTOCOL_F(offset, precision);
236
+          SERIAL_PROTOCOL_F(offset, int(precision));
237
         }
237
         }
238
         else {
238
         else {
239
           #ifdef SCAD_MESH_OUTPUT
239
           #ifdef SCAD_MESH_OUTPUT

Loading…
Cancel
Save