From c63665c257984be89bd2cd19f83bc81b1adbd588 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Wed, 19 Aug 2020 13:13:57 +0200
Subject: [PATCH 1/3] renamed framework.mk to fsfw.mk

---
 fsfw.mk | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 fsfw.mk

diff --git a/fsfw.mk b/fsfw.mk
new file mode 100644
index 00000000..c025ba23
--- /dev/null
+++ b/fsfw.mk
@@ -0,0 +1,59 @@
+# This submake file needs to be included by the primary Makefile.
+# This file needs FRAMEWORK_PATH and OS_FSFW set correctly by another Makefile.
+# Valid API settings: rtems, linux, freeRTOS, host
+
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/action/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/container/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/contrib/sgp4/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/controller/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/coordinates/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/datalinklayer/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/datapool/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/devicehandlers/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/events/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/events/eventmatching/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/fdir/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/globalfunctions/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/globalfunctions/matching/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/globalfunctions/math/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/health/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/internalError/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/ipc/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/memory/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/modes/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/monitoring/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/objectmanager/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/*.cpp)
+
+# select the OS
+ifeq ($(OS_FSFW),rtems)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/rtems/*.cpp)
+else ifeq ($(OS_FSFW),linux)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/linux/*.cpp)
+else ifeq ($(OS_FSFW),freeRTOS)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/FreeRTOS/*.cpp)
+else ifeq ($(OS_FSFW),host)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/host/*.cpp)
+else
+$(error invalid OS specified, valid OS are rtems, linux, freeRTOS, host)
+endif
+
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/parameters/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/power/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/returnvalues/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/rmap/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/serialize/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/serviceinterface/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/storagemanager/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/subsystem/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/subsystem/modes/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tasks/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tcdistribution/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/thermal/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/timemanager/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmstorage/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/packetmatcher/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/pus/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcservices/*.cpp)
+CXXSRC += $(wildcard $(FRAMEWORK_PATH)/pus/*.cpp)

From e59022dd432cdda2fc57ba8ee9ba350af33a1317 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Wed, 19 Aug 2020 13:15:14 +0200
Subject: [PATCH 2/3] old .mk file removed

---
 framework.mk | 58 ----------------------------------------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 framework.mk

diff --git a/framework.mk b/framework.mk
deleted file mode 100644
index 136eff3a..00000000
--- a/framework.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-# This file needs FRAMEWORK_PATH and OS_FSFW set correctly by another Makefile.
-# Valid API settings: rtems, linux, freeRTOS, host
-
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/action/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/container/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/contrib/sgp4/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/controller/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/coordinates/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/datalinklayer/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/datapool/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/devicehandlers/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/events/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/events/eventmatching/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/fdir/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/globalfunctions/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/globalfunctions/matching/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/globalfunctions/math/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/health/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/internalError/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/ipc/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/memory/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/modes/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/monitoring/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/objectmanager/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/*.cpp)
-
-# select the OS
-ifeq ($(OS_FSFW),rtems)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/rtems/*.cpp)
-else ifeq ($(OS_FSFW),linux)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/linux/*.cpp)
-else ifeq ($(OS_FSFW),freeRTOS)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/FreeRTOS/*.cpp)
-else ifeq ($(OS_FSFW),host)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/host/*.cpp)
-else
-$(error invalid OS_FSFW specified, valid OS_FSFW are rtems, linux, freeRTOS, host)
-endif
-
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/parameters/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/power/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/returnvalues/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/rmap/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/serialize/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/serviceinterface/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/storagemanager/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/subsystem/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/subsystem/modes/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tasks/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tcdistribution/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/thermal/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/timemanager/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmstorage/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/packetmatcher/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/pus/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcservices/*.cpp)
-CXXSRC += $(wildcard $(FRAMEWORK_PATH)/pus/*.cpp)

From 31f398cec948bd232e40f29fc128e2596a20e6b7 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Wed, 19 Aug 2020 13:16:08 +0200
Subject: [PATCH 3/3] small fix

---
 fsfw.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fsfw.mk b/fsfw.mk
index c025ba23..c2c6e747 100644
--- a/fsfw.mk
+++ b/fsfw.mk
@@ -35,7 +35,7 @@ CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/FreeRTOS/*.cpp)
 else ifeq ($(OS_FSFW),host)
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/osal/host/*.cpp)
 else
-$(error invalid OS specified, valid OS are rtems, linux, freeRTOS, host)
+$(error invalid OS_FSFW specified, valid OS_FSFW are rtems, linux, freeRTOS, host)
 endif
 
 CXXSRC += $(wildcard $(FRAMEWORK_PATH)/parameters/*.cpp)