Skip to content

Commit 3331c47

Browse files
committed
Sync with ESP3DLib latest cleaning
Add mDNS code_base label (ESP3D/ESP3DLib) Remove outdated flags in ESP inline command line help Bump version
1 parent ee18988 commit 3331c47

File tree

5 files changed

+7
-44
lines changed

5 files changed

+7
-44
lines changed

esp3d/src/core/espcmd/ESP0.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ const char * help[]= {"[ESP] (id) - display this help",
109109
"[ESP402](State) - display/set check update at boot from SD which can be ON, OFF",
110110
#endif //SD_UPDATE_FEATURE
111111
#if defined (WIFI_FEATURE)
112-
"[ESP410](plain) - display available AP list (limited to 30) in plain/JSON",
112+
"[ESP410]display available AP list (limited to 30) in plain/JSON",
113113
#endif //WIFI_FEATURE
114-
"[ESP420](plain) - display ESP3D current status in plain/JSON",
114+
"[ESP420]display ESP3D current status in plain/JSON",
115115
"[ESP444](Cmd) - set ESP3D state (RESET/RESTART)",
116116
#ifdef MDNS_FEATURE
117117
"[ESP450]display ESP3D list on network",
@@ -147,7 +147,7 @@ const char * help[]= {"[ESP] (id) - display this help",
147147
"[ESP780](path) - List Global Filesystem",
148148
"[ESP790](Action)=(path) - rmdir / remove / mkdir / exists / create on Global Filesystem (path)",
149149
#endif //GLOBAL_FILESYSTEM_FEATURE
150-
"[ESP800](plain)(time=YYYY-MM-DD-HH-MM-SS) - display FW Informations in plain/JSON",
150+
"[ESP800](time=YYYY-MM-DD-HH-MM-SS) - display FW Informations in plain/JSON",
151151
#if COMMUNICATION_PROTOCOL != SOCKET_SERIAL
152152
"[ESP900](ENABLE/DISABLE) - display/set serial state",
153153
"[ESP901]<BAUD RATE> - display/set serial baud rate",

esp3d/src/include/Marlin/FlushableHardwareSerial.h

Lines changed: 0 additions & 38 deletions
This file was deleted.

esp3d/src/include/esp3d_config.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@
2525
#if defined __has_include
2626
# if __has_include ("../../configuration.h")
2727
#include "../../configuration.h"
28+
#define ESP3D_CODE_BASE "ESP3D"
2829
#else
2930
#undef DISABLED
3031
#undef _BV
3132
# if __has_include ("../esp3dlib_config.h")
3233
#include "../esp3dlib_config.h"
33-
#include "./Marlin/FlushableHardwareSerial.h"
34+
#define ESP3D_CODE_BASE "ESP3DLib"
3435
#else
3536
#error "No configuration file found"
3637
#endif

esp3d/src/include/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define _VERSION_ESP3D_H
2323

2424
//version and sources location
25-
#define FW_VERSION "3.0.0.a209"
25+
#define FW_VERSION "3.0.0.a210"
2626
#define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0"
2727

2828
#endif //_VERSION_ESP3D_H

esp3d/src/modules/mDNS/mDNS.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ void mDNS_Service::addESP3DServices(uint16_t port)
114114
return;
115115
}
116116
MDNS.addService(MDNS_SERVICE_NAME, MDNS_SERVICE_TYPE, _port);
117-
MDNS.addServiceTxt(MDNS_SERVICE_NAME, MDNS_SERVICE_TYPE, "firmware", "esp3d");
117+
MDNS.addServiceTxt(MDNS_SERVICE_NAME, MDNS_SERVICE_TYPE, "firmware", ESP3D_CODE_BASE);
118118
MDNS.addServiceTxt(MDNS_SERVICE_NAME, MDNS_SERVICE_TYPE, "version", FW_VERSION);
119119
#if defined(ARDUINO_ARCH_ESP8266)
120120
_hMDNSServiceQuery = MDNS.installServiceQuery(MDNS_SERVICE_NAME, MDNS_SERVICE_TYPE,MDNSServiceQueryCallback);

0 commit comments

Comments
 (0)