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

changes for updated fsfw
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller
2021-11-19 13:22:20 +01:00
parent a2d5f872ad
commit c1be4a1e83
8 changed files with 52 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/testtasks/TestTask.cpp
View File

@ -11,15 +11,14 @@
#include <cstring>
TestTask::TestTask(object_id_t objectId_):
SystemObject(objectId_), testMode(testModes::A) {
EiveTestTask::EiveTestTask(object_id_t objectId_): TestTask(objectId_), testMode(testModes::A) {
IPCStore = ObjectManager::instance()->get<StorageManagerIF>(objects::IPC_STORE);
}
TestTask::~TestTask() {
EiveTestTask::~EiveTestTask() {
}
ReturnValue_t TestTask::performOperation(uint8_t operationCode) {
ReturnValue_t EiveTestTask::performOperation(uint8_t operationCode) {
ReturnValue_t result = RETURN_OK;
if(oneShotAction) {
@ -74,7 +73,7 @@ const char hyperion_gps_data[] = ""
"$GNVTG,040.7,T,,M,000.0,N,000.0,K,A*10\r\n"
"$GNZDA,173225.998892,27,02,2021,00,00*75\r\n";
ReturnValue_t TestTask::performOneShotAction() {
ReturnValue_t EiveTestTask::performOneShotAction() {
#if OBSW_ADD_TEST_CODE == 1
//performLwgpsTest();
#endif
@ -82,24 +81,24 @@ ReturnValue_t TestTask::performOneShotAction() {
}
ReturnValue_t TestTask::performPeriodicAction() {
ReturnValue_t EiveTestTask::performPeriodicAction() {
ReturnValue_t result = RETURN_OK;
return result;
}
ReturnValue_t TestTask::performActionA() {
ReturnValue_t EiveTestTask::performActionA() {
ReturnValue_t result = RETURN_OK;
/* Add periodically executed code here */
return result;
}
ReturnValue_t TestTask::performActionB() {
ReturnValue_t EiveTestTask::performActionB() {
ReturnValue_t result = RETURN_OK;
/* Add periodically executed code here */
return result;
}
void TestTask::performLwgpsTest() {
void EiveTestTask::performLwgpsTest() {
/* Everything here will only be performed once. */
sif::info << "Processing sample GPS output.." << std::endl;

15
test/testtasks/TestTask.h
View File

@ -1,13 +1,10 @@
#ifndef TEST_TESTTASK_H_
#define TEST_TESTTASK_H_
#include <fsfw/tasks/ExecutableObjectIF.h>
#include <fsfw/objectmanager/SystemObject.h>
#include <fsfw/parameters/HasParametersIF.h>
#include <fsfw/serialize/SerialBufferAdapter.h>
#include <fsfw/serialize/SerializeElement.h>
#include <fsfw/serialize/SerialLinkedListAdapter.h>
#include <fsfw/storagemanager/StorageManagerIF.h>
#include "fsfw_tests/integration/task/TestTask.h"
#include <cstddef>
@ -18,13 +15,11 @@
* Should not be used for board specific
* tests. Instead, a derived board test class should be used.
*/
class TestTask : public SystemObject,
public ExecutableObjectIF,
public HasReturnvaluesIF {
class EiveTestTask : public TestTask {
public:
TestTask(object_id_t objectId);
virtual ~TestTask();
virtual ReturnValue_t performOperation(uint8_t operationCode = 0);
EiveTestTask(object_id_t objectId);
virtual ~EiveTestTask();
virtual ReturnValue_t performOperation(uint8_t operationCode = 0) override;
protected:
virtual ReturnValue_t performOneShotAction();