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

I knew this was stupid: Revert "changing mission dependend object IDs to FSFW_ENUM"

Browse Source 
This reverts commit 2800484f6b.
This commit is contained in:
Ulrich Mohr
2022-08-25 14:43:27 +02:00
parent 2800484f6b
commit fe8036361d
24 changed files with 780 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dummies/SusDummy.cpp
View File

@ -6,18 +6,18 @@
#include <cstdlib>
SusDummy::SusDummy()
: ExtendedControllerBase(commonObjects::SUS_0_N_LOC_XFYFZM_PT_XF, objects::NO_OBJECT), susSet(this) {
ObjectManager::instance()->insert(commonObjects::SUS_6_R_LOC_XFYBZM_PT_XF, this);
ObjectManager::instance()->insert(commonObjects::SUS_1_N_LOC_XBYFZM_PT_XB, this);
ObjectManager::instance()->insert(commonObjects::SUS_7_R_LOC_XBYBZM_PT_XB, this);
ObjectManager::instance()->insert(commonObjects::SUS_2_N_LOC_XFYBZB_PT_YB, this);
ObjectManager::instance()->insert(commonObjects::SUS_8_R_LOC_XBYBZB_PT_YB, this);
ObjectManager::instance()->insert(commonObjects::SUS_3_N_LOC_XFYBZF_PT_YF, this);
ObjectManager::instance()->insert(commonObjects::SUS_9_R_LOC_XBYBZB_PT_YF, this);
ObjectManager::instance()->insert(commonObjects::SUS_4_N_LOC_XMYFZF_PT_ZF, this);
ObjectManager::instance()->insert(commonObjects::SUS_10_N_LOC_XMYBZF_PT_ZF, this);
ObjectManager::instance()->insert(commonObjects::SUS_5_N_LOC_XFYMZB_PT_ZB, this);
ObjectManager::instance()->insert(commonObjects::SUS_11_R_LOC_XBYMZB_PT_ZB, this);
: ExtendedControllerBase(objects::SUS_0_N_LOC_XFYFZM_PT_XF, objects::NO_OBJECT), susSet(this) {
ObjectManager::instance()->insert(objects::SUS_6_R_LOC_XFYBZM_PT_XF, this);
ObjectManager::instance()->insert(objects::SUS_1_N_LOC_XBYFZM_PT_XB, this);
ObjectManager::instance()->insert(objects::SUS_7_R_LOC_XBYBZM_PT_XB, this);
ObjectManager::instance()->insert(objects::SUS_2_N_LOC_XFYBZB_PT_YB, this);
ObjectManager::instance()->insert(objects::SUS_8_R_LOC_XBYBZB_PT_YB, this);
ObjectManager::instance()->insert(objects::SUS_3_N_LOC_XFYBZF_PT_YF, this);
ObjectManager::instance()->insert(objects::SUS_9_R_LOC_XBYBZB_PT_YF, this);
ObjectManager::instance()->insert(objects::SUS_4_N_LOC_XMYFZF_PT_ZF, this);
ObjectManager::instance()->insert(objects::SUS_10_N_LOC_XMYBZF_PT_ZF, this);
ObjectManager::instance()->insert(objects::SUS_5_N_LOC_XFYMZB_PT_ZB, this);
ObjectManager::instance()->insert(objects::SUS_11_R_LOC_XBYMZB_PT_ZB, this);
}
ReturnValue_t SusDummy::initialize() {

36
dummies/TemperatureSensorsDummy.cpp
View File

@ -6,25 +6,25 @@
#include <cstdlib>
TemperatureSensorsDummy::TemperatureSensorsDummy()
: ExtendedControllerBase(commonObjects::RTD_0_IC3_PLOC_HEATSPREADER, objects::NO_OBJECT),
: ExtendedControllerBase(objects::RTD_0_IC3_PLOC_HEATSPREADER, objects::NO_OBJECT),
max31865Set(this, MAX31865::MAX31865_SET_ID) {
ObjectManager::instance()->insert(commonObjects::RTD_1_IC4_PLOC_MISSIONBOARD, this);
ObjectManager::instance()->insert(commonObjects::RTD_2_IC5_4K_CAMERA, this);
ObjectManager::instance()->insert(commonObjects::RTD_3_IC6_DAC_HEATSPREADER, this);
ObjectManager::instance()->insert(commonObjects::RTD_4_IC7_STARTRACKER, this);
ObjectManager::instance()->insert(commonObjects::RTD_5_IC8_RW1_MX_MY, this);
ObjectManager::instance()->insert(commonObjects::RTD_6_IC9_DRO, this);
ObjectManager::instance()->insert(commonObjects::RTD_7_IC10_SCEX, this);
ObjectManager::instance()->insert(commonObjects::RTD_8_IC11_X8, this);
ObjectManager::instance()->insert(commonObjects::RTD_9_IC12_HPA, this);
ObjectManager::instance()->insert(commonObjects::RTD_10_IC13_PL_TX, this);
ObjectManager::instance()->insert(commonObjects::RTD_11_IC14_MPA, this);
ObjectManager::instance()->insert(commonObjects::RTD_12_IC15_ACU, this);
ObjectManager::instance()->insert(commonObjects::RTD_13_IC16_PLPCDU_HEATSPREADER, this);
ObjectManager::instance()->insert(commonObjects::RTD_14_IC17_TCS_BOARD, this);
ObjectManager::instance()->insert(commonObjects::RTD_15_IC18_IMTQ, this);
ObjectManager::instance()->insert(commonObjects::TMP1075_HANDLER_1, this);
ObjectManager::instance()->insert(commonObjects::TMP1075_HANDLER_2, this);
ObjectManager::instance()->insert(objects::RTD_1_IC4_PLOC_MISSIONBOARD, this);
ObjectManager::instance()->insert(objects::RTD_2_IC5_4K_CAMERA, this);
ObjectManager::instance()->insert(objects::RTD_3_IC6_DAC_HEATSPREADER, this);
ObjectManager::instance()->insert(objects::RTD_4_IC7_STARTRACKER, this);
ObjectManager::instance()->insert(objects::RTD_5_IC8_RW1_MX_MY, this);
ObjectManager::instance()->insert(objects::RTD_6_IC9_DRO, this);
ObjectManager::instance()->insert(objects::RTD_7_IC10_SCEX, this);
ObjectManager::instance()->insert(objects::RTD_8_IC11_X8, this);
ObjectManager::instance()->insert(objects::RTD_9_IC12_HPA, this);
ObjectManager::instance()->insert(objects::RTD_10_IC13_PL_TX, this);
ObjectManager::instance()->insert(objects::RTD_11_IC14_MPA, this);
ObjectManager::instance()->insert(objects::RTD_12_IC15_ACU, this);
ObjectManager::instance()->insert(objects::RTD_13_IC16_PLPCDU_HEATSPREADER, this);
ObjectManager::instance()->insert(objects::RTD_14_IC17_TCS_BOARD, this);
ObjectManager::instance()->insert(objects::RTD_15_IC18_IMTQ, this);
ObjectManager::instance()->insert(objects::TMP1075_HANDLER_1, this);
ObjectManager::instance()->insert(objects::TMP1075_HANDLER_2, this);
}
ReturnValue_t TemperatureSensorsDummy::initialize() {