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

Merge pull request 'Bugfix Heater Name' (#451) from bugfix_heater_name into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source 
Reviewed-on: #451
This commit is contained in:
Robin Müller 2023-03-09 16:58:12 +01:00
commit 42779e6ace
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -16,6 +16,10 @@ will consitute of a breaking change warranting a new major release:
# [unreleased] # [unreleased]
## Fixed
- Fix for heater names: HPA heater (index 7) is now the Syrlinks heater.
# [v1.36.0] 2023-03-08 # [v1.36.0] 2023-03-08
eive-tmtc: v2.17.2 eive-tmtc: v2.17.2

2
common/config/eive/objects.h
View File

@ -136,7 +136,7 @@ enum commonObjects : uint32_t {
HEATER_4_CAMERA = 0x60000004, HEATER_4_CAMERA = 0x60000004,
HEATER_5_STR = 0x60000005, HEATER_5_STR = 0x60000005,
HEATER_6_DRO = 0x60000006, HEATER_6_DRO = 0x60000006,
HEATER_7_HPA = 0x60000007, HEATER_7_SYRLINKS = 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,

2
fsfw

@ -1 +1 @@
Subproject commit 26e4445189b676eaee11840e5a9d0ede25cf3896 Subproject commit 23d9b44b3e02bb0d35e4622d125b48e9b44fee2c

2
mission/core/GenericFactory.cpp
View File

@ -224,7 +224,7 @@ void ObjectFactory::createGenericHeaterComponents(GpioIF& gpioIF, PowerSwitchIF&
{new HealthDevice(objects::HEATER_4_CAMERA, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_4}, {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_5_STR, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_5},
{new HealthDevice(objects::HEATER_6_DRO, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_6}, {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 HealthDevice(objects::HEATER_7_SYRLINKS, MessageQueueIF::NO_QUEUE), gpioIds::HEATER_7},
}}); }});
heaterHandler = new HeaterHandler(objects::HEATER_HANDLER, &gpioIF, helper, &pwrSwitcher, heaterHandler = 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);

2
tmtc

@ -1 +1 @@
Subproject commit a3e03350faf3055835e65e744bc177761448ce20 Subproject commit bf158bee2d79c95de3ac2e38f4e7d977699711b1