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 5811e2cb..b6cbec74 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,17 +163,17 @@ 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})); - localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_ACU, new PoolEntry({0})); - localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_PDU1, new PoolEntry({0})); - localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_PDU2, 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})); localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_1_P60DOCK, - new PoolEntry({0})); + new PoolEntry({0})); localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_2_P60DOCK, - new PoolEntry({0})); + new PoolEntry({0})); localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_GYRO_0_SIDE_A, new PoolEntry({0.0})); localDataPoolMap.emplace(thermalControllerDefinitions::TEMP_GYRO_1_SIDE_A, @@ -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; } @@ -507,8 +509,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; @@ -523,7 +524,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; @@ -538,7 +539,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; @@ -553,7 +554,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; @@ -644,8 +645,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; @@ -660,8 +661,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; @@ -676,8 +677,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; @@ -692,8 +693,8 @@ void ThermalController::copyDevices() { if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to commit" << std::endl; } - lp_vec_t tempAcu = - lp_vec_t(objects::ACU_HANDLER, P60System::pool::ACU_TEMPERATURES); + lp_vec_t tempAcu = + lp_vec_t(objects::ACU_HANDLER, P60System::pool::ACU_TEMPERATURES); result = tempAcu.read(); if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to read ACU temperatures" << std::endl; @@ -710,13 +711,13 @@ void ThermalController::copyDevices() { if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to commit" << std::endl; } - lp_var_t tempPdu1 = - lp_var_t(objects::PDU1_HANDLER, P60System::pool::PDU_TEMPERATURE); + lp_var_t tempPdu1 = + lp_var_t(objects::PDU1_HANDLER, P60System::pool::PDU_TEMPERATURE); result = tempPdu1.read(); if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to read PDU1 temperature" << std::endl; deviceTemperatures.pdu1.setValid(false); - deviceTemperatures.pdu1 = static_cast(INVALID_TEMPERATURE); + deviceTemperatures.pdu1 = static_cast(INVALID_TEMPERATURE); } else { deviceTemperatures.pdu1.setValid(tempPdu1.isValid()); @@ -726,13 +727,13 @@ void ThermalController::copyDevices() { if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to commit" << std::endl; } - lp_var_t tempPdu2 = - lp_var_t(objects::PDU2_HANDLER, P60System::pool::PDU_TEMPERATURE); + lp_var_t tempPdu2 = + lp_var_t(objects::PDU2_HANDLER, P60System::pool::PDU_TEMPERATURE); result = tempPdu2.read(); if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to read PDU2 temperature" << std::endl; deviceTemperatures.pdu2.setValid(false); - deviceTemperatures.pdu2 = static_cast(INVALID_TEMPERATURE); + deviceTemperatures.pdu2 = static_cast(INVALID_TEMPERATURE); } else { deviceTemperatures.pdu2.setValid(tempPdu1.isValid()); @@ -742,13 +743,13 @@ void ThermalController::copyDevices() { if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to commit" << std::endl; } - lp_var_t temp1P60dock = - lp_var_t(objects::P60DOCK_HANDLER, P60System::pool::P60DOCK_TEMPERATURE_1); + lp_var_t temp1P60dock = + lp_var_t(objects::P60DOCK_HANDLER, P60System::pool::P60DOCK_TEMPERATURE_1); result = temp1P60dock.read(); if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to read P60 dock temperature 1" << std::endl; deviceTemperatures.temp1P60dock.setValid(false); - deviceTemperatures.temp1P60dock = static_cast(INVALID_TEMPERATURE); + deviceTemperatures.temp1P60dock = static_cast(INVALID_TEMPERATURE); } else { deviceTemperatures.temp1P60dock.setValid(temp1P60dock.isValid()); @@ -758,13 +759,13 @@ void ThermalController::copyDevices() { if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to commit" << std::endl; } - lp_var_t temp2P60dock = - lp_var_t(objects::P60DOCK_HANDLER, P60System::pool::P60DOCK_TEMPERATURE_2); + lp_var_t temp2P60dock = + lp_var_t(objects::P60DOCK_HANDLER, P60System::pool::P60DOCK_TEMPERATURE_2); result = temp2P60dock.read(); if (result != RETURN_OK) { sif::warning << "ThermalController: Failed to read P60 dock temperature 2" << std::endl; deviceTemperatures.temp2P60dock.setValid(false); - deviceTemperatures.temp2P60dock = static_cast(INVALID_TEMPERATURE); + deviceTemperatures.temp2P60dock = static_cast(INVALID_TEMPERATURE); } else { deviceTemperatures.temp2P60dock.setValid(temp2P60dock.isValid()); diff --git a/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h b/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h index c6104f76..57f768eb 100644 --- a/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h +++ b/mission/controller/controllerdefinitions/ThermalControllerDefinitions.h @@ -127,25 +127,25 @@ 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_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); - lp_var_t temp1P60dock = lp_var_t(sid.objectId, PoolIds::TEMP_1_P60DOCK, this); - lp_var_t temp2P60dock = lp_var_t(sid.objectId, PoolIds::TEMP_2_P60DOCK, 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); + lp_var_t temp1P60dock = lp_var_t(sid.objectId, PoolIds::TEMP_1_P60DOCK, this); + lp_var_t temp2P60dock = lp_var_t(sid.objectId, PoolIds::TEMP_2_P60DOCK, this); lp_var_t gyro0SideA = lp_var_t(sid.objectId, PoolIds::TEMP_GYRO_0_SIDE_A, this); lp_var_t gyro1SideA = lp_var_t(sid.objectId, PoolIds::TEMP_GYRO_1_SIDE_A, this); lp_var_t gyro2SideB = lp_var_t(sid.objectId, PoolIds::TEMP_GYRO_2_SIDE_B, this); diff --git a/mission/devices/ACUHandler.cpp b/mission/devices/ACUHandler.cpp index a3b5eeee..fca445d1 100644 --- a/mission/devices/ACUHandler.cpp +++ b/mission/devices/ACUHandler.cpp @@ -75,7 +75,7 @@ ReturnValue_t ACUHandler::parseHkTableReply(const uint8_t *packet) { dataOffset += 4; for (size_t idx = 0; idx < 3; idx++) { - coreHk.temperatures[idx] = (packet[dataOffset] << 8) | packet[dataOffset + 1]; + coreHk.temperatures[idx] = ((packet[dataOffset] << 8) | packet[dataOffset + 1]) * 0.1; dataOffset += 4; } @@ -146,7 +146,7 @@ ReturnValue_t ACUHandler::initializeLocalDataPool(localpool::DataPool &localData localDataPoolMap.emplace(pool::ACU_VCC, new PoolEntry({0})); localDataPoolMap.emplace(pool::ACU_VBAT, new PoolEntry({0})); - localDataPoolMap.emplace(pool::ACU_TEMPERATURES, new PoolEntry(3)); + localDataPoolMap.emplace(pool::ACU_TEMPERATURES, new PoolEntry(3)); localDataPoolMap.emplace(pool::ACU_MPPT_MODE, new PoolEntry({0})); diff --git a/mission/devices/GomspaceDeviceHandler.cpp b/mission/devices/GomspaceDeviceHandler.cpp index fca84cb6..b3c939c3 100644 --- a/mission/devices/GomspaceDeviceHandler.cpp +++ b/mission/devices/GomspaceDeviceHandler.cpp @@ -366,7 +366,7 @@ ReturnValue_t GomspaceDeviceHandler::initializePduPool( localDataPoolMap.emplace(P60System::pool::PDU_VCC, new PoolEntry({0})); localDataPoolMap.emplace(P60System::pool::PDU_VBAT, new PoolEntry({0})); - localDataPoolMap.emplace(P60System::pool::PDU_TEMPERATURE, new PoolEntry({0})); + localDataPoolMap.emplace(P60System::pool::PDU_TEMPERATURE, new PoolEntry({0})); localDataPoolMap.emplace(P60System::pool::PDU_CONV_EN, new PoolEntry(3)); localDataPoolMap.emplace(P60System::pool::PDU_OUT_ENABLE, @@ -472,7 +472,7 @@ ReturnValue_t GomspaceDeviceHandler::parsePduHkTable(PDU::PduCoreHk& coreHk, PDU dataOffset += 4; auxHk.vbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1); dataOffset += 4; - coreHk.temperature = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1); + coreHk.temperature = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1) / 10; dataOffset += 4; for (uint8_t idx = 0; idx < 3; idx++) { diff --git a/mission/devices/P60DockHandler.cpp b/mission/devices/P60DockHandler.cpp index 25fb238f..074cf3ad 100644 --- a/mission/devices/P60DockHandler.cpp +++ b/mission/devices/P60DockHandler.cpp @@ -57,9 +57,9 @@ void P60DockHandler::parseHkTableReply(const uint8_t *packet) { dataOffset += 3; } - coreHk.temperature1 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1); + coreHk.temperature1 = (*(packet + dataOffset) << 8 | *(packet + dataOffset + 1)) * 0.1; dataOffset += 4; - coreHk.temperature2 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1); + coreHk.temperature2 = (*(packet + dataOffset) << 8 | *(packet + dataOffset + 1)) * 0.1; dataOffset += 4; auxHk.bootcause = *(packet + dataOffset) << 24 | @@ -198,8 +198,8 @@ ReturnValue_t P60DockHandler::initializeLocalDataPool(localpool::DataPool &local localDataPoolMap.emplace(pool::P60DOCK_BATTERY_CURRENT, new PoolEntry({0})); localDataPoolMap.emplace(pool::P60DOCK_BATTERY_VOLTAGE, new PoolEntry({0})); - localDataPoolMap.emplace(pool::P60DOCK_BATTERY_TEMPERATURE_1, new PoolEntry({0})); - localDataPoolMap.emplace(pool::P60DOCK_BATTERY_TEMPERATURE_2, new PoolEntry({0})); + localDataPoolMap.emplace(pool::P60DOCK_BATTERY_TEMPERATURE_1, new PoolEntry({0})); + localDataPoolMap.emplace(pool::P60DOCK_BATTERY_TEMPERATURE_2, new PoolEntry({0})); localDataPoolMap.emplace(pool::DEVICES_TYPE, &devicesType); localDataPoolMap.emplace(pool::DEVICES_STATUS, &devicesStatus); 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/mission/devices/devicedefinitions/GomspaceDefinitions.h b/mission/devices/devicedefinitions/GomspaceDefinitions.h index 18059fc8..9b79625c 100644 --- a/mission/devices/devicedefinitions/GomspaceDefinitions.h +++ b/mission/devices/devicedefinitions/GomspaceDefinitions.h @@ -244,10 +244,10 @@ class CoreHkSet : public StaticLocalDataSet<16> { lp_var_t batteryVoltage = lp_var_t(sid.objectId, P60System::pool::P60DOCK_BATTERY_VOLTAGE, this); - lp_var_t temperature1 = - lp_var_t(sid.objectId, P60System::pool::P60DOCK_TEMPERATURE_1, this); - lp_var_t temperature2 = - lp_var_t(sid.objectId, P60System::pool::P60DOCK_TEMPERATURE_2, this); + lp_var_t temperature1 = + lp_var_t(sid.objectId, P60System::pool::P60DOCK_TEMPERATURE_1, this); + lp_var_t temperature2 = + lp_var_t(sid.objectId, P60System::pool::P60DOCK_TEMPERATURE_2, this); }; /** * @brief This class defines a dataset for the hk table of the P60 Dock. @@ -368,8 +368,8 @@ class PduCoreHk : public StaticLocalDataSet<9> { /** Battery mode: 1 = Critical, 2 = Safe, 3 = Normal, 4 = Full */ lp_var_t battMode = lp_var_t(sid.objectId, P60System::pool::PDU_BATT_MODE, this); - lp_var_t temperature = - lp_var_t(sid.objectId, P60System::pool::PDU_TEMPERATURE, this); + lp_var_t temperature = + lp_var_t(sid.objectId, P60System::pool::PDU_TEMPERATURE, this); }; /** @@ -575,8 +575,8 @@ class CoreHk : public StaticLocalDataSet<14> { lp_vec_t powerInChannels = lp_vec_t(sid.objectId, P60System::pool::ACU_POWER_IN_CHANNELS, this); - lp_vec_t temperatures = - lp_vec_t(sid.objectId, P60System::pool::ACU_TEMPERATURES, this); + lp_vec_t temperatures = + lp_vec_t(sid.objectId, P60System::pool::ACU_TEMPERATURES, this); lp_var_t bootcnt = lp_var_t(sid.objectId, P60System::pool::ACU_BOOTCNT, this); lp_var_t uptime = lp_var_t(sid.objectId, P60System::pool::ACU_UPTIME, this); diff --git a/scripts/q7s-port-local.sh b/scripts/q7s-port-local.sh new file mode 100755 index 00000000..593569cc --- /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:localhost:1534 root@192.168.155.55 +ssh -L 1560:localhost:7301 root@192.168.155.55 \ No newline at end of file