From 4b6268f1240f52f693f281bb0346aa3cf64c2fcb Mon Sep 17 00:00:00 2001 From: Sergey Date: Mon, 30 Mar 2020 10:25:43 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=B8=D0=B7?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D1=81=D0=BE?= =?UTF-8?q?=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9=20=D1=82=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20=D0=B2=20Serial1=20=D0=B4=D0=BB=D1=8F=20WI?= =?UTF-8?q?FI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/gcode/gcode.cpp | 4 ++-- Marlin/src/gcode/temp/M105.cpp | 4 +++- Marlin/src/module/temperature.cpp | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index abd9cdd6fb..108b581bc2 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/Marlin/src/gcode/gcode.cpp @@ -856,8 +856,8 @@ void GcodeSuite::process_parsed_command(const bool no_ok/*=false*/) { #endif #if ENABLED(MKS_WIFI) - case 991: mks_m991(); return; - case 997: mks_m997(); return; + case 991: if ( serial_port_index) {mks_m991();}; return; + case 997: if ( serial_port_index) {mks_m997();}; return; #endif #if ENABLED(PLATFORM_M997_SUPPORT) diff --git a/Marlin/src/gcode/temp/M105.cpp b/Marlin/src/gcode/temp/M105.cpp index 9622ada86f..21990d54d0 100644 --- a/Marlin/src/gcode/temp/M105.cpp +++ b/Marlin/src/gcode/temp/M105.cpp @@ -34,7 +34,9 @@ void GcodeSuite::M105() { SERIAL_ECHOPGM(STR_OK); #if ENABLED(MKS_WIFI) - SERIAL_EOL(); + if ( serial_port_index){ + SERIAL_EOL(); + }; #endif #if HAS_TEMP_SENSOR diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp index 74b9544bd6..ecce18a7e9 100644 --- a/Marlin/src/module/temperature.cpp +++ b/Marlin/src/module/temperature.cpp @@ -3002,8 +3002,10 @@ void Temperature::tick() { default: k = 'B'; break; #endif } - #if DISABLED(MKS_WIFI) - SERIAL_CHAR(' '); + #if ENABLED(MKS_WIFI) + if (!serial_port_index){ + SERIAL_CHAR(' '); + } #endif SERIAL_CHAR(k); #if HOTENDS > 1