diff options
author | David Crocker <dcrocker@eschertech.com> | 2022-07-13 21:21:00 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2022-07-13 21:21:00 +0300 |
commit | 2860cf15465ee5a0dacb8309e8580744e649f776 (patch) | |
tree | cb78f5255af7e863776c2256ab6977012cc1894f | |
parent | fb116c73f50be294763d5c4b99cf188991fcab75 (diff) |
More fixes for ACT LED on MB6HC
-rw-r--r-- | src/CAN/CanInterface.cpp | 1 | ||||
-rw-r--r-- | src/CAN/CommandProcessor.cpp | 10 | ||||
-rw-r--r-- | src/Platform/Platform.cpp | 2 | ||||
-rw-r--r-- | src/Platform/Tasks.cpp | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/CAN/CanInterface.cpp b/src/CAN/CanInterface.cpp index 31c43bd2..f3d1de15 100644 --- a/src/CAN/CanInterface.cpp +++ b/src/CAN/CanInterface.cpp @@ -452,6 +452,7 @@ extern "C" [[noreturn]] void CanSenderLoop(void *) noexcept { buf.dataLength = msg->GetActualDataLength(); SendCanMessage(TxBufferIndexUrgent, MaxUrgentSendWait, &buf); + reprap.GetPlatform().OnProcessingCanMessage(); } TaskBase::Take(timeToWait); // wait until we are woken up because a message is available, or we time out } diff --git a/src/CAN/CommandProcessor.cpp b/src/CAN/CommandProcessor.cpp index d27fa6aa..a91e8cd2 100644 --- a/src/CAN/CommandProcessor.cpp +++ b/src/CAN/CommandProcessor.cpp @@ -389,15 +389,15 @@ void CommandProcessor::ProcessReceivedMessage(CanMessageBuffer *buf) noexcept { if (buf->id.Src() != CanInterface::GetCanAddress()) // I don't think we should receive our own broadcasts, but in case we do... { + if (buf->id.Dst() != CanId::BroadcastAddress) + { + reprap.GetPlatform().OnProcessingCanMessage(); + } + const CanMessageType id = buf->id.MsgType(); #if SUPPORT_REMOTE_COMMANDS if (CanInterface::InExpansionMode()) { - if (id != CanMessageType::timeSync) - { - reprap.GetPlatform().OnProcessingCanMessage(); - } - String<StringLength500> reply; const StringRef& replyRef = reply.GetRef(); GCodeResult rslt; diff --git a/src/Platform/Platform.cpp b/src/Platform/Platform.cpp index 5988dfd2..5d78759c 100644 --- a/src/Platform/Platform.cpp +++ b/src/Platform/Platform.cpp @@ -2511,7 +2511,7 @@ void Platform::EnableOneLocalDriver(size_t driver, float requiredCurrent) noexce { SmartDrivers::EnableDrive(driver, true); } -# if !defined(DUET3MINI) // no enable pins on 5LC +# if !defined(DUET3MINI) // no enable pins on 5LC else { digitalWrite(ENABLE_PINS[driver], enableValues[driver] > 0); diff --git a/src/Platform/Tasks.cpp b/src/Platform/Tasks.cpp index 8ef89076..0f8eb0c9 100644 --- a/src/Platform/Tasks.cpp +++ b/src/Platform/Tasks.cpp @@ -128,7 +128,7 @@ void *Tasks::GetNVMBuffer(const uint32_t *stk) noexcept [[noreturn]] void AppMain() noexcept { pinMode(DiagPin, (DiagOnPolarity) ? OUTPUT_LOW : OUTPUT_HIGH); // set up status LED for debugging and turn it off -#ifdef DUET3MINI +#if defined(DUET3MINI) || defined(DUET3_MB6XD) pinMode(ActLedPin, (ActOnPolarity) ? OUTPUT_LOW : OUTPUT_HIGH); // set up activity LED and turn it off #endif |