From a5b5858266c1a44d18214c167dcabc588682557f Mon Sep 17 00:00:00 2001
From: kongr45gpen <electrovesta@gmail.com>
Date: Tue, 13 Aug 2019 14:35:21 +0300
Subject: [PATCH] Update the RequestVerificationService with the new packet
 header fields

---
 src/Services/RequestVerificationService.cpp  | 36 ++++++++++----------
 test/ErrorHandler.cpp                        | 10 +++---
 test/Services/RequestVerificationService.cpp | 18 +++++-----
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/Services/RequestVerificationService.cpp b/src/Services/RequestVerificationService.cpp
index fdab0b0c..e298a182 100644
--- a/src/Services/RequestVerificationService.cpp
+++ b/src/Services/RequestVerificationService.cpp
@@ -7,10 +7,10 @@ void RequestVerificationService::successAcceptanceVerification(const Message& re
 
 	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.appendBits(1, 1); // secondary header flag
 	report.appendEnumerated(11, request.applicationId); // application process ID
 	report.appendEnumerated(2, ECSS_SEQUENCE_FLAGS); // sequence flags
-	report.appendBits(14, 0); // packet sequence count(not implemented)
+	report.appendBits(14, request.packetSequenceCount); // packet sequence count
 
 	storeMessage(report);
 }
@@ -23,10 +23,10 @@ void RequestVerificationService::failAcceptanceVerification(const Message& reque
 
 	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.appendBits(1, 1); // secondary header flag
 	report.appendEnumerated(11, request.applicationId); // application process ID
 	report.appendEnumerated(2, ECSS_SEQUENCE_FLAGS); // sequence flags
-	report.appendBits(14, 0); // packet sequence count(not implemented)
+	report.appendBits(14, request.packetSequenceCount); // packet sequence count
 	report.appendEnum16(errorCode); // error code
 
 	storeMessage(report);
@@ -39,10 +39,10 @@ void RequestVerificationService::successStartExecutionVerification(const Message
 
 	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.appendBits(1, 1); // secondary header flag
 	report.appendEnumerated(11, request.applicationId); // application process ID
 	report.appendEnumerated(2, ECSS_SEQUENCE_FLAGS); // sequence flags
-	report.appendBits(14, 0); // packet sequence count
+	report.appendBits(14, request.packetSequenceCount); // packet sequence count
 
 	storeMessage(report);
 }
@@ -55,10 +55,10 @@ void RequestVerificationService::failStartExecutionVerification(const Message& r
 
 	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.appendBits(1, 1); // secondary header flag
 	report.appendEnumerated(11, request.applicationId); // application process ID
 	report.appendEnumerated(2, ECSS_SEQUENCE_FLAGS); // sequence flags
-	report.appendBits(14, 0); // packet sequence count(not implemented)
+	report.appendBits(14, request.packetSequenceCount); // packet sequence count
 	report.appendEnum16(errorCode); // error code
 
 	storeMessage(report);
@@ -71,10 +71,10 @@ void RequestVerificationService::successProgressExecutionVerification(const Mess
 
 	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.appendBits(1, 1); // secondary header flag
 	report.appendEnumerated(11, request.applicationId); // application process ID
 	report.appendEnumerated(2, ECSS_SEQUENCE_FLAGS); // sequence flags
-	report.appendBits(14, 0); // packet sequence count(not implemented)
+	report.appendBits(14, request.packetSequenceCount); // packet sequence count
 	report.appendByte(stepID); // step ID
 
 	storeMessage(report);
@@ -89,10 +89,10 @@ void RequestVerificationService::failProgressExecutionVerification(const Message
 
 	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.appendBits(1, 1); // secondary header flag
 	report.appendEnumerated(11, request.applicationId); // application process ID
 	report.appendEnumerated(2, ECSS_SEQUENCE_FLAGS); // sequence flags
-	report.appendBits(14, 0); // packet sequence count(not implemented)
+	report.appendBits(14, request.packetSequenceCount); // packet sequence count
 	report.appendByte(stepID); // step ID
 	report.appendEnum16(errorCode); // error code
 
@@ -106,10 +106,10 @@ void RequestVerificationService::successCompletionExecutionVerification(const Me
 
 	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.appendBits(1, 1); // secondary header flag
 	report.appendEnumerated(11, request.applicationId); // application process ID
 	report.appendEnumerated(2, ECSS_SEQUENCE_FLAGS); // sequence flags
-	report.appendBits(14, 0); // packet sequence count(not implemented)
+	report.appendBits(14, request.packetSequenceCount); // packet sequence count
 
 	storeMessage(report);
 }
@@ -122,10 +122,10 @@ void RequestVerificationService::failCompletionExecutionVerification(
 
 	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.appendBits(1, 1); // secondary header flag
 	report.appendEnumerated(11, request.applicationId); // application process ID
 	report.appendEnumerated(2, ECSS_SEQUENCE_FLAGS); // sequence flags
-	report.appendBits(14, 0); // packet sequence count(not implemented)
+	report.appendBits(14, request.packetSequenceCount); // packet sequence count
 	report.appendEnum16(errorCode); // error code
 
 	storeMessage(report);
@@ -139,10 +139,10 @@ void RequestVerificationService::failRoutingVerification(const Message& request,
 
 	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.appendBits(1, 1); // secondary header flag
 	report.appendEnumerated(11, request.applicationId); // application process ID
 	report.appendEnumerated(2, ECSS_SEQUENCE_FLAGS); // sequence flags
-	report.appendBits(14, 0); // packet sequence count(not implemented)
+	report.appendBits(14, request.packetSequenceCount); // packet sequence count
 	report.appendEnum16(errorCode); // error code
 
 	storeMessage(report);
diff --git a/test/ErrorHandler.cpp b/test/ErrorHandler.cpp
index 38f89722..804657b3 100644
--- a/test/ErrorHandler.cpp
+++ b/test/ErrorHandler.cpp
@@ -18,7 +18,7 @@ TEST_CASE("Error: Failed Acceptance", "[errors]") {
 
 	CHECK(report.readBits(3) == CCSDS_PACKET_VERSION);
 	CHECK(report.readBits(1) == static_cast<uint16_t>(Message::TC));
-	CHECK(report.readBits(1) == 0);
+	CHECK(report.readBits(1) == 1);
 	CHECK(report.readBits(11) == 47);
 	CHECK(report.readBits(2) == ECSS_SEQUENCE_FLAGS);
 	CHECK(report.readBits(14) == failedMessage.packetSequenceCount);
@@ -41,7 +41,7 @@ TEST_CASE("Error: Failed Execution Start", "[errors]") {
 
 	CHECK(report.readBits(3) == CCSDS_PACKET_VERSION);
 	CHECK(report.readBits(1) == static_cast<uint16_t>(Message::TC));
-	CHECK(report.readBits(1) == 0);
+	CHECK(report.readBits(1) == 1);
 	CHECK(report.readBits(11) == 56);
 	CHECK(report.readBits(2) == ECSS_SEQUENCE_FLAGS);
 	CHECK(report.readBits(14) == failedMessage.packetSequenceCount);
@@ -64,7 +64,7 @@ TEST_CASE("Error: Failed Execution Progress", "[errors]") {
 
 	CHECK(report.readBits(3) == CCSDS_PACKET_VERSION);
 	CHECK(report.readBits(1) == static_cast<uint16_t>(Message::TC));
-	CHECK(report.readBits(1) == 0);
+	CHECK(report.readBits(1) == 1);
 	CHECK(report.readBits(11) == 56);
 	CHECK(report.readBits(2) == ECSS_SEQUENCE_FLAGS);
 	CHECK(report.readBits(14) == failedMessage.packetSequenceCount);
@@ -88,7 +88,7 @@ TEST_CASE("Error: Failed Execution Completion", "[errors]") {
 
 	CHECK(report.readBits(3) == CCSDS_PACKET_VERSION);
 	CHECK(report.readBits(1) == static_cast<uint16_t>(Message::TC));
-	CHECK(report.readBits(1) == 0);
+	CHECK(report.readBits(1) == 1);
 	CHECK(report.readBits(11) == 56);
 	CHECK(report.readBits(2) == ECSS_SEQUENCE_FLAGS);
 	CHECK(report.readBits(14) == failedMessage.packetSequenceCount);
@@ -111,7 +111,7 @@ TEST_CASE("Error: Failed Routing", "[errors]") {
 
 	CHECK(report.readBits(3) == CCSDS_PACKET_VERSION);
 	CHECK(report.readBits(1) == static_cast<uint16_t>(Message::TC));
-	CHECK(report.readBits(1) == 0);
+	CHECK(report.readBits(1) == 1);
 	CHECK(report.readBits(11) == 71);
 	CHECK(report.readBits(2) == ECSS_SEQUENCE_FLAGS);
 	CHECK(report.readBits(14) == failedMessage.packetSequenceCount);
diff --git a/test/Services/RequestVerificationService.cpp b/test/Services/RequestVerificationService.cpp
index 6576bdba..df0ea7e2 100644
--- a/test/Services/RequestVerificationService.cpp
+++ b/test/Services/RequestVerificationService.cpp
@@ -20,7 +20,7 @@ TEST_CASE("TM[1,1]", "[service][st01]") {
 	// Check for the value that is stored in <<data>> array(data-member of object response)
 	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.readBits(1) == 1); // secondary header flag
 	CHECK(response.readEnumerated(11) == 3); // application process ID
 	CHECK(response.readEnumerated(2) == ECSS_SEQUENCE_FLAGS); // sequence flags
 	CHECK(response.readBits(14) == 0); // packet sequence count
@@ -41,7 +41,7 @@ TEST_CASE("TM[1,2]", "[service][st01]") {
 	// Check for the value that is stored in <<data>> array(data-member of object response)
 	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.readBits(1) == 1); // secondary header flag
 	CHECK(response.readEnumerated(11) == 3); // application process ID
 	CHECK(response.readEnumerated(2) == ECSS_SEQUENCE_FLAGS); // sequence flags
 	CHECK(response.readBits(14) == 0); // packet sequence count
@@ -63,7 +63,7 @@ TEST_CASE("TM[1,3]", "[service][st01]") {
 	// Check for the value that is stored in <<data>> array(data-member of object response)
 	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.readBits(1) == 1); // secondary header flag
 	CHECK(response.readEnumerated(11) == 3); // application process ID
 	CHECK(response.readEnumerated(2) == ECSS_SEQUENCE_FLAGS); // sequence flags
 	CHECK(response.readBits(14) == 0); // packet sequence count
@@ -84,7 +84,7 @@ TEST_CASE("TM[1,4]", "[service][st01]") {
 	// Check for the value that is stored in <<data>> array(data-member of object response)
 	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.readBits(1) == 1); // secondary header flag
 	CHECK(response.readEnumerated(11) == 3); // application process ID
 	CHECK(response.readEnumerated(2) == ECSS_SEQUENCE_FLAGS); // sequence flags
 	CHECK(response.readBits(14) == 0); // packet sequence count
@@ -106,7 +106,7 @@ TEST_CASE("TM[1,5]", "[service][st01]") {
 	// Check for the value that is stored in <<data>> array(data-member of object response)
 	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.readBits(1) == 1); // secondary header flag
 	CHECK(response.readEnumerated(11) == 3); // application process ID
 	CHECK(response.readEnumerated(2) == ECSS_SEQUENCE_FLAGS); // sequence flags
 	CHECK(response.readBits(14) == 0); // packet sequence count
@@ -128,7 +128,7 @@ TEST_CASE("TM[1,6]", "[service][st01]") {
 	// Check for the value that is stored in <<data>> array(data-member of object response)
 	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.readBits(1) == 1); // secondary header flag
 	CHECK(response.readEnumerated(11) == 3); // application process ID
 	CHECK(response.readEnumerated(2) == ECSS_SEQUENCE_FLAGS); // sequence flags
 	CHECK(response.readBits(14) == 0); // packet sequence count
@@ -151,7 +151,7 @@ TEST_CASE("TM[1,7]", "[service][st01]") {
 	// Check for the value that is stored in <<data>> array(data-member of object response)
 	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.readBits(1) == 1); // secondary header flag
 	CHECK(response.readEnumerated(11) == 3); // application process ID
 	CHECK(response.readEnumerated(2) == ECSS_SEQUENCE_FLAGS); // sequence flags
 	CHECK(response.readBits(14) == 0); // packet sequence count
@@ -171,7 +171,7 @@ TEST_CASE("TM[1,8]", "[service][st01]") {
 	// Check for the value that is stored in <<data>> array(data-member of object response)
 	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.readBits(1) == 1); // secondary header flag
 	CHECK(response.readEnumerated(11) == 3); // application process ID
 	CHECK(response.readEnumerated(2) == ECSS_SEQUENCE_FLAGS); // sequence flags
 	CHECK(response.readBits(14) == 0); // packet sequence count
@@ -193,7 +193,7 @@ TEST_CASE("TM[1,10]", "[service][st01]") {
 	// Check for the value that is stored in <<data>> array(data-member of object response)
 	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.readBits(1) == 1); // secondary header flag
 	CHECK(response.readEnumerated(11) == 3); // application process ID
 	CHECK(response.readEnumerated(2) == ECSS_SEQUENCE_FLAGS); // sequence flags
 	CHECK(response.readBits(14) == 0); // packet sequence count
-- 
GitLab