Browse Source

Minor style tweaks

Scott Lahteine 5 years ago
parent
commit
3645e59893

+ 3
- 8
Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp View File

@@ -79,21 +79,16 @@ static void debug_rw(const bool write, int &pos, const uint8_t *value, const siz
79 79
   PGM_P const rw_str = write ? PSTR("write") : PSTR("read");
80 80
   SERIAL_CHAR(' ');
81 81
   serialprintPGM(rw_str);
82
-  SERIAL_ECHOPAIR("_data(", pos);
83
-  SERIAL_ECHOPAIR(",", (int)value);
84
-  SERIAL_ECHOPAIR(",", (int)size);
85
-  SERIAL_ECHOLNPGM(", ...)");
82
+  SERIAL_ECHOLNPAIR("_data(", pos, ",", int(value), ",", int(size), ", ...)");
86 83
   if (total) {
87 84
     SERIAL_ECHOPGM(" f_");
88 85
     serialprintPGM(rw_str);
89
-    SERIAL_ECHOPAIR("()=", (int)s);
90
-    SERIAL_ECHOPAIR("\n size=", size);
91
-    SERIAL_ECHOPGM("\n bytes_");
86
+    SERIAL_ECHOPAIR("()=", int(s), "\n size=", int(size), "\n bytes_");
92 87
     serialprintPGM(write ? PSTR("written=") : PSTR("read="));
93 88
     SERIAL_ECHOLN(total);
94 89
   }
95 90
   else
96
-    SERIAL_ECHOLNPAIR(" f_lseek()=", (int)s);
91
+    SERIAL_ECHOLNPAIR(" f_lseek()=", int(s));
97 92
 }
98 93
 
99 94
 // File function return codes for type FRESULT. This goes away soon, but

+ 2
- 2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp View File

@@ -451,8 +451,8 @@
451 451
               SERIAL_ECHO(g29_pos.y);
452 452
               SERIAL_ECHOLNPGM(").\n");
453 453
             }
454
-            const xy_pos_t near = g29_pos + probe.offset_xy;
455
-            probe_entire_mesh(near, parser.seen('T'), parser.seen('E'), parser.seen('U'));
454
+            const xy_pos_t near_probe_xy = g29_pos + probe.offset_xy;
455
+            probe_entire_mesh(near_probe_xy, parser.seen('T'), parser.seen('E'), parser.seen('U'));
456 456
 
457 457
             report_current_position();
458 458
             probe_deployed = true;

Loading…
Cancel
Save