some fixes
This commit is contained in:
parent
efbcb0569f
commit
5864b1cb59
@ -79,9 +79,9 @@ void PoolObjectBase::reportReadCommitError(const char* variableType, ReturnValue
|
||||
}
|
||||
|
||||
const char* errMsg = nullptr;
|
||||
if (error == localpool::POOL_ENTRY_NOT_FOUND) {
|
||||
if (error == POOL_ENTRY_NOT_FOUND) {
|
||||
errMsg = "Pool entry not found";
|
||||
} else if (error == localpool::POOL_ENTRY_TYPE_CONFLICT) {
|
||||
} else if (error == POOL_ENTRY_TYPE_CONFLICT) {
|
||||
errMsg = "Pool entry type conflict";
|
||||
} else if (error == PoolVariableIF::INVALID_READ_WRITE_MODE) {
|
||||
errMsg = "Pool variable wrong read-write mode";
|
||||
|
@ -1,12 +1,12 @@
|
||||
#pragma once
|
||||
|
||||
#include <fsfw/ipc/MutexGuard.h>
|
||||
#include <misc/archive/HasLocalDpIFManagerAttorney.h>
|
||||
|
||||
#include "LocalPoolObjectBase.h"
|
||||
#include "fsfw/datapool/DataSetIF.h"
|
||||
#include "fsfw/datapool/PoolEntry.h"
|
||||
#include "fsfw/datapool/PoolVariableIF.h"
|
||||
#include "fsfw/serialize/SerializeAdapter.h"
|
||||
#include "fsfw/serviceinterface/ServiceInterface.h"
|
||||
|
||||
namespace datapool {
|
||||
|
@ -1,6 +1,7 @@
|
||||
#include "PeriodicHkHelper.h"
|
||||
|
||||
#include <cmath>
|
||||
#include <functional>
|
||||
#include <set>
|
||||
|
||||
#include "fsfw/housekeeping/AcceptsHkPacketsIF.h"
|
||||
|
@ -1,11 +1,11 @@
|
||||
#pragma once
|
||||
|
||||
#include <bits/types/struct_timeval.h>
|
||||
#include <fsfw/ipc/MessageQueueIF.h>
|
||||
#include <fsfw/ipc/messageQueueDefinitions.h>
|
||||
#include <fsfw/timemanager/clockDefinitions.h>
|
||||
|
||||
#include <cstdint>
|
||||
#include <ctime>
|
||||
|
||||
#include "fsfw/datapool/definitions.h"
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_TESTDEVICEDEFINITIONS_H_
|
||||
#define MISSION_DEVICES_DEVICEDEFINITIONS_TESTDEVICEDEFINITIONS_H_
|
||||
|
||||
#include <fsfw/datapoollocal/StaticLocalDataSet.h>
|
||||
#include <fsfw/datapool.h>
|
||||
#include <fsfw/devicehandlers/DeviceHandlerIF.h>
|
||||
|
||||
namespace testdevice {
|
||||
@ -67,21 +67,21 @@ static constexpr size_t TEST_COMMAND_0_SIZE = sizeof(TEST_COMMAND_0);
|
||||
static constexpr size_t TEST_COMMAND_1_SIZE =
|
||||
sizeof(TEST_COMMAND_1) + sizeof(COMMAND_1_PARAM1) + sizeof(COMMAND_1_PARAM2);
|
||||
|
||||
enum PoolIds : lp_id_t { TEST_UINT8_ID = 0, TEST_UINT32_ID = 1, TEST_FLOAT_VEC_3_ID = 2 };
|
||||
enum PoolIds : dp::id_t { TEST_UINT8_ID = 0, TEST_UINT32_ID = 1, TEST_FLOAT_VEC_3_ID = 2 };
|
||||
|
||||
static constexpr uint8_t TEST_SET_ID = TEST_NORMAL_MODE_CMD;
|
||||
|
||||
class TestDataSet : public StaticLocalDataSet<3> {
|
||||
class TestDataSet : public dp::StaticSharedSet<3> {
|
||||
public:
|
||||
TestDataSet(localpool::SharedPool& owner) : StaticLocalDataSet(owner, TEST_SET_ID) {}
|
||||
TestDataSet(object_id_t owner) : StaticLocalDataSet(sid_t(owner, TEST_SET_ID)) {}
|
||||
TestDataSet(dp::SharedPool& owner) : StaticSharedSet(owner, TEST_SET_ID) {}
|
||||
TestDataSet(object_id_t owner) : StaticSharedSet(dp::sid_t(owner, TEST_SET_ID)) {}
|
||||
|
||||
lp_var_t<uint8_t> testUint8Var =
|
||||
lp_var_t<uint8_t>(gp_id_t(this->getCreatorObjectId(), PoolIds::TEST_UINT8_ID), this);
|
||||
lp_var_t<uint32_t> testUint32Var =
|
||||
lp_var_t<uint32_t>(gp_id_t(this->getCreatorObjectId(), PoolIds::TEST_UINT32_ID), this);
|
||||
lp_vec_t<float, 3> testFloat3Vec =
|
||||
lp_vec_t<float, 3>(gp_id_t(this->getCreatorObjectId(), PoolIds::TEST_FLOAT_VEC_3_ID), this);
|
||||
dp::var_t<uint8_t> testUint8Var =
|
||||
dp::var_t<uint8_t>(dp::g_id_t(this->getCreatorObjectId(), PoolIds::TEST_UINT8_ID), this);
|
||||
dp::var_t<uint32_t> testUint32Var =
|
||||
dp::var_t<uint32_t>(dp::g_id_t(this->getCreatorObjectId(), PoolIds::TEST_UINT32_ID), this);
|
||||
dp::vec_t<float, 3> testFloat3Vec = dp::vec_t<float, 3>(
|
||||
dp::g_id_t(this->getCreatorObjectId(), PoolIds::TEST_FLOAT_VEC_3_ID), this);
|
||||
};
|
||||
|
||||
} // namespace testdevice
|
||||
|
Loading…
Reference in New Issue
Block a user