From bdf6baa9fc1c27f78fa0d1af5a47d4b0b11f4f91 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Thu, 9 Nov 2023 11:44:00 +0100
Subject: [PATCH] start adding data pool stuff

---
 linux/payload/FreshSupvHandler.cpp      | 80 ++++++++++++++++++++++++-
 linux/payload/FreshSupvHandler.h        | 15 +++++
 linux/payload/PlocSupervisorHandler.cpp |  2 -
 3 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/linux/payload/FreshSupvHandler.cpp b/linux/payload/FreshSupvHandler.cpp
index 12120946..995f3441 100644
--- a/linux/payload/FreshSupvHandler.cpp
+++ b/linux/payload/FreshSupvHandler.cpp
@@ -1,6 +1,13 @@
 #include "FreshSupvHandler.h"
 
-FreshSupvHandler::FreshSupvHandler(DhbConfig cfg) : FreshDeviceHandlerBase(cfg) {}
+#include <atomic>
+
+using namespace supv;
+using namespace returnvalue;
+
+std::atomic_bool supv::SUPV_ON = false;
+
+FreshSupvHandler::FreshSupvHandler(DhbConfig cfg) : FreshDeviceHandlerBase(cfg), hkSet(this) {}
 
 void FreshSupvHandler::performDeviceOperation(uint8_t opCode) {
   if (!transitionActive and mode == MODE_OFF) {
@@ -36,6 +43,77 @@ LocalPoolDataSetBase *FreshSupvHandler::getDataSetHandle(sid_t sid) {
 ReturnValue_t FreshSupvHandler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                                         LocalDataPoolManager &poolManager) {
   // TODO: Copy code from god handler here.
+  localDataPoolMap.emplace(supv::NUM_TMS, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::TEMP_PS, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::TEMP_PL, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::HK_SOC_STATE, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::NVM0_1_STATE, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::NVM3_STATE, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::MISSION_IO_STATE, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::FMC_STATE, &fmcStateEntry);
+  localDataPoolMap.emplace(supv::NUM_TCS, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::TEMP_SUP, &tempSupEntry);
+  localDataPoolMap.emplace(supv::UPTIME, new PoolEntry<uint64_t>({0}));
+  localDataPoolMap.emplace(supv::CPULOAD, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::AVAILABLEHEAP, new PoolEntry<uint32_t>({0}));
+
+  localDataPoolMap.emplace(supv::BR_SOC_STATE, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::POWER_CYCLES, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::BOOT_AFTER_MS, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::BOOT_TIMEOUT_MS, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::ACTIVE_NVM, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::BP0_STATE, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::BP1_STATE, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::BP2_STATE, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::BOOT_STATE, &bootStateEntry);
+  localDataPoolMap.emplace(supv::BOOT_CYCLES, &bootCyclesEntry);
+
+  localDataPoolMap.emplace(supv::LATCHUP_ID, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::CNT0, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(supv::CNT1, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(supv::CNT2, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(supv::CNT3, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(supv::CNT4, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(supv::CNT5, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(supv::CNT6, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(supv::LATCHUP_RPT_TIME_MSEC, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(supv::LATCHUP_RPT_TIME_SEC, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::LATCHUP_RPT_TIME_MIN, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::LATCHUP_RPT_TIME_HOUR, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::LATCHUP_RPT_TIME_DAY, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::LATCHUP_RPT_TIME_MON, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::LATCHUP_RPT_TIME_YEAR, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(supv::LATCHUP_RPT_IS_SET, new PoolEntry<uint8_t>({0}));
+
+  localDataPoolMap.emplace(supv::SIGNATURE, new PoolEntry<uint32_t>());
+  localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNTS, &latchupCounters);
+  localDataPoolMap.emplace(supv::ADC_DEVIATION_TRIGGERS_CNT, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::TC_RECEIVED_CNT, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::TM_AVAILABLE_CNT, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::SUPERVISOR_BOOTS, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::MPSOC_BOOTS, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::MPSOC_BOOT_FAILED_ATTEMPTS, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::MPSOC_POWER_UP, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::MPSOC_UPDATES, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::MPSOC_HEARTBEAT_RESETS, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::CPU_WDT_RESETS, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::PS_HEARTBEATS_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::PL_HEARTBEATS_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::EB_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::BM_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::LM_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::AM_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::TCTMM_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::MM_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::HK_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::DL_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::RWS_TASKS_LOST, new PoolEntry<uint32_t>(3));
+
+  localDataPoolMap.emplace(supv::ADC_RAW, &adcRawEntry);
+  localDataPoolMap.emplace(supv::ADC_ENG, &adcEngEntry);
+
+  poolManager.subscribeForRegularPeriodicPacket(
+      subdp::RegularHkPeriodicParams(hkSet.getSid(), false, 10.0));
   return returnvalue::OK;
 }
 
diff --git a/linux/payload/FreshSupvHandler.h b/linux/payload/FreshSupvHandler.h
index 4f308361..044a0418 100644
--- a/linux/payload/FreshSupvHandler.h
+++ b/linux/payload/FreshSupvHandler.h
@@ -2,6 +2,7 @@
 #define LINUX_PAYLOAD_FRESHSUPVHANDLER_H_
 
 #include "fsfw/devicehandlers/FreshDeviceHandlerBase.h"
+#include "plocSupvDefs.h"
 
 class FreshSupvHandler : public FreshDeviceHandlerBase {
  public:
@@ -35,7 +36,21 @@ class FreshSupvHandler : public FreshDeviceHandlerBase {
                               const uint8_t* data, size_t size) override;
 
  private:
+  supv::HkSet hkSet;
+  supv::BootStatusReport bootStatusReport;
+  supv::LatchupStatusReport latchupStatusReport;
+  supv::CountersReport countersReport;
+  supv::AdcReport adcReport;
+
   bool transitionActive = false;
+
+  PoolEntry<uint16_t> adcRawEntry = PoolEntry<uint16_t>(16);
+  PoolEntry<uint16_t> adcEngEntry = PoolEntry<uint16_t>(16);
+  PoolEntry<uint32_t> latchupCounters = PoolEntry<uint32_t>(7);
+  PoolEntry<uint8_t> fmcStateEntry = PoolEntry<uint8_t>(1);
+  PoolEntry<uint8_t> bootStateEntry = PoolEntry<uint8_t>(1);
+  PoolEntry<uint8_t> bootCyclesEntry = PoolEntry<uint8_t>(1);
+  PoolEntry<uint32_t> tempSupEntry = PoolEntry<uint32_t>(1);
 };
 
 #endif /* LINUX_PAYLOAD_FRESHSUPVHANDLER_H_ */
diff --git a/linux/payload/PlocSupervisorHandler.cpp b/linux/payload/PlocSupervisorHandler.cpp
index aa8c7e4f..321dd991 100644
--- a/linux/payload/PlocSupervisorHandler.cpp
+++ b/linux/payload/PlocSupervisorHandler.cpp
@@ -19,8 +19,6 @@
 using namespace supv;
 using namespace returnvalue;
 
-std::atomic_bool supv::SUPV_ON = false;
-
 PlocSupervisorHandler::PlocSupervisorHandler(object_id_t objectId, CookieIF* comCookie,
                                              Gpio uartIsolatorSwitch, power::Switch_t powerSwitch,
                                              PlocSupvUartManager& supvHelper)