Robin Mueller
7e6c25901b
commitc137df64ab
Merge:a919b3d1
4179e8e1
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:38:52 2023 +0200 Merge remote-tracking branch 'origin/main' into update_ptme_code commit4179e8e124
Merge:26f5eff6
51f9d5e1
Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:35:54 2023 +0200 Merge pull request 'This bugfix might be super important' (#621) from possible_bugfix_dual_lane_assy into main Reviewed-on: #621 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> Reviewed-by: Steffen Gaisser <gaisser@irs.uni-stuttgart.de> commit51f9d5e1fe
Merge:a17f57cb
26f5eff6
Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:35:10 2023 +0200 Merge branch 'main' into possible_bugfix_dual_lane_assy commita17f57cbb5
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:34:45 2023 +0200 changelog commit26f5eff6d5
Merge:4074e084
8a0f13ba
Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:32:03 2023 +0200 Merge pull request 'More System Modes' (#612) from more-system-modes into main Reviewed-on: #612 commit8a0f13bafb
Merge:14baa356
4074e084
Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:31:51 2023 +0200 Merge branch 'main' into more-system-modes commit14baa3563c
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:30:09 2023 +0200 hello commit7045b6034a
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:18:47 2023 +0200 changelog commit37b9615525
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:18:16 2023 +0200 changelog commit4074e08480
Merge:862a4f26
38686ac3
Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:12:46 2023 +0200 Merge pull request 'Adaption for EM: Add P60 dock without ACU' (#620) from adaption_em_p60_dock_without_acu into main Reviewed-on: #620 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commit23796345d9
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 15:04:30 2023 +0200 changelog and stop payload tracking commitb10275ca43
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:28:05 2023 +0200 changelog commit383849c5cb
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:25:14 2023 +0200 that is more robust commitc66cef9129
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:23:21 2023 +0200 changelog commit02ea8a7298
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:22:21 2023 +0200 changelog commit38686ac3f6
Merge:189a3126
74d5d709
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 14:04:03 2023 +0200 Merge branch 'possible_bugfix_dual_lane_assy' into adaption_em_p60_dock_without_acu commit74d5d70973
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 13:58:08 2023 +0200 this bugfix might be super important commit48355e8263
Merge:5691fe8e
862a4f26
Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:25:50 2023 +0200 Merge branch 'main' into more-system-modes commit189a312628
Merge:a1279428
862a4f26
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:23:46 2023 +0200 Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu commita12794281b
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:20:31 2023 +0200 changelog commitfcaabb4e42
Merge:6c326489
4aafca64
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:20:02 2023 +0200 Merge remote-tracking branch 'origin/main' into adaption_em_p60_dock_without_acu commit6c326489cb
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 10:18:46 2023 +0200 adapt EM SW: GS PCDU added, but use dummy for ACU commit862a4f2685
Merge:4aafca64
2daca272
Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Fri Apr 28 09:37:55 2023 +0200 Merge pull request 'Host SW bugfixes' (#618) from try_fix_host_obsw into main Reviewed-on: #618 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de> commit5691fe8e72
Merge:097be17a
4aafca64
Author: meggert <eggertm@irs.uni-stuttgart.de> Date: Thu Apr 27 15:40:31 2023 +0200 Merge branch 'main' into more-system-modes commit2daca272f8
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Thu Apr 27 11:29:18 2023 +0200 changelog commit03762f9620
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:38:06 2023 +0200 lower live TM handler frequency commita296f16e5c
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:36:38 2023 +0200 host SW works properly again commit83f07a6e16
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:26:32 2023 +0200 configurable event manager queue depth commit00dab64628
Merge:641b8e84
4aafca64
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:03:35 2023 +0200 Merge remote-tracking branch 'origin/main' into try_fix_host_obsw commit4aafca64a6
Merge:f271242d
6901eae8
Author: Robin Müller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:03:01 2023 +0200 Merge pull request 'EM adaptions' (#619) from em_adaptions into main Reviewed-on: #619 commit6901eae816
Merge:7d630ebc
f271242d
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:02:24 2023 +0200 Merge remote-tracking branch 'origin/main' into em_adaptions commit7d630ebcf3
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 17:00:04 2023 +0200 EM adaptions commit641b8e847d
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 16:41:40 2023 +0200 add back tm funnel handler for hosted build commit1314268682
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 16:23:50 2023 +0200 host build requires dedicated live TM task.. commit4040304ef0
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 13:15:42 2023 +0200 this is annoying commita919b3d164
Merge:e22f2a53
9672d6d6
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:11:30 2023 +0200 Merge remote-tracking branch 'origin/develop' into update_ptme_code commit9672d6d6cc
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:11:09 2023 +0200 changelog commite22f2a53ea
Merge:b076e80b
0eb6b7cc
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:05:58 2023 +0200 Merge remote-tracking branch 'origin/develop' into update_ptme_code commitb076e80b44
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:04:10 2023 +0200 changelog commit269aa6f7b0
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:03:42 2023 +0200 changelog commitcaae2b4ba9
Author: Robin Mueller <muellerr@irs.uni-stuttgart.de> Date: Wed Apr 26 11:02:24 2023 +0200 update PTME code commit097be17a29
Author: meggert <eggertm@irs.uni-stuttgart.de> Date: Wed Apr 19 15:07:21 2023 +0200 added remaining acs modes as system modes
173 lines
5.8 KiB
C++
173 lines
5.8 KiB
C++
#include <fsfw_hal/linux/uio/UioMapper.h>
|
|
#include <linux/ipcore/PapbVcInterface.h>
|
|
#include <unistd.h>
|
|
|
|
#include <cstring>
|
|
#include <ctime>
|
|
|
|
#include "fsfw/serviceinterface/ServiceInterface.h"
|
|
|
|
PapbVcInterface::PapbVcInterface(LinuxLibgpioIF* gpioComIF, gpioId_t papbEmptyId,
|
|
std::string uioFile, int mapNum)
|
|
: gpioComIF(gpioComIF), papbEmptyId(papbEmptyId), uioFile(std::move(uioFile)), mapNum(mapNum) {}
|
|
|
|
PapbVcInterface::~PapbVcInterface() {}
|
|
|
|
ReturnValue_t PapbVcInterface::initialize() {
|
|
UioMapper uioMapper(uioFile, mapNum);
|
|
ReturnValue_t result = uioMapper.getMappedAdress(const_cast<uint32_t**>(&vcBaseReg),
|
|
UioMapper::Permissions::WRITE_ONLY);
|
|
if (result != returnvalue::OK) {
|
|
return result;
|
|
}
|
|
return returnvalue::OK;
|
|
}
|
|
|
|
ReturnValue_t PapbVcInterface::write(const uint8_t* data, size_t size) {
|
|
// There are no packets smaller than 4, this is considered a configuration error.
|
|
if (size < 4) {
|
|
return returnvalue::FAILED;
|
|
}
|
|
if (pollInterfaceReadiness(0, true) == returnvalue::OK) {
|
|
startPacketTransfer(ByteWidthCfg::ONE);
|
|
} else {
|
|
return DirectTmSinkIF::IS_BUSY;
|
|
}
|
|
// TODO: This should work but does not.. :(
|
|
// size_t idx = 0;
|
|
// while (idx < size) {
|
|
//
|
|
// nanosleep(&BETWEEN_POLL_DELAY, &remDelay);
|
|
// if ((size - idx) < 4) {
|
|
// *vcBaseReg = CONFIG_DATA_INPUT | (size - idx - 1);
|
|
// usleep(1);
|
|
// }
|
|
// if (pollPapbBusySignal(2) == returnvalue::OK) {
|
|
// // vcBaseReg + DATA_REG_OFFSET + 3 = static_cast<uint8_t>(data + idx);
|
|
// // vcBaseReg + DATA_REG_OFFSET + 2 = static_cast<uint8_t>(data + idx + 1);
|
|
// // vcBaseReg + DATA_REG_OFFSET + 1 = static_cast<uint8_t>(data + idx + 2);
|
|
// // vcBaseReg + DATA_REG_OFFSET = static_cast<uint8_t>(data + idx + 3);
|
|
//
|
|
// // std::memcpy((vcBaseReg + DATA_REG_OFFSET), data + idx , nextWriteSize);
|
|
// *(vcBaseReg + DATA_REG_OFFSET) = *reinterpret_cast<const uint32_t*>(data + idx);
|
|
// //uint8_t* byteReg = reinterpret_cast<uint8_t*>(vcBaseReg + DATA_REG_OFFSET);
|
|
//
|
|
// //byteReg[0] = data[idx];
|
|
// //byteReg[1] = data[idx];
|
|
// } else {
|
|
// abortPacketTransfer();
|
|
// return returnvalue::FAILED;
|
|
// }
|
|
// // TODO: Change this after the bugfix. Right now, the PAPB ignores the content of the byte
|
|
// // width configuration.5
|
|
// // It's okay to increment by a larger amount for the last segment here, loop will be over
|
|
// // in any case.
|
|
// idx += 4;
|
|
// }
|
|
for (size_t idx = 0; idx < size; idx++) {
|
|
// This delay is super-important, DO NOT REMOVE!
|
|
// Polling the GPIO or the config register too often messes up the scheduler.
|
|
// TODO: Maybe this should not be done like this. It would be better if there was a custom
|
|
// FPGA module which can accept packets and then takes care of dumping that packet into
|
|
// the PTME. DMA would be an ideal solution for this.
|
|
nanosleep(&BETWEEN_POLL_DELAY, &remDelay);
|
|
if (pollInterfaceReadiness(2, false) == returnvalue::OK) {
|
|
*(vcBaseReg + DATA_REG_OFFSET) = static_cast<uint32_t>(data[idx]);
|
|
} else {
|
|
abortPacketTransfer();
|
|
return returnvalue::FAILED;
|
|
}
|
|
}
|
|
nanosleep(&BETWEEN_POLL_DELAY, &remDelay);
|
|
if (pollInterfaceReadiness(2, false) == returnvalue::OK) {
|
|
completePacketTransfer();
|
|
} else {
|
|
abortPacketTransfer();
|
|
return returnvalue::FAILED;
|
|
}
|
|
return returnvalue::OK;
|
|
}
|
|
|
|
void PapbVcInterface::startPacketTransfer(ByteWidthCfg initWidth) {
|
|
*vcBaseReg = CONFIG_DATA_INPUT | initWidth;
|
|
}
|
|
|
|
void PapbVcInterface::completePacketTransfer() { *vcBaseReg = CONFIG_END; }
|
|
|
|
ReturnValue_t PapbVcInterface::pollInterfaceReadiness(uint32_t maxPollRetries,
|
|
bool checkReadyForPacketState) const {
|
|
uint32_t busyIdx = 0;
|
|
nextDelay.tv_nsec = FIRST_DELAY_PAPB_POLLING_NS;
|
|
|
|
while (true) {
|
|
// Check if PAPB interface is ready to receive data. Use the configuration register for this.
|
|
// Bit 5, see PTME ptme_001_01-0-7-r2 Table 31.
|
|
uint32_t reg = *vcBaseReg;
|
|
bool busy = (reg >> 5) & 0b1;
|
|
bool readyForPacket = (reg >> 6) & 0b1;
|
|
if (checkReadyForPacketState) {
|
|
if (not busy and readyForPacket) {
|
|
return returnvalue::OK;
|
|
} else if (not busy and not readyForPacket) {
|
|
return PAPB_BUSY;
|
|
}
|
|
} else if (not busy) {
|
|
return returnvalue::OK;
|
|
}
|
|
|
|
busyIdx++;
|
|
if (busyIdx >= maxPollRetries) {
|
|
return PAPB_BUSY;
|
|
}
|
|
|
|
// Ignore signal handling here for now.
|
|
nanosleep(&nextDelay, &remDelay);
|
|
// Adaptive delay.
|
|
if (nextDelay.tv_nsec * 2 <= MAX_DELAY_PAPB_POLLING_NS) {
|
|
nextDelay.tv_nsec *= 2;
|
|
}
|
|
}
|
|
return returnvalue::OK;
|
|
}
|
|
|
|
bool PapbVcInterface::isVcInterfaceBufferEmpty() {
|
|
ReturnValue_t result = returnvalue::OK;
|
|
gpio::Levels papbEmptyState = gpio::Levels::HIGH;
|
|
|
|
result = gpioComIF->readGpio(papbEmptyId, papbEmptyState);
|
|
|
|
if (result != returnvalue::OK) {
|
|
sif::error << "PapbVcInterface::isVcInterfaceBufferEmpty: Failed to read papb empty signal"
|
|
<< std::endl;
|
|
return true;
|
|
}
|
|
|
|
if (papbEmptyState == gpio::Levels::HIGH) {
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool PapbVcInterface::isBusy() const { return pollInterfaceReadiness(0, true) == PAPB_BUSY; }
|
|
|
|
void PapbVcInterface::cancelTransfer() { abortPacketTransfer(); }
|
|
|
|
ReturnValue_t PapbVcInterface::sendTestFrame() {
|
|
/** Size of one complete transfer frame data field amounts to 1105 bytes */
|
|
uint8_t testPacket[1105];
|
|
|
|
/** Fill one test packet */
|
|
for (int idx = 0; idx < 1105; idx++) {
|
|
testPacket[idx] = static_cast<uint8_t>(idx & 0xFF);
|
|
}
|
|
|
|
ReturnValue_t result = write(testPacket, 1105);
|
|
if (result != returnvalue::OK) {
|
|
return result;
|
|
}
|
|
|
|
return returnvalue::OK;
|
|
}
|
|
|
|
void PapbVcInterface::abortPacketTransfer() { *vcBaseReg = CONFIG_ABORT; }
|