From 506304c4d5e6a509537697fa407d05e014f87fc2 Mon Sep 17 00:00:00 2001
From: athatheocsd <athatheo@csd.auth.gr>
Date: Mon, 7 Jan 2019 19:51:42 +0200
Subject: [PATCH] Small changes :)
---
inc/Services/EventReportService.hpp | 1 -
src/main.cpp | 11 +++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/inc/Services/EventReportService.hpp b/inc/Services/EventReportService.hpp
index 3b2c2bdd..5d17779b 100644
--- a/inc/Services/EventReportService.hpp
+++ b/inc/Services/EventReportService.hpp
@@ -2,7 +2,6 @@
#define ECSS_SERVICES_EVENTREPORTSERVICE_HPP
#include "Service.hpp"
-#include <Services/EventActionService.hpp> // Not sure if this is needed here or just in .cpp file
#include <bitset>
/**
* Implementation of ST[05] event reporting service
diff --git a/src/main.cpp b/src/main.cpp
index 1adbf2ab..bc6fcc91 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,6 +7,7 @@
#include "Services/MemoryManagementService.hpp"
#include "Services/EventReportService.hpp"
#include "Services/TimeManagementService.hpp"
+#include "Services/EventActionService.hpp"
#include "Message.hpp"
#include "MessageParser.hpp"
#include "Services/MemoryManagementService.hpp"
@@ -230,8 +231,9 @@ int main() {
eventActionService.disableEventActionDefinitions(eventActionDefinition3);
std::cout << "Status of position 0,1,2 should be 000:" << eventActionService
- .stateOfEventAction[0] << eventActionService.stateOfEventAction[1] << eventActionService
- .stateOfEventAction[2];
+ .eventActionDefinitionArray[0].enabled << eventActionService
+ .eventActionDefinitionArray[1].enabled <<
+ eventActionService.eventActionDefinitionArray[2].enabled;
Message eventActionDefinition5(19, 4, Message::TC, 1);
eventActionDefinition5.appendUint16(2);
@@ -241,8 +243,9 @@ int main() {
eventActionDefinition5.appendUint16(3);
eventActionService.enableEventActionDefinitions(eventActionDefinition5);
std::cout << "\nStatus of position 0,1,2 should be 111:" << eventActionService
- .stateOfEventAction[0] << eventActionService.stateOfEventAction[1] << eventActionService
- .stateOfEventAction[2];
+ .eventActionDefinitionArray[0].enabled << eventActionService
+ .eventActionDefinitionArray[1].enabled <<
+ eventActionService.eventActionDefinitionArray[2].enabled;
Message eventActionDefinition4(19, 2, Message::TC, 1);
eventActionDefinition4.appendUint16(1);
--
GitLab