GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-10-19 11:51:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the char ; blocking serial on Marlin - so use M117 and refresh IP at start when setup is done

Browse Source
This commit is contained in:
Luc 2020-06-14 15:44:16 +02:00
parent 268d492c3f
commit b365cd95df
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esp3d/src/core/esp3doutput.cpp
View File

@ -231,7 +231,7 @@ size_t ESP3DOutput::printMSG(const char * s, bool withNL)
break; break;
case MARLIN: case MARLIN:
case MARLINKIMBRA: case MARLINKIMBRA:
display = ";echo: "; display = "M117 ";
display += s; display += s;
break; break;
case REPETIER4DV: case REPETIER4DV:

2
esp3d/src/include/version.h
View File

@ -22,7 +22,7 @@
#define _VERSION_ESP3D_H #define _VERSION_ESP3D_H
//version and sources location //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" #define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0"
#endif //_VERSION_ESP3D_H #endif //_VERSION_ESP3D_H

3
esp3d/src/modules/network/netservices.cpp
View File

@ -87,7 +87,7 @@ bool NetServices::begin()
bool res = true; bool res = true;
_started = false; _started = false;
String hostname = Settings_ESP3D::read_string(ESP_HOSTNAME); String hostname = Settings_ESP3D::read_string(ESP_HOSTNAME);
ESP3DOutput output(ESP_SERIAL_CLIENT); ESP3DOutput output(ESP_ALL_CLIENTS);
end(); end();
#ifdef TIMESTAMP_FEATURE #ifdef TIMESTAMP_FEATURE
if (WiFi.getMode() != WIFI_AP) { if (WiFi.getMode() != WIFI_AP) {
@ -280,6 +280,7 @@ bool NetServices::begin()
if (!res) { if (!res) {
end(); end();
} }
output.printMSG(NetConfig::localIP().c_str());
_started = res; _started = res;
return _started; return _started;
} }