From 4d76bf24b581aaeba5c2e276f4d09c90c806215e Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Tue, 1 Dec 2020 19:16:19 +0100 Subject: [PATCH] fsfw compiles without datapoolglob folder --- .../datapoolglob}/ControllerSet.cpp | 0 .../datapoolglob}/ControllerSet.h | 0 .../datapoolglob}/DataPoolAdmin.cpp | 0 .../datapoolglob}/DataPoolAdmin.h | 0 .../datapoolglob}/DataPoolParameterWrapper.cpp | 0 .../datapoolglob}/DataPoolParameterWrapper.h | 0 .../datapoolglob}/GlobalDataPool.cpp | 0 .../datapoolglob}/GlobalDataPool.h | 0 .../datapoolglob}/GlobalDataSet.cpp | 0 .../datapoolglob}/GlobalDataSet.h | 0 .../datapoolglob}/GlobalPoolVariable.h | 0 .../datapoolglob}/GlobalPoolVariable.tpp | 0 .../datapoolglob}/GlobalPoolVector.h | 0 .../datapoolglob}/GlobalPoolVector.tpp | 0 {datapoolglob => archive/datapoolglob}/PIDReader.h | 0 .../datapoolglob}/PIDReaderList.h | 0 .../datapoolglob}/PoolRawAccess.cpp | 0 .../datapoolglob}/PoolRawAccess.h | 0 devicehandlers/DeviceHandlerBase.cpp | 12 ++++++------ internalError/InternalErrorReporter.cpp | 2 -- 20 files changed, 6 insertions(+), 8 deletions(-) rename {datapoolglob => archive/datapoolglob}/ControllerSet.cpp (100%) rename {datapoolglob => archive/datapoolglob}/ControllerSet.h (100%) rename {datapoolglob => archive/datapoolglob}/DataPoolAdmin.cpp (100%) rename {datapoolglob => archive/datapoolglob}/DataPoolAdmin.h (100%) rename {datapoolglob => archive/datapoolglob}/DataPoolParameterWrapper.cpp (100%) rename {datapoolglob => archive/datapoolglob}/DataPoolParameterWrapper.h (100%) rename {datapoolglob => archive/datapoolglob}/GlobalDataPool.cpp (100%) rename {datapoolglob => archive/datapoolglob}/GlobalDataPool.h (100%) rename {datapoolglob => archive/datapoolglob}/GlobalDataSet.cpp (100%) rename {datapoolglob => archive/datapoolglob}/GlobalDataSet.h (100%) rename {datapoolglob => archive/datapoolglob}/GlobalPoolVariable.h (100%) rename {datapoolglob => archive/datapoolglob}/GlobalPoolVariable.tpp (100%) rename {datapoolglob => archive/datapoolglob}/GlobalPoolVector.h (100%) rename {datapoolglob => archive/datapoolglob}/GlobalPoolVector.tpp (100%) rename {datapoolglob => archive/datapoolglob}/PIDReader.h (100%) rename {datapoolglob => archive/datapoolglob}/PIDReaderList.h (100%) rename {datapoolglob => archive/datapoolglob}/PoolRawAccess.cpp (100%) rename {datapoolglob => archive/datapoolglob}/PoolRawAccess.h (100%) diff --git a/datapoolglob/ControllerSet.cpp b/archive/datapoolglob/ControllerSet.cpp similarity index 100% rename from datapoolglob/ControllerSet.cpp rename to archive/datapoolglob/ControllerSet.cpp diff --git a/datapoolglob/ControllerSet.h b/archive/datapoolglob/ControllerSet.h similarity index 100% rename from datapoolglob/ControllerSet.h rename to archive/datapoolglob/ControllerSet.h diff --git a/datapoolglob/DataPoolAdmin.cpp b/archive/datapoolglob/DataPoolAdmin.cpp similarity index 100% rename from datapoolglob/DataPoolAdmin.cpp rename to archive/datapoolglob/DataPoolAdmin.cpp diff --git a/datapoolglob/DataPoolAdmin.h b/archive/datapoolglob/DataPoolAdmin.h similarity index 100% rename from datapoolglob/DataPoolAdmin.h rename to archive/datapoolglob/DataPoolAdmin.h diff --git a/datapoolglob/DataPoolParameterWrapper.cpp b/archive/datapoolglob/DataPoolParameterWrapper.cpp similarity index 100% rename from datapoolglob/DataPoolParameterWrapper.cpp rename to archive/datapoolglob/DataPoolParameterWrapper.cpp diff --git a/datapoolglob/DataPoolParameterWrapper.h b/archive/datapoolglob/DataPoolParameterWrapper.h similarity index 100% rename from datapoolglob/DataPoolParameterWrapper.h rename to archive/datapoolglob/DataPoolParameterWrapper.h diff --git a/datapoolglob/GlobalDataPool.cpp b/archive/datapoolglob/GlobalDataPool.cpp similarity index 100% rename from datapoolglob/GlobalDataPool.cpp rename to archive/datapoolglob/GlobalDataPool.cpp diff --git a/datapoolglob/GlobalDataPool.h b/archive/datapoolglob/GlobalDataPool.h similarity index 100% rename from datapoolglob/GlobalDataPool.h rename to archive/datapoolglob/GlobalDataPool.h diff --git a/datapoolglob/GlobalDataSet.cpp b/archive/datapoolglob/GlobalDataSet.cpp similarity index 100% rename from datapoolglob/GlobalDataSet.cpp rename to archive/datapoolglob/GlobalDataSet.cpp diff --git a/datapoolglob/GlobalDataSet.h b/archive/datapoolglob/GlobalDataSet.h similarity index 100% rename from datapoolglob/GlobalDataSet.h rename to archive/datapoolglob/GlobalDataSet.h diff --git a/datapoolglob/GlobalPoolVariable.h b/archive/datapoolglob/GlobalPoolVariable.h similarity index 100% rename from datapoolglob/GlobalPoolVariable.h rename to archive/datapoolglob/GlobalPoolVariable.h diff --git a/datapoolglob/GlobalPoolVariable.tpp b/archive/datapoolglob/GlobalPoolVariable.tpp similarity index 100% rename from datapoolglob/GlobalPoolVariable.tpp rename to archive/datapoolglob/GlobalPoolVariable.tpp diff --git a/datapoolglob/GlobalPoolVector.h b/archive/datapoolglob/GlobalPoolVector.h similarity index 100% rename from datapoolglob/GlobalPoolVector.h rename to archive/datapoolglob/GlobalPoolVector.h diff --git a/datapoolglob/GlobalPoolVector.tpp b/archive/datapoolglob/GlobalPoolVector.tpp similarity index 100% rename from datapoolglob/GlobalPoolVector.tpp rename to archive/datapoolglob/GlobalPoolVector.tpp diff --git a/datapoolglob/PIDReader.h b/archive/datapoolglob/PIDReader.h similarity index 100% rename from datapoolglob/PIDReader.h rename to archive/datapoolglob/PIDReader.h diff --git a/datapoolglob/PIDReaderList.h b/archive/datapoolglob/PIDReaderList.h similarity index 100% rename from datapoolglob/PIDReaderList.h rename to archive/datapoolglob/PIDReaderList.h diff --git a/datapoolglob/PoolRawAccess.cpp b/archive/datapoolglob/PoolRawAccess.cpp similarity index 100% rename from datapoolglob/PoolRawAccess.cpp rename to archive/datapoolglob/PoolRawAccess.cpp diff --git a/datapoolglob/PoolRawAccess.h b/archive/datapoolglob/PoolRawAccess.h similarity index 100% rename from datapoolglob/PoolRawAccess.h rename to archive/datapoolglob/PoolRawAccess.h diff --git a/devicehandlers/DeviceHandlerBase.cpp b/devicehandlers/DeviceHandlerBase.cpp index d14a8e36..4bb7ed56 100644 --- a/devicehandlers/DeviceHandlerBase.cpp +++ b/devicehandlers/DeviceHandlerBase.cpp @@ -3,8 +3,6 @@ #include "DeviceTmReportingWrapper.h" #include "../serviceinterface/ServiceInterfaceStream.h" -#include "../datapoolglob/GlobalDataSet.h" -#include "../datapoolglob/GlobalPoolVariable.h" #include "../objectmanager/ObjectManager.h" #include "../storagemanager/StorageManagerIF.h" #include "../thermal/ThermalComponentIF.h" @@ -1239,10 +1237,12 @@ void DeviceHandlerBase::handleDeviceTM(SerializeIF* data, } } //Try to cast to GlobDataSet and commit data. - if (!neverInDataPool) { - GlobDataSet* dataSet = dynamic_cast(data); - if (dataSet != NULL) { - dataSet->commit(PoolVariableIF::VALID); + if (not neverInDataPool) { + LocalPoolDataSetBase* dataSet = + dynamic_cast(data); + if (dataSet != nullptr) { + dataSet->setValidity(true, true); + dataSet->commit(); } } } diff --git a/internalError/InternalErrorReporter.cpp b/internalError/InternalErrorReporter.cpp index 22e2c38c..8d5c792b 100644 --- a/internalError/InternalErrorReporter.cpp +++ b/internalError/InternalErrorReporter.cpp @@ -1,8 +1,6 @@ #include "InternalErrorReporter.h" #include "../ipc/QueueFactory.h" -#include "../datapoolglob/GlobalDataSet.h" -#include "../datapoolglob/GlobalPoolVariable.h" #include "../ipc/MutexFactory.h" #include "../serviceinterface/ServiceInterfaceStream.h"