From 33fff303a2a0120b6a210b999d600e53306bc62e Mon Sep 17 00:00:00 2001 From: Dimitrios Stoupis <dimitris.apple@gmail.com> Date: Wed, 13 Mar 2019 19:01:53 +0000 Subject: [PATCH] Rename the file to a shorter name --- CMakeLists.txt | 2 +- ...vice.hpp => TimeBasedSchedulingService.hpp} | 10 +++++----- ...vice.cpp => TimeBasedSchedulingService.cpp} | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) rename inc/Services/{TimeBasedCommandSchedulingService.hpp => TimeBasedSchedulingService.hpp} (92%) rename src/Services/{TimeBasedCommandSchedulingService.cpp => TimeBasedSchedulingService.cpp} (86%) diff --git a/CMakeLists.txt b/CMakeLists.txt index acaefa9f..2eb1adc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ add_library(common OBJECT src/Services/RequestVerificationService.cpp src/Services/TestService.cpp src/Services/TimeManagementService.cpp - src/Services/TimeBasedCommandSchedulingService.cpp + src/Services/TimeBasedSchedulingService.cpp src/Services/EventActionService.cpp ) diff --git a/inc/Services/TimeBasedCommandSchedulingService.hpp b/inc/Services/TimeBasedSchedulingService.hpp similarity index 92% rename from inc/Services/TimeBasedCommandSchedulingService.hpp rename to inc/Services/TimeBasedSchedulingService.hpp index d5dceddd..77baac0e 100644 --- a/inc/Services/TimeBasedCommandSchedulingService.hpp +++ b/inc/Services/TimeBasedSchedulingService.hpp @@ -1,8 +1,8 @@ -#ifndef ECSS_SERVICES_TIMEBASEDCOMMANDSCHEDULINGSERVICE_HPP -#define ECSS_SERVICES_TIMEBASEDCOMMANDSCHEDULINGSERVICE_HPP +#ifndef ECSS_SERVICES_TIMEBASEDSCHEDULINGSERVICE_HPP +#define ECSS_SERVICES_TIMEBASEDSCHEDULINGSERVICE_HPP #include <iostream> -#include <vector> +#include "etl/vector.h" #include "Service.hpp" #include "Helpers/CRCHelper.hpp" #include "ErrorHandler.hpp" @@ -15,7 +15,7 @@ #define TIME_MARGIN_FOR_ACTIVATION 60 // todo: define the time margin for the command activation -class TimeBasedCommandSchedulingService : public Service { +class TimeBasedSchedulingService : public Service { public: @@ -105,4 +105,4 @@ private: }; -#endif //ECSS_SERVICES_TIMEBASEDCOMMANDSCHEDULINGSERVICE_HPP +#endif //ECSS_SERVICES_TIMEBASEDSCHEDULINGSERVICE_HPP diff --git a/src/Services/TimeBasedCommandSchedulingService.cpp b/src/Services/TimeBasedSchedulingService.cpp similarity index 86% rename from src/Services/TimeBasedCommandSchedulingService.cpp rename to src/Services/TimeBasedSchedulingService.cpp index 23b80683..f487d64d 100644 --- a/src/Services/TimeBasedCommandSchedulingService.cpp +++ b/src/Services/TimeBasedSchedulingService.cpp @@ -1,7 +1,7 @@ -#include "Services/TimeBasedCommandSchedulingService.hpp" +#include "Services/TimeBasedSchedulingService.hpp" -void TimeBasedCommandSchedulingService::enableScheduleExecution(Message &request) { +void TimeBasedSchedulingService::enableScheduleExecution(Message &request) { // Check if the correct packet is being processed assert(request.serviceType == 11); @@ -10,7 +10,7 @@ void TimeBasedCommandSchedulingService::enableScheduleExecution(Message &request executionFunctionStatus = true; // Enable the service } -void TimeBasedCommandSchedulingService::disableScheduleExecution(Message &request) { +void TimeBasedSchedulingService::disableScheduleExecution(Message &request) { // Check if the correct packet is being processed assert(request.serviceType == 11); @@ -19,7 +19,7 @@ void TimeBasedCommandSchedulingService::disableScheduleExecution(Message &reques executionFunctionStatus = false; // Disable the service } -void TimeBasedCommandSchedulingService::resetSchedule(Message &request) { +void TimeBasedSchedulingService::resetSchedule(Message &request) { // Check if the correct packet is being processed assert(request.serviceType == 11); @@ -30,7 +30,7 @@ void TimeBasedCommandSchedulingService::resetSchedule(Message &request) { // todo: Add resetting for sub-schedules and groups, if defined } -void TimeBasedCommandSchedulingService::insertActivities(Message &request) { +void TimeBasedSchedulingService::insertActivities(Message &request) { // Check if the correct packet is being processed assert(request.serviceType == 11); @@ -65,7 +65,7 @@ void TimeBasedCommandSchedulingService::insertActivities(Message &request) { } -void TimeBasedCommandSchedulingService::timeShiftAllActivities(Message &request) { +void TimeBasedSchedulingService::timeShiftAllActivities(Message &request) { // Check if the correct packet is being processed assert(request.serviceType == 11); @@ -83,7 +83,7 @@ void TimeBasedCommandSchedulingService::timeShiftAllActivities(Message &request) } } -void TimeBasedCommandSchedulingService::timeShiftActivitiesByID(Message &request) { +void TimeBasedSchedulingService::timeShiftActivitiesByID(Message &request) { // Check if the correct packet is being processed assert(request.serviceType == 11); @@ -106,7 +106,7 @@ void TimeBasedCommandSchedulingService::timeShiftActivitiesByID(Message &request } } -void TimeBasedCommandSchedulingService::deleteActivitiesByID(Message &request) { +void TimeBasedSchedulingService::deleteActivitiesByID(Message &request) { // Check if the correct packet is being processed assert(request.serviceType == 11); @@ -114,7 +114,7 @@ void TimeBasedCommandSchedulingService::deleteActivitiesByID(Message &request) { } -void TimeBasedCommandSchedulingService::detailReportAllActivities(Message &request) { +void TimeBasedSchedulingService::detailReportAllActivities(Message &request) { // Check if the correct packet is being processed assert(request.serviceType == 11); -- GitLab