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

v1.9.0 #175

Merged
muellerr merged 623 commits from develop into main 2022-03-08 10:32:41 +01:00
Conversation 0 Commits 623 Files Changed 417 +22 -5
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3207d25bd3 - Show all commits

2
bsp_q7s/core/ObjectFactory.cpp
View File

@ -147,7 +147,7 @@ void ObjectFactory::produce(void* args) {
new I2cCookie(addresses::IMTQ, IMTQ::MAX_REPLY_SIZE, q7s::I2C_DEFAULT_DEV); new I2cCookie(addresses::IMTQ, IMTQ::MAX_REPLY_SIZE, q7s::I2C_DEFAULT_DEV);
auto imtqHandler = new IMTQHandler(objects::IMTQ_HANDLER, objects::I2C_COM_IF, imtqI2cCookie); auto imtqHandler = new IMTQHandler(objects::IMTQ_HANDLER, objects::I2C_COM_IF, imtqI2cCookie);
#if OBSW_DEBUG_IMTQ == 1 #if OBSW_DEBUG_IMTQ == 1
imtqHandler->setToGoToNormal(); imtqHandler->setToGoToNormal(true);
imtqHandler->setStartUpImmediately(); imtqHandler->setStartUpImmediately();
#endif #endif
#endif #endif

5
mission/devices/IMTQHandler.cpp
View File

@ -1,11 +1,12 @@
#include "IMTQHandler.h" #include "IMTQHandler.h"
#include "OBSWConfig.h"
#include <fsfw/datapool/PoolReadGuard.h> #include <fsfw/datapool/PoolReadGuard.h>
#include <fsfw/globalfunctions/CRC.h> #include <fsfw/globalfunctions/CRC.h>
#include <cmath> #include <cmath>
#include "OBSWConfig.h"
IMTQHandler::IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie) IMTQHandler::IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie)
: DeviceHandlerBase(objectId, comIF, comCookie), : DeviceHandlerBase(objectId, comIF, comCookie),
engHkDataset(this), engHkDataset(this),
@ -694,7 +695,7 @@ void IMTQHandler::fillEngHkDataset(const uint8_t* packet) {
#endif #endif
} }
void IMTQHandler::setToGoToNormal() { mode = MODE_NORMAL; } void IMTQHandler::setToGoToNormal(bool enable) { this->goToNormalMode = enable; }
void IMTQHandler::handleDeviceTM(const uint8_t* data, size_t dataSize, DeviceCommandId_t replyId) { void IMTQHandler::handleDeviceTM(const uint8_t* data, size_t dataSize, DeviceCommandId_t replyId) {
if (wiretappingMode == RAW) { if (wiretappingMode == RAW) {

2
mission/devices/IMTQHandler.h
View File

@ -18,7 +18,7 @@ class IMTQHandler : public DeviceHandlerBase {
/** /**
* @brief Sets mode to MODE_NORMAL. Can be used for debugging. * @brief Sets mode to MODE_NORMAL. Can be used for debugging.
*/ */
void setToGoToNormal(); void setToGoToNormal(bool enable);
protected: protected:
void doStartUp() override; void doStartUp() override;

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

@ -360,6 +360,22 @@ enum P60SytemPoolIds : lp_id_t {
namespace P60Dock { namespace P60Dock {
enum SwitchChannels : uint8_t {
ACU = 0,
PDU1 = 1,
X3_IDLE = 2,
PDU2_VCC = 3,
ACU_VBAT = 4,
PDU1_VBAT = 5,
X3_IDLE_VBAT = 6,
PDU2_VBAT = 7,
STACK_VBAT = 8,
STACK_3V3 = 9,
STACK_5V = 10,
GS3V3 = 11,
GS5V = 12
};
/** Max reply size reached when requesting full hk table */ /** Max reply size reached when requesting full hk table */
static const uint16_t MAX_REPLY_LENGTH = 407; static const uint16_t MAX_REPLY_LENGTH = 407;

2
tmtc

@ -1 +1 @@
Subproject commit 50128b7304470281ff90bc3dcc51c714a7e6b99f Subproject commit e710390f5330e3be1f14ba9c6082cbbfbcd9aec1