From 2f183474306c8eea54a5e2b8c96598048a6f1b6a Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 16 Sep 2022 15:12:32 +0200 Subject: [PATCH] move object ID definition --- common/config/commonObjects.h | 3 +++ linux/fsfwconfig/objects/systemObjectList.h | 1 - linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/common/config/commonObjects.h b/common/config/commonObjects.h index e0efbce7..6389046b 100644 --- a/common/config/commonObjects.h +++ b/common/config/commonObjects.h @@ -107,6 +107,9 @@ enum commonObjects : uint32_t { SYRLINKS_HK_HANDLER = 0x445300A3, + /* 0x49 ('I') for Communication Interfaces */ + SPI_RTD_COM_IF = 0x49020006, + // 0x60 for other stuff HEATER_0_PLOC_PROC_BRD = 0x60000000, HEATER_1_PCDU_BRD = 0x60000001, diff --git a/linux/fsfwconfig/objects/systemObjectList.h b/linux/fsfwconfig/objects/systemObjectList.h index 669fcc9f..4b49ce82 100644 --- a/linux/fsfwconfig/objects/systemObjectList.h +++ b/linux/fsfwconfig/objects/systemObjectList.h @@ -50,7 +50,6 @@ enum sourceObjects : uint32_t { SPI_MAIN_COM_IF = 0x49020004, GPIO_IF = 0x49010005, SPI_RW_COM_IF = 0x49020005, - SPI_RTD_COM_IF = 0x49020006, /* 0x54 ('T') for test handlers */ TEST_TASK = 0x54694269, diff --git a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp index 2535a10e..e11632c8 100644 --- a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp +++ b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp @@ -370,7 +370,7 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) { thisSequence->addSlot(objects::RAD_SENSOR, length * 0.8, DeviceHandlerIF::GET_READ); #endif -#if OBSW_ADD_ACS_BOARD == 1 && OBSW_ADD_ACS_HANDLERS == 1 +#if OBSW_ADD_ACS_BOARD == 1 bool enableAside = true; bool enableBside = true; if (enableAside) { @@ -436,7 +436,7 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) { thisSequence->addSlot(objects::GYRO_3_L3G_HANDLER, length * 0.7, DeviceHandlerIF::SEND_READ); thisSequence->addSlot(objects::GYRO_3_L3G_HANDLER, length * 0.85, DeviceHandlerIF::GET_READ); } -#endif /* OBSW_ADD_ACS_BOARD == 1 && OBSW_ADD_ACS_HANDLERS == 1 */ +#endif /* OBSW_ADD_ACS_BOARD == 1 */ return thisSequence->checkSequence(); }