From 4bba825cc51a4bdcedffce7d8902c66c86721fe8 Mon Sep 17 00:00:00 2001 From: hiluluk <thodkatz@gmail.com> Date: Fri, 5 Apr 2019 21:33:09 +0300 Subject: [PATCH] Minor changes --- inc/Services/EventActionService.hpp | 2 +- inc/Services/EventReportService.hpp | 2 +- inc/Services/FunctionManagementService.hpp | 2 +- inc/Services/MemoryManagementService.hpp | 2 +- inc/Services/ParameterService.hpp | 2 +- inc/Services/TestService.hpp | 2 +- inc/Services/TimeBasedSchedulingService.hpp | 2 +- inc/Services/TimeManagementService.hpp | 2 +- src/Service.cpp | 5 ++--- src/Services/EventActionService.cpp | 3 +-- src/Services/EventReportService.cpp | 3 +-- src/Services/FunctionManagementService.cpp | 3 +-- src/Services/MemoryManagementService.cpp | 3 +-- src/Services/ParameterService.cpp | 3 +-- src/Services/TestService.cpp | 3 +-- src/Services/TimeBasedSchedulingService.cpp | 3 +-- src/Services/TimeManagementService.cpp | 3 +-- 17 files changed, 18 insertions(+), 27 deletions(-) diff --git a/inc/Services/EventActionService.hpp b/inc/Services/EventActionService.hpp index 974a6526..43dffb29 100644 --- a/inc/Services/EventActionService.hpp +++ b/inc/Services/EventActionService.hpp @@ -126,7 +126,7 @@ public: * @note This function is called from the main execute() that is defined in the file MessageParser.hpp * @param message Contains the necessary parameters to call the suitable subservice */ - void execute(const Message &message); + void execute(const Message& message); }; #endif //ECSS_SERVICES_EVENTACTIONSERVICE_HPP diff --git a/inc/Services/EventReportService.hpp b/inc/Services/EventReportService.hpp index 842afe02..3ed47d86 100644 --- a/inc/Services/EventReportService.hpp +++ b/inc/Services/EventReportService.hpp @@ -182,7 +182,7 @@ public: * @note This function is called from the main execute() that is defined in the file MessageParser.hpp * @param param Contains the necessary parameters to call the suitable subservice */ - void execute(const Message &message); + void execute(const Message& message); }; #endif //ECSS_SERVICES_EVENTREPORTSERVICE_HPP diff --git a/inc/Services/FunctionManagementService.hpp b/inc/Services/FunctionManagementService.hpp index a4887439..7b11f417 100644 --- a/inc/Services/FunctionManagementService.hpp +++ b/inc/Services/FunctionManagementService.hpp @@ -98,7 +98,7 @@ public: * @note This function is called from the main execute() that is defined in the file MessageParser.hpp * @param param Contains the necessary parameters to call the suitable subservice */ - void execute(Message ¶m); + void execute(Message& param); }; #endif //ECSS_SERVICES_FUNCTIONMANAGEMENTSERVICE_HPP diff --git a/inc/Services/MemoryManagementService.hpp b/inc/Services/MemoryManagementService.hpp index 418a0cbd..2995924c 100644 --- a/inc/Services/MemoryManagementService.hpp +++ b/inc/Services/MemoryManagementService.hpp @@ -79,7 +79,7 @@ public: * @note This function is called from the main execute() that is defined in the file MessageParser.hpp * @param param Contains the necessary parameters to call the suitable subservice */ - void execute(Message &message); + void execute(Message& message); } rawDataMemorySubservice; private: diff --git a/inc/Services/ParameterService.hpp b/inc/Services/ParameterService.hpp index e6d1aa58..687fd32d 100644 --- a/inc/Services/ParameterService.hpp +++ b/inc/Services/ParameterService.hpp @@ -94,7 +94,7 @@ public: * @note This function is called from the main execute() that is defined in the file MessageParser.hpp * @param param Contains the necessary parameters to call the suitable subservice */ - void execute(Message &message); + void execute(Message& message); }; diff --git a/inc/Services/TestService.hpp b/inc/Services/TestService.hpp index 937c1b97..cb8afc67 100644 --- a/inc/Services/TestService.hpp +++ b/inc/Services/TestService.hpp @@ -31,7 +31,7 @@ public: * * @todo Error handling for the switch() in the implementation of this execute function */ - void execute(Message &message); + void execute(Message& message); }; diff --git a/inc/Services/TimeBasedSchedulingService.hpp b/inc/Services/TimeBasedSchedulingService.hpp index cd6b6e03..ff8589b3 100644 --- a/inc/Services/TimeBasedSchedulingService.hpp +++ b/inc/Services/TimeBasedSchedulingService.hpp @@ -253,7 +253,7 @@ public: * @note This function is called from the main execute() that is defined in the file MessageParser.hpp * @param message Contains the necessary parameters to call the suitable subservice */ - void execute(Message &message); + void execute(Message& message); }; #endif //ECSS_SERVICES_TIMEBASEDSCHEDULINGSERVICE_HPP diff --git a/inc/Services/TimeManagementService.hpp b/inc/Services/TimeManagementService.hpp index 073d2a50..5812de37 100644 --- a/inc/Services/TimeManagementService.hpp +++ b/inc/Services/TimeManagementService.hpp @@ -70,7 +70,7 @@ public: * @note This function is called from the main execute() that is defined in the file MessageParser.hpp * @param message Contains the necessary parameters to call the suitable subservice */ - void execute(Message &message); + void execute(Message& message); }; diff --git a/src/Service.cpp b/src/Service.cpp index 9a74dba5..e308a62c 100644 --- a/src/Service.cpp +++ b/src/Service.cpp @@ -1,7 +1,7 @@ #include "Service.hpp" #include "ServicePool.hpp" -void Service::execute(Message &message) { +void Service::execute(Message& message) { switch (message.serviceType) { case 5: Services.eventReport.execute(message); // ST[05] @@ -28,6 +28,5 @@ void Service::execute(Message &message) { Services.parameterManagement.execute(message); // ST[20] default: ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType); - break; } -} \ No newline at end of file +} diff --git a/src/Services/EventActionService.cpp b/src/Services/EventActionService.cpp index 4c456e11..95ed674f 100644 --- a/src/Services/EventActionService.cpp +++ b/src/Services/EventActionService.cpp @@ -192,7 +192,7 @@ void EventActionService::executeAction(uint16_t eventID) { } } -void EventActionService::execute(const Message &message) { +void EventActionService::execute(const Message& message) { switch (message.messageType) { case 1: addEventActionDefinitions(message); // TC[19,1] @@ -220,6 +220,5 @@ void EventActionService::execute(const Message &message) { break; default: ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType); - break; } } diff --git a/src/Services/EventReportService.cpp b/src/Services/EventReportService.cpp index 22a1cf65..ae2888e2 100644 --- a/src/Services/EventReportService.cpp +++ b/src/Services/EventReportService.cpp @@ -131,7 +131,7 @@ void EventReportService::listOfDisabledEventsReport() { storeMessage(report); } -void EventReportService::execute(const Message &message) { +void EventReportService::execute(const Message& message) { switch (message.messageType) { case 5: enableReportGeneration(message); // TC[5,5] break; @@ -141,6 +141,5 @@ void EventReportService::execute(const Message &message) { break; default: ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType); - break; } } diff --git a/src/Services/FunctionManagementService.cpp b/src/Services/FunctionManagementService.cpp index 27435a6b..7b41c862 100644 --- a/src/Services/FunctionManagementService.cpp +++ b/src/Services/FunctionManagementService.cpp @@ -51,13 +51,12 @@ void FunctionManagementService::include(String<FUNC_NAME_LENGTH> funcName, void( } } -void FunctionManagementService::execute(Message &message) { +void FunctionManagementService::execute(Message& message) { switch (message.messageType) { case 1: call(message); // TC[8,1] break; default: ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType); - break; } } diff --git a/src/Services/MemoryManagementService.cpp b/src/Services/MemoryManagementService.cpp index be7ec5b5..a963c3e4 100644 --- a/src/Services/MemoryManagementService.cpp +++ b/src/Services/MemoryManagementService.cpp @@ -231,7 +231,7 @@ inline bool MemoryManagementService::dataValidator(const uint8_t *data, uint16_t return (checksum == CRCHelper::calculateCRC(data, length)); } -void MemoryManagementService::RawDataMemoryManagement::execute(Message &message) { +void MemoryManagementService::RawDataMemoryManagement::execute(Message& message) { switch (message.messageType) { case 2: loadRawData(message); // TC[6,2] @@ -244,6 +244,5 @@ void MemoryManagementService::RawDataMemoryManagement::execute(Message &message) break; default: ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType); - break; } } diff --git a/src/Services/ParameterService.cpp b/src/Services/ParameterService.cpp index d8cd9bb2..710e8bb0 100644 --- a/src/Services/ParameterService.cpp +++ b/src/Services/ParameterService.cpp @@ -120,7 +120,7 @@ uint16_t ParameterService::numOfValidIds(Message idMsg) { return validIds; } -void ParameterService::execute(Message &message) { +void ParameterService::execute(Message& message) { switch (message.messageType) { case 1: reportParameterIds(message); // TC[20,1] @@ -129,6 +129,5 @@ void ParameterService::execute(Message &message) { setParameterIds(message); // TC[20,3] default: ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType); - break; } } diff --git a/src/Services/TestService.cpp b/src/Services/TestService.cpp index 462fbfc8..5dab3a0a 100644 --- a/src/Services/TestService.cpp +++ b/src/Services/TestService.cpp @@ -18,7 +18,7 @@ void TestService::onBoardConnection(Message &request) { storeMessage(report); } -void TestService::execute(Message &message) { +void TestService::execute(Message& message) { switch (message.messageType) { case 1: areYouAlive(message); @@ -28,6 +28,5 @@ void TestService::execute(Message &message) { break; default: ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType); - break; } } diff --git a/src/Services/TimeBasedSchedulingService.cpp b/src/Services/TimeBasedSchedulingService.cpp index 3a4b7838..58f532ae 100644 --- a/src/Services/TimeBasedSchedulingService.cpp +++ b/src/Services/TimeBasedSchedulingService.cpp @@ -282,7 +282,7 @@ void TimeBasedSchedulingService::summaryReportActivitiesByID(Message &request) { storeMessage(report); // Save the report } -void TimeBasedSchedulingService::execute(Message &message) { +void TimeBasedSchedulingService::execute(Message& message) { switch (message.messageType) { case 1: enableScheduleExecution(message); // TC[11,1] @@ -316,6 +316,5 @@ void TimeBasedSchedulingService::execute(Message &message) { break; default: ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType); - break; } } diff --git a/src/Services/TimeManagementService.cpp b/src/Services/TimeManagementService.cpp index 40c67c5f..93c224bb 100644 --- a/src/Services/TimeManagementService.cpp +++ b/src/Services/TimeManagementService.cpp @@ -26,13 +26,12 @@ TimeAndDate TimeManagementService::cdsTimeRequest(Message &message) { return timeInfo; } -void TimeManagementService::execute(Message &message) { +void TimeManagementService::execute(Message& message) { switch (message.messageType) { case 128: cdsTimeRequest(message); // TC[9,128] break; default: ErrorHandler::reportInternalError(ErrorHandler::OtherMessageType); - break; } } -- GitLab