From 95e549e3131225b4a9456a9e4030a7c538a29f23 Mon Sep 17 00:00:00 2001 From: "Jakob.Meier" Date: Thu, 11 Feb 2021 08:49:12 +0100 Subject: [PATCH] init local pool for hktable, wip --- mission/devices/P60DockHandler.cpp | 45 ++++++++++++++++++++++++++++++ tmtc | 2 +- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/mission/devices/P60DockHandler.cpp b/mission/devices/P60DockHandler.cpp index 374a8c0b..b87fdc33 100644 --- a/mission/devices/P60DockHandler.cpp +++ b/mission/devices/P60DockHandler.cpp @@ -44,5 +44,50 @@ ReturnValue_t PDU2Handler::initializeLocalDataPool( localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_STACK_5V, new PoolEntry( { 0 })); localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_GS3V3, new PoolEntry( { 0 })); localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_GS5V, new PoolEntry( { 0 })); + + localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_ACU_VCC, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_PDU1_VCC, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_X3_IDLE_VCC, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_PDU2_VCC, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_ACU_VBAT, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_PDU1_VBAT, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_X3_IDLE_VBAT, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_PDU2_VBAT, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_STACK_VBAT, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_STACK_3V3, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_STACK_5V, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_GS3V3, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_GS5V, new PoolEntry( { 0 })); + + localDataPoolMap.emplace(P60System::P60DOCK_TEMPERATURE_1, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_TEMPERATURE_2, new PoolEntry( { 0 })); + + localDataPoolMap.emplace(P60System::P60DOCK_BOOT_CAUSE, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_BOOT_CNT, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_UPTIME, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_RESETCAUSE, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_BATT_MODE, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_HEATER_ON, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_CONV_5V_ENABLE_STATUS, new PoolEntry( { 0 })); + + localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_ACU_VCC, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_PDU1_VCC, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_X3_IDLE_VCC, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_PDU2_VCC, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_ACU_VBAT, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_PDU1_VBAT, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_X3_IDLE_VBAT, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_PDU2_VBAT, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_STACK_VBAT, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_STACK_3V3, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_STACK_5V, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_GS3V3, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_GS5V, new PoolEntry( { 0 })); + + localDataPoolMap.emplace(P60System::P60DOCK_VBAT_VALUE, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_VCC_CURRENT_VALUE, new PoolEntry( { 0 })); + localDataPoolMap.emplace(P60System::P60DOCK_BATTERY_CURRENT, new PoolEntry( { 0 })); + + return HasReturnvaluesIF::RETURN_OK; } diff --git a/tmtc b/tmtc index b4868b78..4433fb68 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit b4868b78e1eca3680e3d21924da80418737d11e9 +Subproject commit 4433fb68ac268ab72f763c2ef80b13d84600ad47