eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

some include fixes

Browse Source
This commit is contained in:
Robin Müller 2021-01-03 14:33:17 +01:00
parent 2edf158312
commit 695a767164
5 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
globalfunctions/arrayprinter.cpp
View File

@ -33,7 +33,7 @@ void arrayprinter::printHex(const uint8_t *data, size_t size,
sif::info << std::endl; sif::info << std::endl;
} }
}
} }
sif::info << std::dec; sif::info << std::dec;
sif::info << "]" << std::endl; sif::info << "]" << std::endl;

2
objectmanager/ObjectManager.cpp
View File

@ -29,7 +29,7 @@ ReturnValue_t ObjectManager::insert( object_id_t id, SystemObjectIF* object) {
} else { } else {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "ObjectManager::insert: Object id " << std::hex sif::error << "ObjectManager::insert: Object id " << std::hex
<< static_cast<uint32_t> id << std::dec << static_cast<uint32_t>(id) << std::dec
<< " is already in use!" << std::endl; << " is already in use!" << std::endl;
sif::error << "Terminating program." << std::endl; sif::error << "Terminating program." << std::endl;
#endif #endif

1
serviceinterface/ServiceInterfaceStream.h
View File

@ -2,6 +2,7 @@
#define FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACESTREAM_H_ #define FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACESTREAM_H_
#include "ServiceInterfaceBuffer.h" #include "ServiceInterfaceBuffer.h"
#include <FSFWConfig.h>
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1

2
storagemanager/ConstStorageAccessor.cpp
View File

@ -4,6 +4,8 @@
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"
#include "../globalfunctions/arrayprinter.h" #include "../globalfunctions/arrayprinter.h"
#include <algorithm>
ConstStorageAccessor::ConstStorageAccessor(store_address_t storeId): ConstStorageAccessor::ConstStorageAccessor(store_address_t storeId):
storeId(storeId) {} storeId(storeId) {}

2
storagemanager/StorageAccessor.cpp
View File

@ -2,6 +2,8 @@
#include "StorageManagerIF.h" #include "StorageManagerIF.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"
#include <algorithm>
StorageAccessor::StorageAccessor(store_address_t storeId): StorageAccessor::StorageAccessor(store_address_t storeId):
ConstStorageAccessor(storeId) { ConstStorageAccessor(storeId) {
} }