Browse Source

Minor style tweaks

vanilla_fb_2.0.x
Scott Lahteine 5 years ago
parent
commit
3645e59893
  1. 11
      Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
  2. 4
      Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp

11
Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp

@ -79,21 +79,16 @@ static void debug_rw(const bool write, int &pos, const uint8_t *value, const siz
PGM_P const rw_str = write ? PSTR("write") : PSTR("read"); PGM_P const rw_str = write ? PSTR("write") : PSTR("read");
SERIAL_CHAR(' '); SERIAL_CHAR(' ');
serialprintPGM(rw_str); serialprintPGM(rw_str);
SERIAL_ECHOPAIR("_data(", pos); SERIAL_ECHOLNPAIR("_data(", pos, ",", int(value), ",", int(size), ", ...)");
SERIAL_ECHOPAIR(",", (int)value);
SERIAL_ECHOPAIR(",", (int)size);
SERIAL_ECHOLNPGM(", ...)");
if (total) { if (total) {
SERIAL_ECHOPGM(" f_"); SERIAL_ECHOPGM(" f_");
serialprintPGM(rw_str); serialprintPGM(rw_str);
SERIAL_ECHOPAIR("()=", (int)s); SERIAL_ECHOPAIR("()=", int(s), "\n size=", int(size), "\n bytes_");
SERIAL_ECHOPAIR("\n size=", size);
SERIAL_ECHOPGM("\n bytes_");
serialprintPGM(write ? PSTR("written=") : PSTR("read=")); serialprintPGM(write ? PSTR("written=") : PSTR("read="));
SERIAL_ECHOLN(total); SERIAL_ECHOLN(total);
} }
else else
SERIAL_ECHOLNPAIR(" f_lseek()=", (int)s); SERIAL_ECHOLNPAIR(" f_lseek()=", int(s));
} }
// File function return codes for type FRESULT. This goes away soon, but // File function return codes for type FRESULT. This goes away soon, but

4
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp

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

Loading…
Cancel
Save