From b4561465ba273718f03b8f32e73eb4d5ffcb7610 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Sat, 6 Jun 2020 01:36:07 +0200 Subject: [PATCH] some little form improvements --- devicehandlers/DeviceHandlerBase.h | 4 ++-- framework.mk | 4 ++-- housekeeping/HasHkPoolParametersIF.h | 1 - housekeeping/HousekeepingMessage.h | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devicehandlers/DeviceHandlerBase.h b/devicehandlers/DeviceHandlerBase.h index 47cf0284..9b2bcdf4 100644 --- a/devicehandlers/DeviceHandlerBase.h +++ b/devicehandlers/DeviceHandlerBase.h @@ -1,5 +1,5 @@ -#ifndef DEVICEHANDLERS_DEVICEHANDLERBASE_H_ -#define DEVICEHANDLERS_DEVICEHANDLERBASE_H_ +#ifndef FRAMEWORK_DEVICEHANDLERS_DEVICEHANDLERBASE_H_ +#define FRAMEWORK_DEVICEHANDLERS_DEVICEHANDLERBASE_H_ #include #include diff --git a/framework.mk b/framework.mk index 404055ee..c8822981 100644 --- a/framework.mk +++ b/framework.mk @@ -1,5 +1,5 @@ -# This file needs FRAMEWORK_PATH and API set correctly -# Valid API settings: rtems, linux, freeRTOS +# This file needs FRAMEWORK_PATH and OS_FSFW set correctly by another Makefile. +# Valid API settings: rtems, linux, freeRTOS, host CXXSRC += $(wildcard $(FRAMEWORK_PATH)/action/*.cpp) CXXSRC += $(wildcard $(FRAMEWORK_PATH)/container/*.cpp) diff --git a/housekeeping/HasHkPoolParametersIF.h b/housekeeping/HasHkPoolParametersIF.h index 62715a3d..9efc6d16 100644 --- a/housekeeping/HasHkPoolParametersIF.h +++ b/housekeeping/HasHkPoolParametersIF.h @@ -40,7 +40,6 @@ public: virtual MessageQueueId_t getCommandQueue() const = 0; virtual ReturnValue_t initializeHousekeepingPoolEntries( LocalDataPoolMap& localDataPoolMap) = 0; - //virtual float setMinimalHkSamplingFrequency() = 0; virtual HousekeepingManager* getHkManagerHandle() = 0; virtual DataSetIF* getDataSetHandle(sid_t sid) = 0; }; diff --git a/housekeeping/HousekeepingMessage.h b/housekeeping/HousekeepingMessage.h index e7ba68ba..61e6e199 100644 --- a/housekeeping/HousekeepingMessage.h +++ b/housekeeping/HousekeepingMessage.h @@ -19,6 +19,7 @@ union sid_t { */ uint64_t raw; }; + class HousekeepingMessage { public: /**