From b365cd95dfe4a6e5dd9be26cdf2573faca14e824 Mon Sep 17 00:00:00 2001 From: Luc <8822552+luc-github@users.noreply.github.com> Date: Sun, 14 Jun 2020 15:44:16 +0200 Subject: [PATCH] Fix the char ; blocking serial on Marlin - so use M117 and refresh IP at start when setup is done --- esp3d/src/core/esp3doutput.cpp | 2 +- esp3d/src/include/version.h | 2 +- esp3d/src/modules/network/netservices.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/esp3d/src/core/esp3doutput.cpp b/esp3d/src/core/esp3doutput.cpp index 156d1088..41efa5a4 100644 --- a/esp3d/src/core/esp3doutput.cpp +++ b/esp3d/src/core/esp3doutput.cpp @@ -231,7 +231,7 @@ size_t ESP3DOutput::printMSG(const char * s, bool withNL) break; case MARLIN: case MARLINKIMBRA: - display = ";echo: "; + display = "M117 "; display += s; break; case REPETIER4DV: diff --git a/esp3d/src/include/version.h b/esp3d/src/include/version.h index 9ea640c4..a745453f 100644 --- a/esp3d/src/include/version.h +++ b/esp3d/src/include/version.h @@ -22,7 +22,7 @@ #define _VERSION_ESP3D_H //version and sources location -#define FW_VERSION "3.0.0.a44" +#define FW_VERSION "3.0.0.a45" #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0" #endif //_VERSION_ESP3D_H diff --git a/esp3d/src/modules/network/netservices.cpp b/esp3d/src/modules/network/netservices.cpp index 8a858eae..b5a04f27 100644 --- a/esp3d/src/modules/network/netservices.cpp +++ b/esp3d/src/modules/network/netservices.cpp @@ -87,7 +87,7 @@ bool NetServices::begin() bool res = true; _started = false; String hostname = Settings_ESP3D::read_string(ESP_HOSTNAME); - ESP3DOutput output(ESP_SERIAL_CLIENT); + ESP3DOutput output(ESP_ALL_CLIENTS); end(); #ifdef TIMESTAMP_FEATURE if (WiFi.getMode() != WIFI_AP) { @@ -280,6 +280,7 @@ bool NetServices::begin() if (!res) { end(); } + output.printMSG(NetConfig::localIP().c_str()); _started = res; return _started; }