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

v1.10.0 #220

Merged
meierj merged 592 commits from develop into main 2022-04-22 07:42:20 +02:00
Conversation 0 Commits 592 Files Changed 218 +3 -3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2cd5450333 - Show all commits

2
fsfw

@ -1 +1 @@
Subproject commit 28e93696dfe95fdeb8465a2f59a3e578fdf0f1cb Subproject commit 94ed5822971575e9715c39c86ab4466c81718441

2
mission/devices/devicedefinitions/GomspaceDefinitions.h
View File

@ -404,7 +404,7 @@ class PduCoreHk : public StaticLocalDataSet<9> {
lp_vec_t<int16_t, 9>(sid.objectId, P60System::pool::PDU_VOLTAGES, this); lp_vec_t<int16_t, 9>(sid.objectId, P60System::pool::PDU_VOLTAGES, this);
/** Output switch states */ /** Output switch states */
lp_vec_t<uint8_t, 9> outputEnables = lp_vec_t<uint8_t, 9> outputEnables =
lp_vec_t<uint8_t, 9>(sid.objectId, P60System::pool::PDU_VOLTAGES, this); lp_vec_t<uint8_t, 9>(sid.objectId, P60System::pool::PDU_OUT_ENABLE, this);
/** Number of reboots */ /** Number of reboots */
lp_var_t<uint32_t> bootcount = lp_var_t<uint32_t> bootcount =
lp_var_t<uint32_t>(sid.objectId, P60System::pool::PDU_BOOTCNT, this); lp_var_t<uint32_t>(sid.objectId, P60System::pool::PDU_BOOTCNT, this);

2
tmtc

@ -1 +1 @@
Subproject commit 98783a0981b2a23d8f4dbfa8706b8826b8194231 Subproject commit 259cd25b6ed7a88790dff58483537eb250036f00