Renamed setSelectedMode to getSelectedMode in Ready state, Adjusted Y…

…oda-style in all files
BlueAndi · Jul 30, 2024 · d47c8cf · d47c8cf
1 parent 579d460
commit d47c8cf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/lib/APPReinforcementLearning/src/App.cpp b/lib/APPReinforcementLearning/src/App.cpp
@@ -118,7 +118,7 @@ void App::loop()
     {
         Status payload = {SMPChannelPayload::Status::NOT_DONE};
 
-        if (DrivingState::getInstance().isAbortRequired() == true)
+        if (true == DrivingState::getInstance().isAbortRequired())
         {
             payload = {SMPChannelPayload::Status::DONE};
         }
@@ -139,14 +139,14 @@ void App::loop()
     }
 
     /* Send Mode selected to The Supervisor. */
-    if (&ReadyState::getInstance() == m_systemStateMachine.getState() && (!m_modeSelectionSent))
+    if (&ReadyState::getInstance() == m_systemStateMachine.getState() && (false == m_modeSelectionSent))
     {
-        uint8_t mode_options = ReadyState::getInstance().setSelectedMode();
+        uint8_t mode_options = ReadyState::getInstance().getSelectedMode();
 
-        if (mode_options > 0)
+        if (0U < mode_options)
         {
             SMPChannelPayload::Mode payload =
-                (mode_options == 1) ? SMPChannelPayload::Mode::DRIVING_MODE : SMPChannelPayload::Mode::TRAINING_MODE;
+                (1 == mode_options) ? SMPChannelPayload::Mode::DRIVING_MODE : SMPChannelPayload::Mode::TRAINING_MODE;
 
             /* Ignoring return value, as error handling is not available. */
             (void)m_smpServer.sendData(m_serialMuxProtChannelIdMode, &payload, sizeof(payload));
@@ -196,7 +196,7 @@ void App::sendLineSensorsData() const
     uint8_t         lineSensorIdx    = 0U;
     LineSensorData  payload;
 
-    if (LINE_SENSOR_CHANNEL_DLC == maxLineSensors * sizeof(uint16_t))
+    if (LINE_SENSOR_CHANNEL_DLC == (maxLineSensors * sizeof(uint16_t)))
     {
         while (maxLineSensors > lineSensorIdx)
         {

diff --git a/lib/APPReinforcementLearning/src/ReadyState.cpp b/lib/APPReinforcementLearning/src/ReadyState.cpp
@@ -120,7 +120,7 @@ void ReadyState::process(StateMachine& sm)
      * If either Button A or Button B is not pressed and the timer
      * expires, the training mode should automatically activate.
      */
-    else if (true == m_modeTimeoutTimer.isTimeout() && (m_mode == IDLE))
+    else if (true == m_modeTimeoutTimer.isTimeout() && (IDLE == m_mode))
     {
         m_mode = TRAINING_MODE;
         m_modeTimeoutTimer.restart();
@@ -135,7 +135,7 @@ void ReadyState::process(StateMachine& sm)
     /**Drive forward until START LINE is crossed */
     driveUntilStartLineisCrossed();
 
-    if ((isStartStopLineDetected(lineSensorValues, maxLineSensors) == false) && (m_isLastStartStopLineDetected == true))
+    if (false == (isStartStopLineDetected(lineSensorValues, maxLineSensors)) && (true == m_isLastStartStopLineDetected))
     {
         sm.setState(&DrivingState::getInstance());
     }
@@ -156,7 +156,7 @@ void ReadyState::setLapTime(uint32_t lapTime)
     m_lapTime            = lapTime;
 }
 
-uint8_t ReadyState::setSelectedMode()
+uint8_t ReadyState::getSelectedMode()
 {
     return m_mode;
 }

diff --git a/lib/APPReinforcementLearning/src/ReadyState.h b/lib/APPReinforcementLearning/src/ReadyState.h
@@ -102,7 +102,7 @@ class ReadyState : public IState
      *
      * @return It returns 1 if DrivingMode is selected or 2 if TrainingMode is selected.
      */
-    uint8_t setSelectedMode();
+    uint8_t getSelectedMode();
 
 protected:
 private: