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

adaptions for setup with ccsds testbed
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Jakob Meier 2022-06-23 20:12:56 +02:00
parent af039c540a
commit ed0eb4fe9c
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp_q7s/fmObjectFactory.cpp
View File

@ -126,7 +126,7 @@ void ObjectFactory::createCcsdsComponents(LinuxLibgpioIF* gpioComIF) {
AxiPtmeConfig* axiPtmeConfig = AxiPtmeConfig* axiPtmeConfig =
new AxiPtmeConfig(objects::AXI_PTME_CONFIG, q7s::UIO_PTME, q7s::uiomapids::PTME_CONFIG); new AxiPtmeConfig(objects::AXI_PTME_CONFIG, q7s::UIO_PTME, q7s::uiomapids::PTME_CONFIG);
PtmeConfig* ptmeConfig = new PtmeConfig(objects::PTME_CONFIG, axiPtmeConfig); PtmeConfig* ptmeConfig = new PtmeConfig(objects::PTME_CONFIG, axiPtmeConfig);
#if OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT == 1 #if OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT == 0
// Set to high value when not sending via syrlinks // Set to high value when not sending via syrlinks
static const uint32_t TRANSMITTER_TIMEOUT = 86400000; // 1 day static const uint32_t TRANSMITTER_TIMEOUT = 86400000; // 1 day
#else #else

2
fsfw

@ -1 +1 @@
Subproject commit 36669fd4d914a2397a0c64e3292dde7145b1f077 Subproject commit cda81fc8415c3873c035aa7ebbfa3fe93d519f08

9
mission/tmtc/CCSDSHandler.cpp
View File

@ -132,6 +132,9 @@ ReturnValue_t CCSDSHandler::initialize() {
#if OBSW_SYRLINKS_SIMULATED == 1 #if OBSW_SYRLINKS_SIMULATED == 1
// Update data on rising edge // Update data on rising edge
ptmeConfig->invertTxClock(false); ptmeConfig->invertTxClock(false);
transmitterCountdown.setTimeout(transmitterTimeout);
linkState = UP;
forwardLinkstate();
#endif /* OBSW_SYRLINKS_SIMULATED == 1*/ #endif /* OBSW_SYRLINKS_SIMULATED == 1*/
return result; return result;
@ -390,7 +393,7 @@ void CCSDSHandler::enableTransmit() {
#ifndef TE0720_1CFA #ifndef TE0720_1CFA
gpioIF->pullHigh(enTxClock); gpioIF->pullHigh(enTxClock);
gpioIF->pullHigh(enTxData); gpioIF->pullHigh(enTxData);
#endif /* BOARD_TE0720 == 0 */ #endif
} }
void CCSDSHandler::checkTxTimer() { void CCSDSHandler::checkTxTimer() {
@ -403,10 +406,10 @@ void CCSDSHandler::checkTxTimer() {
} }
void CCSDSHandler::disableTransmit() { void CCSDSHandler::disableTransmit() {
#ifdef TE0720_1CFA #ifndef TE0720_1CFA
gpioIF->pullLow(enTxClock); gpioIF->pullLow(enTxClock);
gpioIF->pullLow(enTxData); gpioIF->pullLow(enTxData);
#endif /* BOARD_TE0720 == 0 */ #endif
linkState = DOWN; linkState = DOWN;
forwardLinkstate(); forwardLinkstate();
transmitterCountdown.setTimeout(0); transmitterCountdown.setTimeout(0);

4
mission/tmtc/VirtualChannel.cpp
View File

@ -64,4 +64,6 @@ void VirtualChannel::setPtmeObject(PtmeIF* ptme_) {
ptme = ptme_; ptme = ptme_;
} }
void VirtualChannel::setLinkState(bool linkIsUp_) { linkIsUp = linkIsUp_; } void VirtualChannel::setLinkState(bool linkIsUp_) {
linkIsUp = linkIsUp_;
}