From 4c809e354d13e6ffa676975a0205669534f340ef Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 5 May 2022 16:23:46 +0200 Subject: [PATCH] better heater obj id names --- bsp_q7s/fm/fmObjectFactory.cpp | 16 ++++++++-------- common/config/commonObjects.h | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bsp_q7s/fm/fmObjectFactory.cpp b/bsp_q7s/fm/fmObjectFactory.cpp index 9689a003..3e97c4fd 100644 --- a/bsp_q7s/fm/fmObjectFactory.cpp +++ b/bsp_q7s/fm/fmObjectFactory.cpp @@ -611,14 +611,14 @@ void ObjectFactory::createHeaterComponents(GpioIF* gpioIF, PowerSwitchIF* pwrSwi gpioIF->addGpios(heaterGpiosCookie); HeaterHelper helper({{ - {new HealthDevice(objects::HEATER_0, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_0}, - {new HealthDevice(objects::HEATER_1, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_1}, - {new HealthDevice(objects::HEATER_2, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_2}, - {new HealthDevice(objects::HEATER_3, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_3}, - {new HealthDevice(objects::HEATER_4, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_4}, - {new HealthDevice(objects::HEATER_5, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_5}, - {new HealthDevice(objects::HEATER_6, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_6}, - {new HealthDevice(objects::HEATER_7, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_7}, + {new HealthDevice(objects::HEATER_0_OBC_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_0}, + {new HealthDevice(objects::HEATER_1_PLOC_PROC_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_1}, + {new HealthDevice(objects::HEATER_2_ACS_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_2}, + {new HealthDevice(objects::HEATER_3_PCDU_BRD, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_3}, + {new HealthDevice(objects::HEATER_4_CAMERA, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_4}, + {new HealthDevice(objects::HEATER_5_STR, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_5}, + {new HealthDevice(objects::HEATER_6_DRO, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_6}, + {new HealthDevice(objects::HEATER_7_HPA, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_7}, }}); new HeaterHandler(objects::HEATER_HANDLER, gpioIF, helper, pwrSwitcher, pcdu::Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V); diff --git a/common/config/commonObjects.h b/common/config/commonObjects.h index 38b735c0..0a69ea32 100644 --- a/common/config/commonObjects.h +++ b/common/config/commonObjects.h @@ -98,14 +98,14 @@ enum commonObjects: uint32_t { PTME_CONFIG = 44330005, // 0x60 for other stuff - HEATER_0 = 0x60000000, - HEATER_1 = 0x60000001, - HEATER_2 = 0x60000002, - HEATER_3 = 0x60000003, - HEATER_4 = 0x60000004, - HEATER_5 = 0x60000005, - HEATER_6 = 0x60000006, - HEATER_7 = 0x60000007, + HEATER_0_OBC_BRD = 0x60000000, + HEATER_1_PLOC_PROC_BRD = 0x60000001, + HEATER_2_ACS_BRD = 0x60000002, + HEATER_3_PCDU_BRD = 0x60000003, + HEATER_4_CAMERA = 0x60000004, + HEATER_5_STR = 0x60000005, + HEATER_6_DRO = 0x60000006, + HEATER_7_HPA = 0x60000007, // 0x73 ('s') for assemblies and system/subsystem components ACS_BOARD_ASS = 0x73000001,