Skip to content

Commit 6fb1cb0

Browse files
committed
Add override for Marlin locking M117 update
1 parent 284e982 commit 6fb1cb0

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/core/esp3d_commands.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,6 +1481,11 @@ bool ESP3DCommands::dispatch(ESP3DMessage *msg) {
14811481
tmp.replace("\n", " ");
14821482
tmp.replace("\r", "");
14831483
tmp += "\n";
1484+
//Override lock from Marlin if error was displayed previouly preventing any update
1485+
if (ESP3DSettings::GetFirmwareTarget() == MARLIN ||
1486+
ESP3DSettings::GetFirmwareTarget() == MARLIN_EMBEDDED) {
1487+
tmp = "M117\n" + tmp;
1488+
}
14841489
if (esp3d_message_manager.setDataContent(msg, (uint8_t *)tmp.c_str(),
14851490
tmp.length())) {
14861491
return dispatch(msg);

src/esp3dlib_config.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@
213213
#if defined(ESP_SD_CS_PIN)
214214
#undef ESP_SD_CS_PIN
215215
#endif // ESP_SD_CS_PIN
216-
217216
#define ESP_SD_CS_PIN SD_SS_PIN
218217
#endif // SDSS
219218

0 commit comments

Comments
 (0)