Compare commits

..

10 Commits

Author SHA1 Message Date
243088252c bump revision
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 11:41:38 +01:00
9be00603f4 Merge pull request 'Fix some issues' (#392) from bugfixes_code_review_msg_handling into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #392
Reviewed-by: Steffen Gaisser <gaisser@irs.uni-stuttgart.de>
2023-02-21 11:40:51 +01:00
f3fe65080b Merge remote-tracking branch 'origin/develop' into bugfixes_code_review_msg_handling
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-02-21 11:40:48 +01:00
d9ef0f9a9d small tweak
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-02-21 11:39:56 +01:00
7aa977efdf move changelog entry
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-02-21 11:32:51 +01:00
adda32854d Merge remote-tracking branch 'origin/develop' into bugfixes_code_review_msg_handling 2023-02-21 11:32:17 +01:00
0f5e65e5ce Merge branch 'develop' into bugfixes_code_review_msg_handling
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-21 11:29:03 +01:00
9a9574369a deleted accidentaly
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-02-19 17:08:55 +01:00
4b6e0addf1 changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2023-02-19 17:07:48 +01:00
01fbb2d9fd improvements 2023-02-19 17:06:08 +01:00
7 changed files with 34 additions and 4 deletions

View File

@ -17,6 +17,18 @@ change warranting a new major release:
# [unreleased]
# [v1.29.1]
## Fixed
- Limit number of handled messages for core TM handlers:
- https://egit.irs.uni-stuttgart.de/eive/eive-obsw/issues/391
- https://egit.irs.uni-stuttgart.de/eive/eive-obsw/issues/390
- https://egit.irs.uni-stuttgart.de/eive/eive-obsw/issues/389
- HeaterHandler better handling for faulty message reception
Issue: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/issues/388
- Disable stopwatch in MAX31865 polling task
# [v1.29.0]
eive-tmtc: v2.13.0

View File

@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13)
set(OBSW_VERSION_MAJOR 1)
set(OBSW_VERSION_MINOR 29)
set(OBSW_VERSION_REVISION 0)
set(OBSW_VERSION_REVISION 1)
# set(CMAKE_VERBOSE TRUE)

View File

@ -26,7 +26,7 @@ ReturnValue_t Max31865RtdPolling::performOperation(uint8_t operationCode) {
using namespace MAX31865;
ReturnValue_t result = returnvalue::OK;
static_cast<void>(result);
Stopwatch watch;
// Stopwatch watch;
if (periodicInitHandling()) {
#if OBSW_RTD_AUTO_MODE == 0
// 10 ms delay for VBIAS startup

View File

@ -108,6 +108,7 @@ void HeaterHandler::readCommandQueue() {
break;
} else if (result != returnvalue::OK) {
sif::warning << "HeaterHandler::readCommandQueue: Message reception error" << std::endl;
break;
}
result = actionHelper.handleActionMessage(&command);
if (result == returnvalue::OK) {

View File

@ -12,6 +12,7 @@ const char* CfdpTmFunnel::getName() const { return "CFDP TM Funnel"; }
ReturnValue_t CfdpTmFunnel::performOperation(uint8_t) {
TmTcMessage currentMessage;
unsigned int count = 0;
ReturnValue_t status = tmQueue->receiveMessage(&currentMessage);
while (status == returnvalue::OK) {
status = handlePacket(currentMessage);
@ -19,6 +20,11 @@ ReturnValue_t CfdpTmFunnel::performOperation(uint8_t) {
sif::warning << "CfdpTmFunnel packet handling failed" << std::endl;
break;
}
count++;
if(count == 500) {
sif::error << "CfdpTmFunnel: Possible message storm detected" << std::endl;
break;
}
status = tmQueue->receiveMessage(&currentMessage);
}

View File

@ -12,6 +12,7 @@ PusTmFunnel::~PusTmFunnel() = default;
ReturnValue_t PusTmFunnel::performOperation(uint8_t) {
TmTcMessage currentMessage;
unsigned int count = 0;
ReturnValue_t status = tmQueue->receiveMessage(&currentMessage);
while (status == returnvalue::OK) {
status = handlePacket(currentMessage);
@ -19,6 +20,11 @@ ReturnValue_t PusTmFunnel::performOperation(uint8_t) {
sif::warning << "TmFunnel packet handling failed" << std::endl;
break;
}
count++;
if(count == 500) {
sif::error << "PusTmFunnel: Possible message storm detected" << std::endl;
break;
}
status = tmQueue->receiveMessage(&currentMessage);
}

View File

@ -28,6 +28,7 @@ ReturnValue_t VirtualChannel::performOperation() {
ReturnValue_t result = returnvalue::OK;
TmTcMessage message;
unsigned int count = 0;
while (tmQueue->receiveMessage(&message) == returnvalue::OK) {
store_address_t storeId = message.getStorageId();
const uint8_t* data = nullptr;
@ -43,12 +44,16 @@ ReturnValue_t VirtualChannel::performOperation() {
if (linkIsUp) {
result = ptme->writeToVc(vcId, data, size);
}
tmStore->deleteData(storeId);
if (result != returnvalue::OK) {
return result;
}
count++;
if(count == 500) {
sif::error << "VirtualChannel: Possible message storm detected" << std::endl;
break;
}
}
return result;
}