LinController: fix tx/rx trivial behaviour

Demos/communication/Lin/LinMasterDemo.cpp

@@ -104,14 +104,6 @@ class LinMaster : public ApplicationBase
     {
         const auto linId{static_cast<unsigned>(linFrame.id)};
 
-        if (_linController->Status() != LinControllerStatus::Operational)
-        {
-            std::stringstream ss;
-            ss << "LIN Frame with ID=" << linId << " not sent, since the controller is not operational";
-            GetLogger()->Warn(ss.str());
-            return;
-        }
-
         _linController->SendFrame(linFrame, responseType);
 
         std::stringstream ss;

SilKit/IntegrationTests/ITest_NetSimLin.cpp

@@ -557,8 +557,8 @@ TEST_F(ITest_NetSimLin, networksimulation_lin_dynamic)
                 {
                     SendLinFrames(now, linController, callCounts.silKitSentMsgLin.SentFramesTrivial);
                     SendLinFrameHeaders(now, linController, callCounts.silKitSentMsgLin.SentFrameHeadersTrivial);
-                    WakeupOnce(now, linController);
                     GoToSleepOnce(now, linController);
+                    WakeupOnce(now, linController);
                 }
             }, _stepSize);
 

SilKit/source/services/lin/LinController.cpp

@@ -220,6 +220,12 @@ void LinController::WarnOnReceptionWhileInactive() const
     _logger->Warn(errorMsg);
 }
 
+void LinController::WarnOnReceptionWhileSleeping() const
+{
+    std::string warnMsg = fmt::format("Sleeping LinController received a transmission. This transmission is ignored!");
+    _logger->Warn(warnMsg);
+}
+
 void LinController::WarnOnUnneededStatusChange(LinControllerStatus status) const
 {
     std::string errorMsg =
@@ -756,6 +762,12 @@ void LinController::ReceiveMsg(const IServiceEndpoint* from, const LinTransmissi
         return;
     }
 
+    if(_controllerStatus == LinControllerStatus::Sleep || _controllerStatus == LinControllerStatus::Unknown)
+    {
+        WarnOnReceptionWhileSleeping();
+        return;
+    }
+
     const auto& frame = msg.frame;
     bool isGoToSleepFrame = frame.id == GoToSleepFrame().id && frame.data == GoToSleepFrame().data;
 

SilKit/source/services/lin/LinController.hpp

@@ -187,6 +187,7 @@ class LinController
     void WarnOnReceptionWithInvalidLinId(LinId invalidLinId, const std::string& fromParticipantName,
                                          const std::string& fromServiceName) const;
     void WarnOnReceptionWhileInactive() const;
+    void WarnOnReceptionWhileSleeping() const;
     void WarnOnUnneededStatusChange(LinControllerStatus status) const;
     void WarnOnInvalidLinId(LinId invalidLinId, const std::string& callingMethodName) const;
     void WarnOnUnusedResponseMode(const std::string& callingMethodName) const;

SilKit/source/services/lin/SimBehaviorTrivial.cpp

@@ -5,6 +5,7 @@
 #include "LinController.hpp"
 #include "SimBehaviorTrivial.hpp"
 #include "Assert.hpp"
+#include "LoggerMessage.hpp"
 
 namespace SilKit {
 namespace Services {
@@ -88,11 +89,25 @@ void SimBehaviorTrivial::SendMsgImpl(MsgT&& msg)
 
 void SimBehaviorTrivial::SendMsg(LinSendFrameRequest&& msg)
 {
+    auto controllerStatus = _parentController->Status();
+    if(controllerStatus == LinControllerStatus::Sleep || controllerStatus == LinControllerStatus::Unknown)
+    {
+        Logging::Warn(_participant->GetLogger(),
+                      "LinController not operational. SendFrameRequest will not be sent!");
+        return;
+    }
     _parentController->SendFrameHeader(msg.frame.id);
 }
 
 void SimBehaviorTrivial::SendMsg(LinTransmission&& msg)
 {
+    auto controllerStatus = _parentController->Status();
+    if(controllerStatus == LinControllerStatus::Sleep || controllerStatus == LinControllerStatus::Unknown)
+    {
+        Logging::Warn(_participant->GetLogger(),
+                      "LinController not operational. LinTransmission will not be sent!");
+        return;
+    }
     SendMsgImpl(msg);
 }
 

docs/changelog/versions/latest.md

@@ -1,3 +1,5 @@
 # [5.0.4] - UNRELEASED
 
-> This changelog entry is still empty.
+## Fixed
+
+- `Lin controller`: fixed tx/rx behaviour when controller is not operational