From ff4cbea57137521d60dfa283cfc72c6989439257 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 24 Aug 2022 17:44:55 +0200
Subject: [PATCH 1/4] improvements for auto-formatter script

---
 scripts/auto-formatter.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/auto-formatter.sh b/scripts/auto-formatter.sh
index c0ae7099..723add4f 100755
--- a/scripts/auto-formatter.sh
+++ b/scripts/auto-formatter.sh
@@ -3,6 +3,11 @@ if [[ ! -f README.md ]]; then
   cd ..
 fi
 
+folder_list=(
+  "./src"
+  "./unittests"
+)
+
 cmake_fmt="cmake-format"
 file_selectors="-iname CMakeLists.txt"
 if command -v ${cmake_fmt} &> /dev/null; then
@@ -15,8 +20,10 @@ fi
 cpp_format="clang-format"
 file_selectors="-iname *.h -o -iname *.cpp -o -iname *.c -o -iname *.tpp"
 if command -v ${cpp_format} &> /dev/null; then
-  find ./src ${file_selectors} | xargs ${cpp_format} --style=file -i
-  find ./unittests ${file_selectors} | xargs ${cpp_format} --style=file -i
+  for dir in ${folder_list[@]}; do
+    echo "Auto-formatting ${dir} recursively"
+    find ${dir} ${file_selectors} | xargs clang-format --style=file -i
+  done
 else
   echo "No ${cpp_format} tool found, not formatting C++/C files"
 fi

From fd278e410b943efeb30435b9a5fb00988c171be9 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 29 Aug 2022 12:01:44 +0200
Subject: [PATCH 2/4] additional safety check

---
 src/fsfw/pus/Service11TelecommandScheduling.tpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/fsfw/pus/Service11TelecommandScheduling.tpp b/src/fsfw/pus/Service11TelecommandScheduling.tpp
index 7b9ba7c0..59261cfd 100644
--- a/src/fsfw/pus/Service11TelecommandScheduling.tpp
+++ b/src/fsfw/pus/Service11TelecommandScheduling.tpp
@@ -588,10 +588,12 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::getMapFilterFr
   }
 
   // additional security check, this should never be true
-  if (itBegin->first > itEnd->first) {
+  if ((itBegin != telecommandMap.end() and itEnd != telecommandMap.end()) and
+      (itBegin->first > itEnd->first)) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
+    sif::error << "11::getMapFilterFromData: itBegin > itEnd\n" << std::endl;
 #else
-    sif::printError("11::GetMapFilterFromData: itBegin > itEnd\n");
+    sif::printError("11::getMapFilterFromData: itBegin > itEnd\n");
 #endif
     return returnvalue::FAILED;
   }

From e2e0190caef8d26d019ad4e50e3518a7c14e9597 Mon Sep 17 00:00:00 2001
From: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
Date: Mon, 29 Aug 2022 14:51:14 +0200
Subject: [PATCH 3/4] Revert "additional safety check"

This reverts commit fd278e410b943efeb30435b9a5fb00988c171be9.
---
 src/fsfw/pus/Service11TelecommandScheduling.tpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/fsfw/pus/Service11TelecommandScheduling.tpp b/src/fsfw/pus/Service11TelecommandScheduling.tpp
index 59261cfd..7b9ba7c0 100644
--- a/src/fsfw/pus/Service11TelecommandScheduling.tpp
+++ b/src/fsfw/pus/Service11TelecommandScheduling.tpp
@@ -588,12 +588,10 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::getMapFilterFr
   }
 
   // additional security check, this should never be true
-  if ((itBegin != telecommandMap.end() and itEnd != telecommandMap.end()) and
-      (itBegin->first > itEnd->first)) {
+  if (itBegin->first > itEnd->first) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "11::getMapFilterFromData: itBegin > itEnd\n" << std::endl;
 #else
-    sif::printError("11::getMapFilterFromData: itBegin > itEnd\n");
+    sif::printError("11::GetMapFilterFromData: itBegin > itEnd\n");
 #endif
     return returnvalue::FAILED;
   }

From 6605ffb6b1e2a039d6132b3e150bdc13c42dd543 Mon Sep 17 00:00:00 2001
From: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
Date: Mon, 29 Aug 2022 14:54:52 +0200
Subject: [PATCH 4/4] Fixing check in Srv 11 Filer

---
 src/fsfw/pus/Service11TelecommandScheduling.tpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/fsfw/pus/Service11TelecommandScheduling.tpp b/src/fsfw/pus/Service11TelecommandScheduling.tpp
index 7b9ba7c0..7f60f7e8 100644
--- a/src/fsfw/pus/Service11TelecommandScheduling.tpp
+++ b/src/fsfw/pus/Service11TelecommandScheduling.tpp
@@ -588,10 +588,11 @@ inline ReturnValue_t Service11TelecommandScheduling<MAX_NUM_TCS>::getMapFilterFr
   }
 
   // additional security check, this should never be true
-  if (itBegin->first > itEnd->first) {
+  if (itBegin > itEnd) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
+    sif::error << "11::getMapFilterFromData: itBegin > itEnd\n" << std::endl;
 #else
-    sif::printError("11::GetMapFilterFromData: itBegin > itEnd\n");
+    sif::printError("11::getMapFilterFromData: itBegin > itEnd\n");
 #endif
     return returnvalue::FAILED;
   }