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

v1.12.0 #269

Merged
muellerr merged 493 commits from develop into main 2022-07-04 11:19:05 +02:00
Conversation 0 Commits 493 Files Changed 264 +16 -16
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4c809e354d - Show all commits

16
bsp_q7s/fm/fmObjectFactory.cpp
View File

@ -611,14 +611,14 @@ void ObjectFactory::createHeaterComponents(GpioIF* gpioIF, PowerSwitchIF* pwrSwi
gpioIF->addGpios(heaterGpiosCookie); gpioIF->addGpios(heaterGpiosCookie);
HeaterHelper helper({{ HeaterHelper helper({{
{new HealthDevice(objects::HEATER_0, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_0}, {new HealthDevice(objects::HEATER_0_OBC_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_0},
{new HealthDevice(objects::HEATER_1, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_1}, {new HealthDevice(objects::HEATER_1_PLOC_PROC_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_1},
{new HealthDevice(objects::HEATER_2, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_2}, {new HealthDevice(objects::HEATER_2_ACS_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_2},
{new HealthDevice(objects::HEATER_3, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_3}, {new HealthDevice(objects::HEATER_3_PCDU_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_3},
{new HealthDevice(objects::HEATER_4, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_4}, {new HealthDevice(objects::HEATER_4_CAMERA, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_4},
{new HealthDevice(objects::HEATER_5, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_5}, {new HealthDevice(objects::HEATER_5_STR, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_5},
{new HealthDevice(objects::HEATER_6, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_6}, {new HealthDevice(objects::HEATER_6_DRO, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_6},
{new HealthDevice(objects::HEATER_7, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_7}, {new HealthDevice(objects::HEATER_7_HPA, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_7},
}}); }});
new HeaterHandler(objects::HEATER_HANDLER, gpioIF, helper, pwrSwitcher, new HeaterHandler(objects::HEATER_HANDLER, gpioIF, helper, pwrSwitcher,
pcdu::Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V); pcdu::Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V);

16
common/config/commonObjects.h
View File

@ -98,14 +98,14 @@ enum commonObjects: uint32_t {
PTME_CONFIG = 44330005, PTME_CONFIG = 44330005,
// 0x60 for other stuff // 0x60 for other stuff
HEATER_0 = 0x60000000, HEATER_0_OBC_BRD = 0x60000000,
HEATER_1 = 0x60000001, HEATER_1_PLOC_PROC_BRD = 0x60000001,
HEATER_2 = 0x60000002, HEATER_2_ACS_BRD = 0x60000002,
HEATER_3 = 0x60000003, HEATER_3_PCDU_BRD = 0x60000003,
HEATER_4 = 0x60000004, HEATER_4_CAMERA = 0x60000004,
HEATER_5 = 0x60000005, HEATER_5_STR = 0x60000005,
HEATER_6 = 0x60000006, HEATER_6_DRO = 0x60000006,
HEATER_7 = 0x60000007, HEATER_7_HPA = 0x60000007,
// 0x73 ('s') for assemblies and system/subsystem components // 0x73 ('s') for assemblies and system/subsystem components
ACS_BOARD_ASS = 0x73000001, ACS_BOARD_ASS = 0x73000001,