diff options
author | David Crocker <dcrocker@eschertech.com> | 2021-11-11 00:30:18 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2021-11-11 00:30:18 +0300 |
commit | f45daf52905d80cdb8d068a1ce3c050d364ef757 (patch) | |
tree | 8da537e42b750ad325fa5184af9e1fc05333a42c | |
parent | 17b427e8cd030aa585b4c3c5e5868647ba253fc0 (diff) |
Added annotations following changes from merge
-rw-r--r-- | src/CAN/CanInterface.cpp | 6 | ||||
-rw-r--r-- | src/CAN/CanInterface.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/CAN/CanInterface.cpp b/src/CAN/CanInterface.cpp index 2b71ecee..9730cc1c 100644 --- a/src/CAN/CanInterface.cpp +++ b/src/CAN/CanInterface.cpp @@ -61,7 +61,7 @@ constexpr float MinJumpWidth = 0.05; constexpr float MaxJumpWidth = 0.5; constexpr float DefaultJumpWidth = 0.25; -constexpr const char *NoCanBufferMessage = "no CAN buffer available"; +constexpr const char *_ecv_array NoCanBufferMessage = "no CAN buffer available"; static Mutex transactionMutex; @@ -815,7 +815,7 @@ uint32_t CanInterface::SendPlainMessageNoFree(CanMessageBuffer *buf, uint32_t co return (can1dev != nullptr) ? can1dev->SendMessage(CanDevice::TxBufferNumber::fifo, timeout, buf) : 0; } -bool CanInterface::ReceivePlainMessage(CanMessageBuffer *buf, uint32_t const timeout) noexcept +bool CanInterface::ReceivePlainMessage(CanMessageBuffer *null buf, uint32_t const timeout) noexcept { return can1dev != nullptr && can1dev->ReceiveMessage(CanDevice::RxBufferNumber::fifo0, timeout, buf); } @@ -1127,7 +1127,7 @@ void CanInterface::WakeAsyncSenderFromIsr() noexcept } // Remote handle functions -GCodeResult CanInterface::CreateHandle(CanAddress boardAddress, RemoteInputHandle h, const char *pinName, uint16_t threshold, uint16_t minInterval, +GCodeResult CanInterface::CreateHandle(CanAddress boardAddress, RemoteInputHandle h, const char *_ecv_array pinName, uint16_t threshold, uint16_t minInterval, bool& currentState, const StringRef& reply) noexcept { CanMessageBuffer * const buf = CanMessageBuffer::Allocate(); diff --git a/src/CAN/CanInterface.h b/src/CAN/CanInterface.h index b0344f16..db898211 100644 --- a/src/CAN/CanInterface.h +++ b/src/CAN/CanInterface.h @@ -88,7 +88,7 @@ namespace CanInterface #if DUAL_CAN uint32_t SendPlainMessageNoFree(CanMessageBuffer *buf, uint32_t timeout = UsualSendTimeout) noexcept; - bool ReceivePlainMessage(CanMessageBuffer *buf, uint32_t timeout = UsualResponseTimeout) noexcept; + bool ReceivePlainMessage(CanMessageBuffer *null buf, uint32_t timeout = UsualResponseTimeout) noexcept; #endif #if !SAME70 @@ -119,7 +119,7 @@ namespace CanInterface void WakeAsyncSenderFromIsr() noexcept; // Remote handle functions - GCodeResult CreateHandle(CanAddress boardAddress, RemoteInputHandle h, const char *pinName, uint16_t threshold, uint16_t minInterval, bool& currentState, const StringRef& reply) noexcept; + GCodeResult CreateHandle(CanAddress boardAddress, RemoteInputHandle h, const char *_ecv_array pinName, uint16_t threshold, uint16_t minInterval, bool& currentState, const StringRef& reply) noexcept; GCodeResult DeleteHandle(CanAddress boardAddress, RemoteInputHandle h, const StringRef& reply) noexcept; GCodeResult GetHandlePinName(CanAddress boardAddress, RemoteInputHandle h, bool& currentState, const StringRef& reply) noexcept; GCodeResult EnableHandle(CanAddress boardAddress, RemoteInputHandle h, bool enable, bool& currentState, const StringRef& reply) noexcept; |