From 2e1ad41da76ea50847a9fa9756e1751d503ae85c Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 22 Dec 2020 16:18:12 +0100
Subject: [PATCH] power and pus upstream taken over

---
 power/CMakeLists.txt                |  7 +++++++
 pus/CMakeLists.txt                  | 11 +++++++++++
 pus/CService201HealthCommanding.cpp |  6 +++++-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 power/CMakeLists.txt
 create mode 100644 pus/CMakeLists.txt

diff --git a/power/CMakeLists.txt b/power/CMakeLists.txt
new file mode 100644
index 00000000..1c625db1
--- /dev/null
+++ b/power/CMakeLists.txt
@@ -0,0 +1,7 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		Fuse.cpp
+		PowerComponent.cpp
+		PowerSensor.cpp
+		PowerSwitcher.cpp
+)
\ No newline at end of file
diff --git a/pus/CMakeLists.txt b/pus/CMakeLists.txt
new file mode 100644
index 00000000..758c2629
--- /dev/null
+++ b/pus/CMakeLists.txt
@@ -0,0 +1,11 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		CService200ModeCommanding.cpp
+		CService201HealthCommanding.cpp
+		Service17Test.cpp
+		Service1TelecommandVerification.cpp
+		Service2DeviceAccess.cpp
+		Service5EventReporting.cpp
+		Service8FunctionManagement.cpp
+		Service9TimeManagement.cpp
+)
\ No newline at end of file
diff --git a/pus/CService201HealthCommanding.cpp b/pus/CService201HealthCommanding.cpp
index db43db89..edacd73a 100644
--- a/pus/CService201HealthCommanding.cpp
+++ b/pus/CService201HealthCommanding.cpp
@@ -86,11 +86,15 @@ ReturnValue_t CService201HealthCommanding::handleReply
 		object_id_t objectId, bool *isStep) {
 	Command_t replyId = reply->getCommand();
 	if (replyId == HealthMessage::REPLY_HEALTH_SET) {
-		return prepareHealthSetReply(reply);
+		return EXECUTION_COMPLETE;
+	}
+	else if(replyId == CommandMessageIF::REPLY_REJECTED) {
+		return reply->getReplyRejectedReason();
 	}
 	return CommandingServiceBase::INVALID_REPLY;
 }
 
+// Not used for now, health state already reported by event
 ReturnValue_t CService201HealthCommanding::prepareHealthSetReply(
         const CommandMessage* reply) {
 	prepareHealthSetReply(reply);