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

buf renamed to streambuf

Browse Source
This commit is contained in:
Robin Müller 2020-06-04 13:26:35 +02:00
parent 9361568b45
commit 764608005b
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osal/FreeRTOS/MessageQueue.cpp
View File

@ -97,7 +97,8 @@ ReturnValue_t MessageQueue::sendMessageFromMessageQueue(MessageQueueId_t sendTo,
bool ignoreFault) { bool ignoreFault) {
message->setSender(sentFrom); message->setSender(sentFrom);
BaseType_t result = xQueueSendToBack(reinterpret_cast<void*>(sendTo),reinterpret_cast<const void*>(message->getBuffer()), 0); BaseType_t result = xQueueSendToBack(reinterpret_cast<QueueHandle_t>(sendTo),
reinterpret_cast<const void*>(message->getBuffer()), 0);
if (result != pdPASS) { if (result != pdPASS) {
if (!ignoreFault) { if (!ignoreFault) {
InternalErrorReporterIF* internalErrorReporter = objectManager->get<InternalErrorReporterIF>( InternalErrorReporterIF* internalErrorReporter = objectManager->get<InternalErrorReporterIF>(

8
serviceinterface/ServiceInterfaceStream.cpp
View File

@ -2,14 +2,14 @@
ServiceInterfaceStream::ServiceInterfaceStream(std::string setMessage, ServiceInterfaceStream::ServiceInterfaceStream(std::string setMessage,
bool errStream, bool addCrToPreamble, uint16_t port) : bool errStream, bool addCrToPreamble, uint16_t port) :
std::ostream(&buf), std::ostream(&streambuf),
buf(setMessage, errStream, addCrToPreamble, port) { streambuf(setMessage, errStream, addCrToPreamble, port) {
} }
void ServiceInterfaceStream::setActive( bool myActive) { void ServiceInterfaceStream::setActive( bool myActive) {
this->buf.isActive = myActive; this->streambuf.isActive = myActive;
} }
std::string ServiceInterfaceStream::getPreamble() { std::string ServiceInterfaceStream::getPreamble() {
return buf.getPreamble(); return streambuf.getPreamble();
} }

2
serviceinterface/ServiceInterfaceStream.h
View File

@ -21,7 +21,7 @@ extern std::ostream error;
class ServiceInterfaceStream : class ServiceInterfaceStream :
public std::ostream { public std::ostream {
protected: protected:
ServiceInterfaceBuffer buf; ServiceInterfaceBuffer streambuf;
public: public:
/** /**
* This constructor is used by specifying the preamble message. * This constructor is used by specifying the preamble message.