From 0ce355d9e7bc76a9aea4bf723b746494839bf261 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 14 May 2015 03:33:38 -0700 Subject: [PATCH 1/2] Use MSG_OK in M105 --- Marlin/Marlin_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index ecdad9977f..189f519be8 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -3211,7 +3211,7 @@ inline void gcode_M105() { if (setTargetedHotend(105)) return; #if HAS_TEMP_0 || HAS_TEMP_BED || defined(HEATER_0_USES_MAX6675) - SERIAL_PROTOCOLPGM("ok"); + SERIAL_PROTOCOLPGM(MSG_OK); #if HAS_TEMP_0 SERIAL_PROTOCOLPGM(" T:"); SERIAL_PROTOCOL_F(degHotend(target_extruder), 1); From 0f6cd3640b0db730df02f52745b9c3d824d2be7d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 14 May 2015 04:38:09 -0700 Subject: [PATCH 2/2] Drop extraneous ok_to_send --- Marlin/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 189f519be8..acb292f700 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1793,7 +1793,6 @@ inline void gcode_G0_G1() { #endif //FWRETRACT prepare_move(); - //ok_to_send(); } }