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 +17 -17
12 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dd37f90b47 - Show all commits

2
fsfw

@ -1 +1 @@
Subproject commit 17262a1da91a92c3b5995ccfbd67d439d01bb456
Subproject commit fec5f83f4f2459facee25939e0292115f89a6d73

2
generators/.run/events.run.xml
View File

@ -12,7 +12,7 @@
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/fsfwgen.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/gen.py" />
<option name="PARAMETERS" value="events" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />

2
generators/.run/objects.run.xml
View File

@ -12,7 +12,7 @@
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/fsfwgen.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/gen.py" />
<option name="PARAMETERS" value="objects" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />

2
generators/.run/returnvalues.run.xml
View File

@ -12,7 +12,7 @@
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/fsfwgen.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/gen.py" />
<option name="PARAMETERS" value="returnvalues" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />

6
generators/bsp_q7s_returnvalues.csv
View File

@ -538,8 +538,4 @@
0x62a1;RS_BadBitRate;Bad bitrate has been commanded (e.g. 0);0xA1;linux/obc/PtmeConfig.h;RATE_SETTER
0x62a2;RS_ClkInversionFailed;Failed to invert clock and thus change the time the data is updated with respect to the tx clock;0xA2;linux/obc/PtmeConfig.h;RATE_SETTER
0x62a3;RS_TxManipulatorConfigFailed;Failed to change configuration bit of tx clock manipulator;0xA3;linux/obc/PtmeConfig.h;RATE_SETTER
0x5aa0;IPCI_PapbBusy;;0xA0;linux/archive/tmtc/CCSDSIPCoreBridge.h;CCSDS_IP_CORE_BRIDGE
0x5a01;IPCI_UnknownGpioId;;1;linux/archive/gpio/LinuxLibgpioIF.h;CCSDS_IP_CORE_BRIDGE
0x5a02;IPCI_DriveGpioFailure;;2;linux/archive/gpio/LinuxLibgpioIF.h;CCSDS_IP_CORE_BRIDGE
0x5a03;IPCI_GpioTypeFailure;;3;linux/archive/gpio/LinuxLibgpioIF.h;CCSDS_IP_CORE_BRIDGE
0x5a04;IPCI_GpioInvalidInstance;;4;linux/archive/gpio/LinuxLibgpioIF.h;CCSDS_IP_CORE_BRIDGE
0x5aa0;IPCI_PapbBusy;;0xA0;linux/obc/PapbVcInterface.h;CCSDS_IP_CORE_BRIDGE

Can't render this file because it has a wrong number of fields in line 22.

2
generators/events/translateEvents.cpp
View File

@ -1,7 +1,7 @@
/**
* @brief Auto-generated event translation file. Contains 162 translations.
* @details
* Generated on: 2022-03-07 17:09:35
* Generated on: 2022-03-11 14:31:47
*/
#include "translateEvents.h"

2
generators/fsfwgen

@ -1 +1 @@
Subproject commit c5ef1783a3b082c0e88561bd91bc3ee0f459fafc
Subproject commit 5dbe33ceb85b15f27e6722bb907df3ed324b701b

0
generators/fsfwgen.py → generators/gen.py
View File

2
generators/objects/translateObjects.cpp
View File

@ -2,7 +2,7 @@
* @brief Auto-generated object translation file.
* @details
* Contains 113 translations.
* Generated on: 2022-03-07 17:15:28
* Generated on: 2022-03-11 14:31:51
*/
#include "translateObjects.h"

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

@ -1,7 +1,7 @@
/**
* @brief Auto-generated event translation file. Contains 162 translations.
* @details
* Generated on: 2022-03-07 17:09:35
* Generated on: 2022-03-11 14:31:47
*/
#include "translateEvents.h"

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

@ -2,7 +2,7 @@
* @brief Auto-generated object translation file.
* @details
* Contains 113 translations.
* Generated on: 2022-03-07 17:15:28
* Generated on: 2022-03-11 14:31:51
*/
#include "translateObjects.h"

10
mission/system/AcsBoardAssembly.h
View File

@ -73,13 +73,17 @@ class GpioIF;
*/
class AcsBoardAssembly : public DualLaneAssemblyBase {
public:
// Use these variables instead of magic numbers when generator was updated
// TRANSITION_OTHER_SIDE_FAILED_ID
// NOT_ENOUGH_DEVICES_DUAL_MODE_ID
// POWER_STATE_MACHINE_TIMEOUT_ID
static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::ACS_BOARD_ASS;
static constexpr Event TRANSITION_OTHER_SIDE_FAILED =
event::makeEvent(SUBSYSTEM_ID, TRANSITION_OTHER_SIDE_FAILED_ID, severity::HIGH);
event::makeEvent(SUBSYSTEM_ID, 0, severity::HIGH);
static constexpr Event NOT_ENOUGH_DEVICES_DUAL_MODE =
event::makeEvent(SUBSYSTEM_ID, NOT_ENOUGH_DEVICES_DUAL_MODE_ID, severity::HIGH);
event::makeEvent(SUBSYSTEM_ID, 1, severity::HIGH);
static constexpr Event POWER_STATE_MACHINE_TIMEOUT =
event::makeEvent(SUBSYSTEM_ID, POWER_STATE_MACHINE_TIMEOUT_ID, severity::MEDIUM);
event::makeEvent(SUBSYSTEM_ID, 2, severity::MEDIUM);
static constexpr uint8_t NUMBER_DEVICES_MODE_TABLE = 9;