eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

little issue with acu hk reply

Browse Source
This commit is contained in:
Jakob Meier 2021-02-14 11:40:40 +01:00
parent 5783dfdd06
commit f042572429
8 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bsp_q7s/comIF/CspComIF.cpp
View File

@ -216,6 +216,7 @@ ReturnValue_t CspComIF::cspTransfer(uint8_t cspAddress, uint8_t cspPort,
if(expectedSize != 0){ if(expectedSize != 0){
sif::error << "CspComIF::cspTransfer: Received more bytes than requested" << std::endl; sif::error << "CspComIF::cspTransfer: Received more bytes than requested" << std::endl;
sif::debug << "CspComIF::cspTransfer: Received bytes: " << bytesRead << std::endl;
csp_close(conn); csp_close(conn);
return RETURN_FAILED; return RETURN_FAILED;
} }

2
etl

@ -1 +1 @@
Subproject commit 1ac3b77ef40aa783024d15185ee8ff41ae04a73e Subproject commit ae06e6417702b770c49289c9e7162cb3f4a5a217

2
fsfw

@ -1 +1 @@
Subproject commit e994d81e1862fade52b090311b3978fb59061966 Subproject commit 7d0916a44e18c87b00998448333023186b3d85b1

1
fsfwconfig/OBSWConfig.h
View File

@ -17,6 +17,7 @@
#define P60DOCK_DEBUG 1 #define P60DOCK_DEBUG 1
#define PDU1_DEBUG 0 #define PDU1_DEBUG 0
#define PDU2_DEBUG 0 #define PDU2_DEBUG 0
#define ACU_DEBUG 0
#include "OBSWVersion.h" #include "OBSWVersion.h"

15
mission/devices/ACUHandler.cpp
View File

@ -2,7 +2,7 @@
ACUHandler::ACUHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) : ACUHandler::ACUHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) :
GomspaceDeviceHandler(objectId, comIF, comCookie, ACU::MAX_CONFIGTABLE_ADDRESS, GomspaceDeviceHandler(objectId, comIF, comCookie, ACU::MAX_CONFIGTABLE_ADDRESS,
ACU::MAX_HKTABLE_ADDRESS, ACU::HK_TABLE_SIZE, &acuHkTableDataset), acuHkTableDataset( ACU::MAX_HKTABLE_ADDRESS, ACU::HK_TABLE_REPLY_SIZE, &acuHkTableDataset), acuHkTableDataset(
this) { this) {
} }
@ -17,6 +17,19 @@ ReturnValue_t ACUHandler::buildNormalDeviceCommand(
void ACUHandler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *packet) { void ACUHandler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *packet) {
parseHkTableReply(packet);
handleDeviceTM(&acuHkTableDataset, id, true);
#if OBSW_ENHANCED_PRINTOUT == 1 && ACU_DEBUG == 1
acuHkTableDataset.read();
float temperatureC_1 = acuHkTableDataset.temperature1.value * 0.1;
float temperatureC_2 = acuHkTableDataset.temperature2.value * 0.1;
float temperatureC_3 = acuHkTableDataset.temperature3.value * 0.1;
sif::info << "ACU: Temperature 1: " << temperatureC_1 << " °C" << std::endl;
sif::info << "ACU: Temperature 2: " << temperatureC_2 << " °C" << std::endl;
sif::info << "ACU: Temperature 3: " << temperatureC_3 << " °C" << std::endl;
acuHkTableDataset.commit();
#endif
} }
void ACUHandler::parseHkTableReply(const uint8_t *packet) { void ACUHandler::parseHkTableReply(const uint8_t *packet) {

1
mission/devices/PDU1Handler.cpp
View File

@ -15,7 +15,6 @@ ReturnValue_t PDU1Handler::buildNormalDeviceCommand(
DeviceCommandId_t * id) { DeviceCommandId_t * id) {
*id = GOMSPACE::REQUEST_HK_TABLE; *id = GOMSPACE::REQUEST_HK_TABLE;
return buildCommandFromCommand(*id, NULL, 0); return buildCommandFromCommand(*id, NULL, 0);
return RETURN_OK;
} }
void PDU1Handler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *packet) { void PDU1Handler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *packet) {

1
mission/devices/devicedefinitions/GomspaceDefinitions.h
View File

@ -1048,6 +1048,7 @@ namespace ACU {
static const uint16_t MAX_HKTABLE_ADDRESS = 120; static const uint16_t MAX_HKTABLE_ADDRESS = 120;
static const uint16_t HK_TABLE_SIZE = 125; static const uint16_t HK_TABLE_SIZE = 125;
static const uint8_t HK_TABLE_ENTRIES = 64; static const uint8_t HK_TABLE_ENTRIES = 64;
static const uint16_t HK_TABLE_REPLY_SIZE = 262;
/** /**
* @brief This class defines a dataset for the hk table of the ACU. * @brief This class defines a dataset for the hk table of the ACU.

2
tmtc

@ -1 +1 @@
Subproject commit 4433fb68ac268ab72f763c2ef80b13d84600ad47 Subproject commit 110ec9644a520af9c6f4cb7f2b5d47f3d34ba256