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

updates
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-02-08 20:40:53 +01:00
parent fc61066848
commit 7ec8ca3356
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -21,7 +21,8 @@ change warranting a new major release:
- ACS Controller scheduling is now configurable via the `eive/definitions.h` file. Also ensured - ACS Controller scheduling is now configurable via the `eive/definitions.h` file. Also ensured
that scheduling is done in big blocks to reduce risk of missed deadlines. that scheduling is done in big blocks to reduce risk of missed deadlines.
- Replaced chained locks for polling new sensor data to the `AcsController` - Replaced chained locks for polling new sensor data to the `AcsController`.
- Made TM store even larger.
## Fixed ## Fixed
@ -30,6 +31,10 @@ change warranting a new major release:
needs to be declared volatile to avoid compiler optimizations. needs to be declared volatile to avoid compiler optimizations.
PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/374 PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/374
## Added
- Create TCS controller for EM build.
# [v1.26.1] 2023-02-08 # [v1.26.1] 2023-02-08
- Initialize parameter helper in ACS controller. - Initialize parameter helper in ACS controller.

1
bsp_q7s/em/emObjectFactory.cpp
View File

@ -112,5 +112,6 @@ void ObjectFactory::produce(void* args) {
pcdu::Switches::PDU1_CH5_SOLAR_CELL_EXP_5V); pcdu::Switches::PDU1_CH5_SOLAR_CELL_EXP_5V);
#endif #endif
createAcsController(true); createAcsController(true);
createThermalController();
satsystem::com::init(); satsystem::com::init();
} }

2
fsfw

@ -1 +1 @@
Subproject commit 84bbef016712096147e8cf3f2cec87f317d9e7e7 Subproject commit 6f05d6b7b0ee0e6bc86986ec55491d42cde1cf93

6
linux/ipcore/PdecHandler.h
View File

@ -87,8 +87,10 @@ class PdecHandler : public SystemObject, public ExecutableObjectIF, public HasAc
static const Event LOST_CARRIER_LOCK_PDEC = MAKE_EVENT(5, severity::INFO); static const Event LOST_CARRIER_LOCK_PDEC = MAKE_EVENT(5, severity::INFO);
//! [EXPORT] : [COMMENT] Lost bit lock //! [EXPORT] : [COMMENT] Lost bit lock
static const Event LOST_BIT_LOCK_PDEC = MAKE_EVENT(6, severity::INFO); static const Event LOST_BIT_LOCK_PDEC = MAKE_EVENT(6, severity::INFO);
static constexpr Event POLL_SYSCALL_ERROR_PDEC = event::makeEvent(SUBSYSTEM_ID, 7, severity::MEDIUM); static constexpr Event POLL_SYSCALL_ERROR_PDEC =
static constexpr Event WRITE_SYSCALL_ERROR_PDEC = event::makeEvent(SUBSYSTEM_ID, 8, severity::MEDIUM); event::makeEvent(SUBSYSTEM_ID, 7, severity::MEDIUM);
static constexpr Event WRITE_SYSCALL_ERROR_PDEC =
event::makeEvent(SUBSYSTEM_ID, 8, severity::MEDIUM);
private: private:
static const uint8_t INTERFACE_ID = CLASS_ID::PDEC_HANDLER; static const uint8_t INTERFACE_ID = CLASS_ID::PDEC_HANDLER;

6
mission/core/GenericFactory.cpp
View File

@ -87,14 +87,14 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
} }
{ {
PoolManager::LocalPoolConfig poolCfg = {{300, 16}, {350, 32}, {350, 64}, PoolManager::LocalPoolConfig poolCfg = {{400, 32}, {350, 64}, {200, 128},
{200, 128}, {150, 1024}, {150, 2048}}; {150, 512}, {150, 1024}, {150, 2048}};
tmStore = new PoolManager(objects::TM_STORE, poolCfg); tmStore = new PoolManager(objects::TM_STORE, poolCfg);
} }
{ {
PoolManager::LocalPoolConfig poolCfg = {{300, 16}, {200, 32}, {150, 64}, {150, 128}, PoolManager::LocalPoolConfig poolCfg = {{300, 16}, {200, 32}, {150, 64}, {150, 128},
{100, 256}, {50, 512}, {50, 1024}, {10, 2048}}; {100, 256}, {50, 512}, {50, 1024}, {50, 2048}};
new PoolManager(objects::IPC_STORE, poolCfg); new PoolManager(objects::IPC_STORE, poolCfg);
} }