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

update object list, bugfix
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2022-03-22 19:33:49 +01:00
parent 22154f2851
commit 5fb4e468ba
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
7 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
generators/bsp_q7s_objects.csv
View File

@ -109,6 +109,7 @@
0x54694269;TEST_TASK
0x73000001;ACS_BOARD_ASS
0x73000002;SUS_BOARD_ASS
0x73000003;TCS_BOARD_ASS
0x73000100;TM_FUNNEL
0x73500000;CCSDS_IP_CORE_BRIDGE
0xFFFFFFFF;NO_OBJECT

1 0x00005060 P60DOCK_TEST_TASK
109 0x54694269 TEST_TASK
110 0x73000001 ACS_BOARD_ASS
111 0x73000002 SUS_BOARD_ASS
112 0x73000003 TCS_BOARD_ASS
113 0x73000100 TM_FUNNEL
114 0x73500000 CCSDS_IP_CORE_BRIDGE
115 0xFFFFFFFF NO_OBJECT

2
generators/events/translateEvents.cpp
View File

@ -1,7 +1,7 @@
/**
* @brief Auto-generated event translation file. Contains 167 translations.
* @details
* Generated on: 2022-03-22 11:15:56
* Generated on: 2022-03-22 19:33:14
*/
#include "translateEvents.h"

7
generators/objects/translateObjects.cpp
View File

@ -1,8 +1,8 @@
/**
* @brief Auto-generated object translation file.
* @details
* Contains 114 translations.
* Generated on: 2022-03-22 11:16:03
* Contains 115 translations.
* Generated on: 2022-03-22 19:33:19
*/
#include "translateObjects.h"
@ -117,6 +117,7 @@ const char *LIBGPIOD_TEST_STRING = "LIBGPIOD_TEST";
const char *TEST_TASK_STRING = "TEST_TASK";
const char *ACS_BOARD_ASS_STRING = "ACS_BOARD_ASS";
const char *SUS_BOARD_ASS_STRING = "SUS_BOARD_ASS";
const char *TCS_BOARD_ASS_STRING = "TCS_BOARD_ASS";
const char *TM_FUNNEL_STRING = "TM_FUNNEL";
const char *CCSDS_IP_CORE_BRIDGE_STRING = "CCSDS_IP_CORE_BRIDGE";
const char *NO_OBJECT_STRING = "NO_OBJECT";
@ -345,6 +346,8 @@ const char *translateObject(object_id_t object) {
return ACS_BOARD_ASS_STRING;
case 0x73000002:
return SUS_BOARD_ASS_STRING;
case 0x73000003:
return TCS_BOARD_ASS_STRING;
case 0x73000100:
return TM_FUNNEL_STRING;
case 0x73500000:

2
linux/fsfwconfig/events/translateEvents.cpp
View File

@ -1,7 +1,7 @@
/**
* @brief Auto-generated event translation file. Contains 167 translations.
* @details
* Generated on: 2022-03-22 11:15:56
* Generated on: 2022-03-22 19:33:14
*/
#include "translateEvents.h"

7
linux/fsfwconfig/objects/translateObjects.cpp
View File

@ -1,8 +1,8 @@
/**
* @brief Auto-generated object translation file.
* @details
* Contains 114 translations.
* Generated on: 2022-03-22 11:16:03
* Contains 115 translations.
* Generated on: 2022-03-22 19:33:19
*/
#include "translateObjects.h"
@ -117,6 +117,7 @@ const char *LIBGPIOD_TEST_STRING = "LIBGPIOD_TEST";
const char *TEST_TASK_STRING = "TEST_TASK";
const char *ACS_BOARD_ASS_STRING = "ACS_BOARD_ASS";
const char *SUS_BOARD_ASS_STRING = "SUS_BOARD_ASS";
const char *TCS_BOARD_ASS_STRING = "TCS_BOARD_ASS";
const char *TM_FUNNEL_STRING = "TM_FUNNEL";
const char *CCSDS_IP_CORE_BRIDGE_STRING = "CCSDS_IP_CORE_BRIDGE";
const char *NO_OBJECT_STRING = "NO_OBJECT";
@ -345,6 +346,8 @@ const char *translateObject(object_id_t object) {
return ACS_BOARD_ASS_STRING;
case 0x73000002:
return SUS_BOARD_ASS_STRING;
case 0x73000003:
return TCS_BOARD_ASS_STRING;
case 0x73000100:
return TM_FUNNEL_STRING;
case 0x73500000:

1
mission/system/TcsBoardAssembly.cpp
View File

@ -23,6 +23,7 @@ void TcsBoardAssembly::performChildOperation() {
} else if (state == PowerSwitcher::WAIT_ON and
switcher.getState() == PowerSwitcher::SWITCH_IS_ON) {
// Indicator that mode commanding can be performed now
AssemblyBase::startTransition(targetMode, targetSubmode);
AssemblyBase::performChildOperation();
}
}

2
tmtc

@ -1 +1 @@
Subproject commit cb479cc2f48ed15668a5b223529dc1cf1ee5b6ad
Subproject commit a55940339850e862b05a06a94fa8381bf7da0743