From 04b7c825018c8ba4979ef9ae09a21c2d44f432fe Mon Sep 17 00:00:00 2001 From: Cleanroom Laptop L15 Date: Wed, 1 Jun 2022 18:46:22 +0200 Subject: [PATCH 1/5] type fixes in device temperatures sets --- generators/events/translateEvents.cpp | 2 +- generators/objects/translateObjects.cpp | 2 +- linux/fsfwconfig/events/translateEvents.cpp | 2 +- linux/fsfwconfig/objects/translateObjects.cpp | 2 +- mission/controller/ThermalController.cpp | 34 +++++++++---------- .../ThermalControllerDefinitions.h | 18 +++++----- tmtc | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index 74b07b0b..04667729 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 207 translations. * @details - * Generated on: 2022-05-25 18:41:07 + * Generated on: 2022-06-01 18:12:43 */ #include "translateEvents.h" diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 12ec5008..d9213ea6 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 131 translations. - * Generated on: 2022-05-25 18:41:13 + * Generated on: 2022-06-01 18:12:40 */ #include "translateObjects.h" diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index 74b07b0b..04667729 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/linux/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 207 translations. * @details - * Generated on: 2022-05-25 18:41:07 + * Generated on: 2022-06-01 18:12:43 */ #include "translateEvents.h" diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index 12ec5008..d9213ea6 100644 --- a/linux/fsfwconfig/objects/translateObjects.cpp +++ b/linux/fsfwconfig/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 131 translations. - * Generated on: 2022-05-25 18:41:13 + * Generated on: 2022-06-01 18:12:40 */ #include "translateObjects.h" diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp index ab0c28b4..957a2e94 100644 --- a/mission/controller/ThermalController.cpp +++ b/mission/controller/ThermalController.cpp @@ -149,13 +149,13 @@ ReturnValue_t ThermalController::initializeLocalDataPool(localpool::DataPool& lo localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_Q7S, new PoolEntry({0.0})); localDataPoolMap.emplace(thermalControllerDefinitions::BATTERY_TEMP_1, - new PoolEntry({0.0})); + new PoolEntry({0})); localDataPoolMap.emplace(thermalControllerDefinitions::BATTERY_TEMP_2, - new PoolEntry({0.0})); + new PoolEntry({0})); localDataPoolMap.emplace(thermalControllerDefinitions::BATTERY_TEMP_3, - new PoolEntry({0.0})); + new PoolEntry({0})); localDataPoolMap.emplace(thermalControllerDefinitions::BATTERY_TEMP_4, - new PoolEntry({0.0})); + new PoolEntry({0})); localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_RW1, new PoolEntry({0})); localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_RW2, new PoolEntry({0})); localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_RW3, new PoolEntry({0})); @@ -163,10 +163,10 @@ ReturnValue_t ThermalController::initializeLocalDataPool(localpool::DataPool& lo localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_STAR_TRACKER, new PoolEntry({0.0})); localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_SYRLINKS_POWER_AMPLIFIER, - new PoolEntry({0.0})); + new PoolEntry({0})); localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_SYRLINKS_BASEBAND_BOARD, - new PoolEntry({0.0})); - localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_MGT, new PoolEntry({0})); + new PoolEntry({0})); + localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_MGT, new PoolEntry({0})); localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_ACU, new PoolEntry({0})); localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_PDU1, new PoolEntry({0})); localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_PDU2, new PoolEntry({0})); @@ -506,7 +506,7 @@ void ThermalController::copyDevices() { if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to commit" << std::endl; } - lp_var_t battTemp1 = lp_var_t(objects::BPX_BATT_HANDLER, BpxBattery::BATT_TEMP_1); + lp_var_t battTemp1 = lp_var_t(objects::BPX_BATT_HANDLER, BpxBattery::BATT_TEMP_1); result = battTemp1.read(); if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to read battery temperature 1" << std::endl; @@ -520,7 +520,7 @@ void ThermalController::copyDevices() { if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to commit" << std::endl; } - lp_var_t battTemp2 = lp_var_t(objects::BPX_BATT_HANDLER, BpxBattery::BATT_TEMP_2); + lp_var_t battTemp2 = lp_var_t(objects::BPX_BATT_HANDLER, BpxBattery::BATT_TEMP_2); result = battTemp2.read(); if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to read battery temperature 2" << std::endl; @@ -534,7 +534,7 @@ void ThermalController::copyDevices() { if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to commit" << std::endl; } - lp_var_t battTemp3 = lp_var_t(objects::BPX_BATT_HANDLER, BpxBattery::BATT_TEMP_3); + lp_var_t battTemp3 = lp_var_t(objects::BPX_BATT_HANDLER, BpxBattery::BATT_TEMP_3); result = battTemp3.read(); if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to read battery temperature 3" << std::endl; @@ -548,7 +548,7 @@ void ThermalController::copyDevices() { if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to commit" << std::endl; } - lp_var_t battTemp4 = lp_var_t(objects::BPX_BATT_HANDLER, BpxBattery::BATT_TEMP_4); + lp_var_t battTemp4 = lp_var_t(objects::BPX_BATT_HANDLER, BpxBattery::BATT_TEMP_4); result = battTemp4.read(); if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to read battery temperature 4" << std::endl; @@ -633,8 +633,8 @@ void ThermalController::copyDevices() { if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to commit" << std::endl; } - lp_var_t tempSyrlinksPowerAmplifier = - lp_var_t(objects::SYRLINKS_HK_HANDLER, syrlinks::TEMP_POWER_AMPLIFIER); + lp_var_t tempSyrlinksPowerAmplifier = + lp_var_t(objects::SYRLINKS_HK_HANDLER, syrlinks::TEMP_POWER_AMPLIFIER); result = tempSyrlinksPowerAmplifier.read(); if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to read syrlinks power amplifier temperature" << std::endl; @@ -648,8 +648,8 @@ void ThermalController::copyDevices() { if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to commit" << std::endl; } - lp_var_t tempSyrlinksBasebandBoard = - lp_var_t(objects::SYRLINKS_HK_HANDLER, syrlinks::TEMP_BASEBAND_BOARD); + lp_var_t tempSyrlinksBasebandBoard = + lp_var_t(objects::SYRLINKS_HK_HANDLER, syrlinks::TEMP_BASEBAND_BOARD); result = tempSyrlinksBasebandBoard.read(); if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to read syrlinks baseband board temperature" << std::endl; @@ -663,8 +663,8 @@ void ThermalController::copyDevices() { if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to commit" << std::endl; } - lp_var_t tempMgt = - lp_var_t(objects::IMTQ_HANDLER, IMTQ::MCU_TEMPERATURE); + lp_var_t tempMgt = + lp_var_t(objects::IMTQ_HANDLER, IMTQ::MCU_TEMPERATURE); result = tempMgt.read(); if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to read MGT temperature" << std::endl; diff --git a/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h b/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h index c6104f76..54ad999d 100644 --- a/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h +++ b/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h @@ -127,20 +127,20 @@ class DeviceTemperatures : public StaticLocalDataSet q7s = lp_var_t(sid.objectId, PoolIds::TEMP_Q7S, this); - lp_var_t batteryTemp1 = lp_var_t(sid.objectId, PoolIds::BATTERY_TEMP_1, this); - lp_var_t batteryTemp2 = lp_var_t(sid.objectId, PoolIds::BATTERY_TEMP_2, this); - lp_var_t batteryTemp3 = lp_var_t(sid.objectId, PoolIds::BATTERY_TEMP_3, this); - lp_var_t batteryTemp4 = lp_var_t(sid.objectId, PoolIds::BATTERY_TEMP_4, this); + lp_var_t batteryTemp1 = lp_var_t(sid.objectId, PoolIds::BATTERY_TEMP_1, this); + lp_var_t batteryTemp2 = lp_var_t(sid.objectId, PoolIds::BATTERY_TEMP_2, this); + lp_var_t batteryTemp3 = lp_var_t(sid.objectId, PoolIds::BATTERY_TEMP_3, this); + lp_var_t batteryTemp4 = lp_var_t(sid.objectId, PoolIds::BATTERY_TEMP_4, this); lp_var_t rw1 = lp_var_t(sid.objectId, PoolIds::TEMP_RW1, this); lp_var_t rw2 = lp_var_t(sid.objectId, PoolIds::TEMP_RW2, this); lp_var_t rw3 = lp_var_t(sid.objectId, PoolIds::TEMP_RW3, this); lp_var_t rw4 = lp_var_t(sid.objectId, PoolIds::TEMP_RW4, this); lp_var_t startracker = lp_var_t(sid.objectId, PoolIds::TEMP_STAR_TRACKER, this); - lp_var_t syrlinksPowerAmplifier = - lp_var_t(sid.objectId, PoolIds::TEMP_SYRLINKS_POWER_AMPLIFIER, this); - lp_var_t syrlinksBasebandBoard = - lp_var_t(sid.objectId, PoolIds::TEMP_SYRLINKS_BASEBAND_BOARD, this); - lp_var_t mgt = lp_var_t(sid.objectId, PoolIds::TEMP_MGT, this); + lp_var_t syrlinksPowerAmplifier = + lp_var_t(sid.objectId, PoolIds::TEMP_SYRLINKS_POWER_AMPLIFIER, this); + lp_var_t syrlinksBasebandBoard = + lp_var_t(sid.objectId, PoolIds::TEMP_SYRLINKS_BASEBAND_BOARD, this); + lp_var_t mgt = lp_var_t(sid.objectId, PoolIds::TEMP_MGT, this); lp_vec_t acu = lp_vec_t(sid.objectId, PoolIds::TEMP_ACU, this); lp_var_t pdu1 = lp_var_t(sid.objectId, PoolIds::TEMP_PDU1, this); lp_var_t pdu2 = lp_var_t(sid.objectId, PoolIds::TEMP_PDU2, this); diff --git a/tmtc b/tmtc index e2de2e02..8a23e8a9 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit e2de2e0212d5af87b111e6176f3b9f20b56081df +Subproject commit 8a23e8a96c5adda158f03c3924bd9c2746daad9b From b66dcc0a8685b55f37a0b6b7697ac5e7f2e87c9b Mon Sep 17 00:00:00 2001 From: Cleanroom Laptop L15 Date: Wed, 1 Jun 2022 18:46:53 +0200 Subject: [PATCH 2/5] local port forward script --- scripts/q7s-port-local.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 scripts/q7s-port-local.sh diff --git a/scripts/q7s-port-local.sh b/scripts/q7s-port-local.sh new file mode 100644 index 00000000..2f0fc678 --- /dev/null +++ b/scripts/q7s-port-local.sh @@ -0,0 +1,8 @@ +#!/bin/bash +echo "Setting up all Q7S ports" +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 From cbb8832fab634aeb5c5b8102556997fafc4846b9 Mon Sep 17 00:00:00 2001 From: Cleanroom Laptop L15 Date: Wed, 1 Jun 2022 18:47:52 +0200 Subject: [PATCH 3/5] tmtc update --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 8a23e8a9..7259fc00 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 8a23e8a96c5adda158f03c3924bd9c2746daad9b +Subproject commit 7259fc008ae5ada7b3de88c7c9ba02d5919aa762 From f47712552e500944456269bc7dc8a313a8cdac25 Mon Sep 17 00:00:00 2001 From: Cleanroom Laptop L15 Date: Thu, 2 Jun 2022 18:46:08 +0200 Subject: [PATCH 4/5] 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 From 678b22438f75f5066c006ec4682cf9f083247327 Mon Sep 17 00:00:00 2001 From: Cleanroom Laptop L15 Date: Thu, 2 Jun 2022 18:52:09 +0200 Subject: [PATCH 5/5] tmtc update --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 7259fc00..3ff95280 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 7259fc008ae5ada7b3de88c7c9ba02d5919aa762 +Subproject commit 3ff95280e588814aca48307828f7a4075beade01