diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-12-14 23:19:38 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-12-14 23:19:38 +0300 |
| commit | 73ae2eda574d40925856688af3721fe1f650372f (patch) | |
| tree | daeb0bf39997ed0b59b4e7beec2abd921475d9bf | |
| parent | 765dcf6a8655dd40846178fa31b321855c83c346 (diff) | |
Fixes to event system
| -rw-r--r-- | src/GCodes/GCodes3.cpp | 2 | ||||
| -rw-r--r-- | src/Platform/Event.cpp | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/GCodes/GCodes3.cpp b/src/GCodes/GCodes3.cpp index 1f5b432a..26f5c711 100644 --- a/src/GCodes/GCodes3.cpp +++ b/src/GCodes/GCodes3.cpp @@ -1906,7 +1906,7 @@ void GCodes::ProcessEvent(GCodeBuffer& gb) noexcept // Get the event message String<StringLength100> eventText; const MessageType mt = Event::GetTextDescription(eventText.GetRef()); - platform.Message(mt, eventText.c_str()); // tell the user about the event and log it + platform.MessageF(mt, "%s\n", eventText.c_str()); // tell the user about the event and log it // Get the name of the macro file that we should look for String<StringLength50> macroName; diff --git a/src/Platform/Event.cpp b/src/Platform/Event.cpp index d145ce66..e6cc33b5 100644 --- a/src/Platform/Event.cpp +++ b/src/Platform/Event.cpp @@ -156,18 +156,22 @@ inline Event::Event(Event *_ecv_null p_next, EventType et, uint16_t p_param, uin case EventType::driver_error: #if SUPPORT_CAN_EXPANSION - str.printf("Driver %u.%u error: %s", ep->boardAddress, ep->deviceNumber, ep->text.c_str()); + str.printf("Driver %u.%u error: ", ep->boardAddress, ep->deviceNumber); #else - str.printf("Driver %u error: %s", ep->deviceNumber, ep->text.c_str()); + str.printf("Driver %u error: ", ep->deviceNumber); #endif + StandardDriverStatus(ep->param).AppendText(str, 2); + str.cat(ep->text.c_str()); return ErrorMessage; case EventType::driver_warning: #if SUPPORT_CAN_EXPANSION - str.printf("Driver %u.%u warning: %s", ep->boardAddress, ep->deviceNumber, ep->text.c_str()); + str.printf("Driver %u.%u warning: ", ep->boardAddress, ep->deviceNumber); #else - str.printf("Driver %u warning: %s", ep->deviceNumber, ep->text.c_str()); + str.printf("Driver %u warning: ", ep->deviceNumber); #endif + StandardDriverStatus(ep->param).AppendText(str, 1); + str.cat(ep->text.c_str()); return WarningMessage; case EventType::driver_stall: |