From 2af64ebba6f0a7306eba1a89fcc4e7e8cea3e076 Mon Sep 17 00:00:00 2001
From: thodkatz <thodkatz@gmail.com>
Date: Fri, 30 Nov 2018 18:43:57 +0200
Subject: [PATCH] Minor changes
---
inc/ECSS_Definitions.hpp | 4 ++--
inc/Services/RequestVerificationService.hpp | 12 ++++++------
src/Services/RequestVerificationService.cpp | 10 +++++-----
test/Services/RequestVerificationService.cpp | 10 +++++-----
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/inc/ECSS_Definitions.hpp b/inc/ECSS_Definitions.hpp
index 2b5ff9fd..9bbcb5c1 100644
--- a/inc/ECSS_Definitions.hpp
+++ b/inc/ECSS_Definitions.hpp
@@ -6,8 +6,8 @@
#define ECSS_MAX_STRING_SIZE 256
-//7.4.1
-#define ECSS_PACKET_VERSION 0
+// 7.4.1
+#define CCSDS_PACKET_VERSION 0
// 7.4.4.1c
#define ECSS_PUS_VERSION 2
diff --git a/inc/Services/RequestVerificationService.hpp b/inc/Services/RequestVerificationService.hpp
index fc1db397..8e6d2635 100644
--- a/inc/Services/RequestVerificationService.hpp
+++ b/inc/Services/RequestVerificationService.hpp
@@ -23,7 +23,7 @@ public:
/**
* TM[1,1] successful acceptance verification report
*
- * @param request Message& reference, that contains the necessary data to send the report.
+ * @param request Contains the necessary data to send the report.
* The data is actually some data members of Message that contain the basic info
* of the telecommand packet that accepted successfully
*
@@ -33,7 +33,7 @@ public:
/**
* TM[1,2] failed acceptance verification report
*
- * @param request Message& reference, that contains the necessary data to send the report.
+ * @param request Contains the necessary data to send the report.
* The data is actually some data members of Message that contain the basic
* info of the telecommand packet that failed to be accepted
*/
@@ -43,7 +43,7 @@ public:
/**
* TM[1,7] successful completion of execution verification report
*
- * @param request Message& reference, that contains the necessary data to send the report.
+ * @param request Contains the necessary data to send the report.
* The data is actually data members of Message that contain the basic info of the
* telecommand packet that executed successfully
*
@@ -53,9 +53,9 @@ public:
/**
* TM[1,8] failed completion of execution verification report
*
- * @param request Message& reference, that contains the necessary data to send the report.
+ * @param request Contains the necessary data to send the report.
* The data is actually some data members of Message that contain the basic info of the
- * telecommand packet that failed to be executed
+ * telecommand packet that failed to be executed
*
*/
void failExecutionVerification(Message &request);
@@ -63,7 +63,7 @@ public:
/**
* TM[1,10] failed routing verification report
*
- * @param request Message& reference, that contains the necessary data to send the report.
+ * @param request Contains the necessary data to send the report.
* The data is actually some data members of Message that contain the basic info of the
* telecommand packet that failed the routing
*
diff --git a/src/Services/RequestVerificationService.cpp b/src/Services/RequestVerificationService.cpp
index ba977962..f3029fcd 100644
--- a/src/Services/RequestVerificationService.cpp
+++ b/src/Services/RequestVerificationService.cpp
@@ -6,7 +6,7 @@ void RequestVerificationService::successAcceptanceVerification(Message &request)
Message report = createTM(1);
- report.appendEnumerated(3, ECSS_PACKET_VERSION); // packet version number
+ report.appendEnumerated(3, CCSDS_PACKET_VERSION); // packet version number
report.appendEnumerated(1, request.packetType); // packet type
report.appendBits(1, 0); // secondary header flag(not implemented)
report.appendEnumerated(11, request.applicationId); // application process ID
@@ -22,7 +22,7 @@ RequestVerificationService::failAcceptanceVerification(Message &request) {
Message report = createTM(2);
- report.appendEnumerated(3, ECSS_PACKET_VERSION); // packet version number
+ report.appendEnumerated(3, CCSDS_PACKET_VERSION); // packet version number
report.appendEnumerated(1, request.packetType); // packet type
report.appendBits(1, 0); // secondary header flag(not implemented)
report.appendEnumerated(11, request.applicationId); // application process ID
@@ -38,7 +38,7 @@ void RequestVerificationService::successExecutionVerification(Message &request)
Message report = createTM(7);
- report.appendEnumerated(3, ECSS_PACKET_VERSION); // packet version number
+ report.appendEnumerated(3, CCSDS_PACKET_VERSION); // packet version number
report.appendEnumerated(1, request.packetType); // packet type
report.appendBits(1, 0); // secondary header flag(not implemented)
report.appendEnumerated(11, request.applicationId); // application process ID
@@ -54,7 +54,7 @@ RequestVerificationService::failExecutionVerification(Message &request) {
Message report = createTM(8);
- report.appendEnumerated(3, ECSS_PACKET_VERSION); // packet version number
+ report.appendEnumerated(3, CCSDS_PACKET_VERSION); // packet version number
report.appendEnumerated(1, request.packetType); // packet type
report.appendBits(1, 0); // secondary header flag(not implemented)
report.appendEnumerated(11, request.applicationId); // application process ID
@@ -71,7 +71,7 @@ RequestVerificationService::failRoutingVerification(Message &request) {
Message report = createTM(10);
- report.appendEnumerated(3, ECSS_PACKET_VERSION); // packet version number
+ report.appendEnumerated(3, CCSDS_PACKET_VERSION); // packet version number
report.appendEnumerated(1, request.packetType); // packet type
report.appendBits(1, 0); // secondary header flag(not implemented)
report.appendEnumerated(11, request.applicationId); // application process ID
diff --git a/test/Services/RequestVerificationService.cpp b/test/Services/RequestVerificationService.cpp
index 18f46817..65a256d3 100644
--- a/test/Services/RequestVerificationService.cpp
+++ b/test/Services/RequestVerificationService.cpp
@@ -18,7 +18,7 @@ TEST_CASE("TM[1,1]", "[service][st01]") {
CHECK(response.applicationId == 0);
REQUIRE(response.dataSize == 4); // dataSize is the number of bytes of data array
// Check for the value that is stored in <<data>> array(data-member of object response)
- CHECK(response.readEnumerated(3) == ECSS_PACKET_VERSION); // packet version number
+ CHECK(response.readEnumerated(3) == CCSDS_PACKET_VERSION); // packet version number
CHECK(response.readEnumerated(1) == Message::TC); // packet type
CHECK(response.readBits(1) == 0); // secondary header flag
CHECK(response.readEnumerated(11) == 3); // application process ID
@@ -41,7 +41,7 @@ TEST_CASE("TM[1,2]", "[service][st01]") {
CHECK(response.applicationId == 0);
REQUIRE(response.dataSize == 6); // dataSize is the number of bytes of data array
// Check for the value that is stored in <<data>> array(data-member of object response)
- CHECK(response.readEnumerated(3) == ECSS_PACKET_VERSION); // packet version number
+ CHECK(response.readEnumerated(3) == CCSDS_PACKET_VERSION); // packet version number
CHECK(response.readEnumerated(1) == Message::TC); // packet type
CHECK(response.readBits(1) == 0); // secondary header flag
CHECK(response.readEnumerated(11) == 3); // application process ID
@@ -65,7 +65,7 @@ TEST_CASE("TM[1,7]", "[service][st01]") {
CHECK(response.applicationId == 0);
REQUIRE(response.dataSize == 4); // dataSize is the number of bytes of data array
// Check for the value that is stored in <<data>> array(data-member of object response)
- CHECK(response.readEnumerated(3) == ECSS_PACKET_VERSION); // packet version number
+ CHECK(response.readEnumerated(3) == CCSDS_PACKET_VERSION); // packet version number
CHECK(response.readEnumerated(1) == Message::TC); // packet type
CHECK(response.readBits(1) == 0); // secondary header flag
CHECK(response.readEnumerated(11) == 3); // application process ID
@@ -87,7 +87,7 @@ TEST_CASE("TM[1,8]", "[service][st01]") {
CHECK(response.applicationId == 0);
REQUIRE(response.dataSize == 6); // dataSize is the number of bytes of data array
// Check for the value that is stored in <<data>> array(data-member of object response)
- CHECK(response.readEnumerated(3) == ECSS_PACKET_VERSION); // packet version number
+ CHECK(response.readEnumerated(3) == CCSDS_PACKET_VERSION); // packet version number
CHECK(response.readEnumerated(1) == Message::TC); // packet type
CHECK(response.readBits(1) == 0); // secondary header flag
CHECK(response.readEnumerated(11) == 3); // application process ID
@@ -111,7 +111,7 @@ TEST_CASE("TM[1,10]", "[service][st01]") {
CHECK(response.applicationId == 0);
REQUIRE(response.dataSize == 6); // dataSize is the number of bytes of data array
// Check for the value that is stored in <<data>> array(data-member of object response)
- CHECK(response.readEnumerated(3) == ECSS_PACKET_VERSION); // packet version number
+ CHECK(response.readEnumerated(3) == CCSDS_PACKET_VERSION); // packet version number
CHECK(response.readEnumerated(1) == Message::TC); // packet type
CHECK(response.readBits(1) == 0); // secondary header flag
CHECK(response.readEnumerated(11) == 3); // application process ID
--
GitLab