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

v1.16.0 #323

Merged
muellerr merged 223 commits from develop into main 2022-11-18 14:23:24 +01:00
Conversation 0 Commits 223 Files Changed 152 +3 -5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d51c088afd - Show all commits

5
bsp_q7s/core/ObjectFactory.cpp
View File

@ -123,13 +123,12 @@ void Factory::setStaticFrameworkObjectIds() {
void ObjectFactory::setStatics() { Factory::setStaticFrameworkObjectIds(); }
void ObjectFactory::createTmpComponents() {
std::array<std::pair<object_id_t, address_t>, 6> tmpDevIds = {{
std::array<std::pair<object_id_t, address_t>, 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<I2cCookie*> tmpDevCookies;

3
linux/fsfwconfig/devices/addresses.h
View File

@ -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 {