From f47712552e500944456269bc7dc8a313a8cdac25 Mon Sep 17 00:00:00 2001 From: Cleanroom Laptop L15 Date: Thu, 2 Jun 2022 18:46:08 +0200 Subject: [PATCH] hk set fixes --- mission/controller/ThermalController.cpp | 2 ++ mission/devices/RwHandler.cpp | 1 + scripts/q7s-port-local.sh | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) mode change 100644 => 100755 scripts/q7s-port-local.sh diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index 957a2e94..cd783f44 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -202,6 +202,8 @@ LocalPoolDataSetBase* ThermalController::getDataSetHandle(sid_t sid) { return &sensorTemperatures; case thermalControllerDefinitions::SUS_TEMPERATURES: return &susTemperatures; + case thermalControllerDefinitions::DEVICE_TEMPERATURES: + return &deviceTemperatures; default: return nullptr; } diff --git a/mission/devices/RwHandler.cpp b/mission/devices/RwHandler.cpp index fd3462ec..e8e04932 100644 --- a/mission/devices/RwHandler.cpp +++ b/mission/devices/RwHandler.cpp @@ -279,6 +279,7 @@ ReturnValue_t RwHandler::initializeLocalDataPool(localpool::DataPool& localDataP localDataPoolMap.emplace(RwDefinitions::SPI_TOTAL_ERRORS, new PoolEntry({0})); poolManager.subscribeForPeriodicPacket(statusSet.getSid(), false, 5.0, true); poolManager.subscribeForPeriodicPacket(tmDataset.getSid(), false, 30.0, false); + poolManager.subscribeForPeriodicPacket(lastResetStatusSet.getSid(), false, 30.0, false); return RETURN_OK; } diff --git a/scripts/q7s-port-local.sh b/scripts/q7s-port-local.sh old mode 100644 new mode 100755 index 2f0fc678..593569cc --- a/scripts/q7s-port-local.sh +++ b/scripts/q7s-port-local.sh @@ -4,5 +4,5 @@ echo "-L 1534:192.168.155.55:1534 for connection to the TCF agent on the FM" echo "-L 1536:192.168.155.55:7301 for TMTC commanding using the TCP/IP IF on the FM" -ssh -L 1534:192.168.155.55:1534 root@192.168.155.55 -ssh -L 1536:192.168.155.55:7301 root@192.168.155.55 \ No newline at end of file +ssh -L 1534:localhost:1534 root@192.168.155.55 +ssh -L 1560:localhost:7301 root@192.168.155.55 \ No newline at end of file