From d51c088afd39c5c8f26d9028705a23bb8ed2f2f3 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 14 Nov 2022 09:16:17 +0100 Subject: [PATCH] there is only one tmp1075 left --- bsp_q7s/core/ObjectFactory.cpp | 5 ++--- linux/fsfwconfig/devices/addresses.h | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp index bc2d7562..fc9240a0 100644 --- a/bsp_q7s/core/ObjectFactory.cpp +++ b/bsp_q7s/core/ObjectFactory.cpp @@ -123,13 +123,12 @@ void Factory::setStaticFrameworkObjectIds() { void ObjectFactory::setStatics() { Factory::setStaticFrameworkObjectIds(); } void ObjectFactory::createTmpComponents() { - std::array, 6> tmpDevIds = {{ + std::array, 5> tmpDevIds = {{ {objects::TMP1075_HANDLER_TCS_0, addresses::TMP1075_TCS_0}, {objects::TMP1075_HANDLER_TCS_1, addresses::TMP1075_TCS_1}, {objects::TMP1075_HANDLER_PLPCDU_0, addresses::TMP1075_PLPCDU_0}, {objects::TMP1075_HANDLER_PLPCDU_1, addresses::TMP1075_PLPCDU_1}, - {objects::TMP1075_HANDLER_IF_BOARD, addresses::TMP1075_IF_BOARD_0}, - {objects::TMP1075_HANDLER_OBC_IF_BOARD, addresses::TMP1075_IF_BOARD_1}, + {objects::TMP1075_HANDLER_IF_BOARD, addresses::TMP1075_IF_BOARD}, }}; std::vector tmpDevCookies; diff --git a/linux/fsfwconfig/devices/addresses.h b/linux/fsfwconfig/devices/addresses.h index d87eacb4..d7056307 100644 --- a/linux/fsfwconfig/devices/addresses.h +++ b/linux/fsfwconfig/devices/addresses.h @@ -50,8 +50,7 @@ enum I2cAddress : address_t { TMP1075_TCS_1 = 0x49, TMP1075_PLPCDU_0 = 0x4A, TMP1075_PLPCDU_1 = 0x4B, - TMP1075_IF_BOARD_0 = 0x4C, - TMP1075_IF_BOARD_1 = 0x4D + TMP1075_IF_BOARD = 0x4C, }; enum spiAddresses : address_t {