From 6c16238cc7cf2a266f207b0198e6ce9517f5e670 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 22 Feb 2023 14:21:24 +0100
Subject: [PATCH] small tweaks

---
 mission/tmtc/PersistentTmStore.cpp |  4 +--
 mission/tmtc/PusTmFunnel.cpp       | 40 ++++++++++++++++--------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/mission/tmtc/PersistentTmStore.cpp b/mission/tmtc/PersistentTmStore.cpp
index 91a8be48..100767b9 100644
--- a/mission/tmtc/PersistentTmStore.cpp
+++ b/mission/tmtc/PersistentTmStore.cpp
@@ -238,8 +238,8 @@ void PersistentTmStore::deleteUpTo(uint32_t unixSeconds) {
       sif::error << "Time extraction for " << file << "failed" << std::endl;
       continue;
     }
-    time_t epoch = timegm(&fileTime);
-    if (epoch + rolloverDiffSeconds < unixSeconds) {
+    time_t fileEpoch = timegm(&fileTime);
+    if (fileEpoch + rolloverDiffSeconds < unixSeconds) {
       std::filesystem::remove(file.path());
     }
   }
diff --git a/mission/tmtc/PusTmFunnel.cpp b/mission/tmtc/PusTmFunnel.cpp
index db645042..b135b776 100644
--- a/mission/tmtc/PusTmFunnel.cpp
+++ b/mission/tmtc/PusTmFunnel.cpp
@@ -1,11 +1,13 @@
 #include "PusTmFunnel.h"
 
 #include "eive/definitions.h"
+#include "fsfw/pus/Service5EventReporting.h"
 #include "eive/objects.h"
 #include "fsfw/ipc/CommandMessage.h"
 #include "fsfw/ipc/QueueFactory.h"
 #include "fsfw/objectmanager.h"
 #include "fsfw/tmstorage/TmStoreMessage.h"
+#include "tmtc/pusIds.h"
 #include "fsfw/tmtcpacket/pus/tm/PusTmZcWriter.h"
 
 PusTmFunnel::PusTmFunnel(TmFunnelBase::FunnelCfg cfg, TimeReaderIF &timeReader,
@@ -24,27 +26,29 @@ PusTmFunnel::PusTmFunnel(TmFunnelBase::FunnelCfg cfg, TimeReaderIF &timeReader,
   Clock::getClock_timeval(&currentTv);
   Clock::getUptime(&lastTvUpdate);
   hkStore.addApid(config::EIVE_PUS_APID);
-  hkStore.addService(3);
+  hkStore.addService(pus::PUS_SERVICE_3);
   miscStore.addApid(config::EIVE_PUS_APID);
-  miscStore.addService(17);
-  miscStore.addService(2);
-  miscStore.addService(200);
-  miscStore.addService(201);
+  miscStore.addService(pus::PUS_SERVICE_17);
+  miscStore.addService(pus::PUS_SERVICE_2);
+  miscStore.addService(pus::PUS_SERVICE_200);
+  miscStore.addService(pus::PUS_SERVICE_201);
+  miscStore.addService(pus::PUS_SERVICE_9);
+  miscStore.addService(pus::PUS_SERVICE_20);
   okStore.addApid(config::EIVE_PUS_APID);
-  okStore.addServiceSubservice(5, 1);
-  okStore.addService(8);
-  okStore.addServiceSubservice(1, 1);
-  okStore.addServiceSubservice(1, 3);
-  okStore.addServiceSubservice(1, 5);
-  okStore.addServiceSubservice(1, 7);
+  okStore.addServiceSubservice(pus::PUS_SERVICE_5, Service5EventReporting::Subservice::NORMAL_REPORT);
+  okStore.addService(pus::PUS_SERVICE_8);
+  okStore.addServiceSubservice(pus::PUS_SERVICE_1, 1);
+  okStore.addServiceSubservice(pus::PUS_SERVICE_1, 3);
+  okStore.addServiceSubservice(pus::PUS_SERVICE_1, 5);
+  okStore.addServiceSubservice(pus::PUS_SERVICE_1, 7);
   notOkStore.addApid(config::EIVE_PUS_APID);
-  notOkStore.addServiceSubservice(5, 2);
-  notOkStore.addServiceSubservice(5, 3);
-  notOkStore.addServiceSubservice(5, 4);
-  notOkStore.addServiceSubservice(1, 2);
-  notOkStore.addServiceSubservice(1, 4);
-  notOkStore.addServiceSubservice(1, 6);
-  notOkStore.addServiceSubservice(1, 8);
+  notOkStore.addServiceSubservice(pus::PUS_SERVICE_5, 2);
+  notOkStore.addServiceSubservice(pus::PUS_SERVICE_5, 3);
+  notOkStore.addServiceSubservice(pus::PUS_SERVICE_5, 4);
+  notOkStore.addServiceSubservice(pus::PUS_SERVICE_1, 2);
+  notOkStore.addServiceSubservice(pus::PUS_SERVICE_1, 4);
+  notOkStore.addServiceSubservice(pus::PUS_SERVICE_1, 6);
+  notOkStore.addServiceSubservice(pus::PUS_SERVICE_1, 8);
 }
 
 PusTmFunnel::~PusTmFunnel() = default;