From 97cb0a8c3e3dbaeac07935938b145237a7285d8c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 27 Jul 2020 18:09:52 -0500 Subject: [PATCH] General cleanup --- Marlin/src/gcode/control/M997.cpp | 2 ++ Marlin/src/module/settings.cpp | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/src/gcode/control/M997.cpp b/Marlin/src/gcode/control/M997.cpp index 6c28d42f4..cdff96f1a 100644 --- a/Marlin/src/gcode/control/M997.cpp +++ b/Marlin/src/gcode/control/M997.cpp @@ -28,7 +28,9 @@ * M997: Perform in-application firmware update */ void GcodeSuite::M997() { + flashFirmware(parser.intval('S')); + } #endif diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp index 3df2067f5..34af8f2ea 100644 --- a/Marlin/src/module/settings.cpp +++ b/Marlin/src/module/settings.cpp @@ -2517,8 +2517,7 @@ void MarlinSettings::reset() { #if HAS_PROBE_XY_OFFSET LOOP_XYZ(a) probe.offset[a] = dpo[a]; #else - probe.offset.x = probe.offset.y = 0; - probe.offset.z = dpo[Z_AXIS]; + probe.offset.set(0, 0, dpo[Z_AXIS]); #endif #endif