Merge remote-tracking branch 'origin/development' into mueller/cfdp-routers
This commit is contained in:
commit
4dadef34fd
@ -80,7 +80,7 @@ set(FSFW_CATCH2_LIB_MAJOR_VERSION
|
|||||||
3
|
3
|
||||||
CACHE STRING "Catch2 library major version requirement")
|
CACHE STRING "Catch2 library major version requirement")
|
||||||
set(FSFW_CATCH2_LIB_VERSION
|
set(FSFW_CATCH2_LIB_VERSION
|
||||||
v${FSFW_CATCH2_LIB_MAJOR_VERSION}.0.0-preview5
|
v${FSFW_CATCH2_LIB_MAJOR_VERSION}.1.0
|
||||||
CACHE STRING "Catch2 library exact version requirement")
|
CACHE STRING "Catch2 library exact version requirement")
|
||||||
|
|
||||||
# Keep this off by default for now. See PR:
|
# Keep this off by default for now. See PR:
|
||||||
|
@ -9,7 +9,7 @@ RUN apt-get --yes install gcc g++ cmake make lcov git valgrind nano iputils-ping
|
|||||||
|
|
||||||
RUN git clone https://github.com/catchorg/Catch2.git && \
|
RUN git clone https://github.com/catchorg/Catch2.git && \
|
||||||
cd Catch2 && \
|
cd Catch2 && \
|
||||||
git checkout v3.0.0-preview5 && \
|
git checkout v3.1.0 && \
|
||||||
cmake -Bbuild -H. -DBUILD_TESTING=OFF && \
|
cmake -Bbuild -H. -DBUILD_TESTING=OFF && \
|
||||||
cmake --build build/ --target install
|
cmake --build build/ --target install
|
||||||
|
|
||||||
|
@ -4,6 +4,10 @@
|
|||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|
||||||
|
// It is assumed the user has a subsystem and class ID list in some user header files.
|
||||||
|
// #include "events/subsystemIdRanges.h"
|
||||||
|
// #include "returnvalues/classIds.h"
|
||||||
|
|
||||||
//! Used to determine whether C++ ostreams are used which can increase
|
//! Used to determine whether C++ ostreams are used which can increase
|
||||||
//! the binary size significantly. If this is disabled,
|
//! the binary size significantly. If this is disabled,
|
||||||
//! the C stdio functions can be used alternatively
|
//! the C stdio functions can be used alternatively
|
||||||
|
@ -76,7 +76,7 @@ ReturnValue_t cfdp::Lv::deSerialize(const uint8_t** buffer, size_t* size,
|
|||||||
}
|
}
|
||||||
zeroLen = false;
|
zeroLen = false;
|
||||||
// Zero-copy implementation
|
// Zero-copy implementation
|
||||||
value.setConstBuffer(const_cast<uint8_t*>(*buffer + 1), lengthField);
|
value.setConstBuffer(*buffer + 1, lengthField);
|
||||||
*buffer += 1 + lengthField;
|
*buffer += 1 + lengthField;
|
||||||
*size -= 1 + lengthField;
|
*size -= 1 + lengthField;
|
||||||
return returnvalue::OK;
|
return returnvalue::OK;
|
||||||
|
@ -75,7 +75,7 @@ ReturnValue_t cfdp::Tlv::deSerialize(const uint8_t **buffer, size_t *size,
|
|||||||
}
|
}
|
||||||
zeroLen = false;
|
zeroLen = false;
|
||||||
// Zero-copy implementation
|
// Zero-copy implementation
|
||||||
value.setConstBuffer(const_cast<uint8_t *>(*buffer + 1), lengthField);
|
value.setConstBuffer(*buffer + 1, lengthField);
|
||||||
*buffer += 1 + lengthField;
|
*buffer += 1 + lengthField;
|
||||||
*size -= 1 + lengthField;
|
*size -= 1 + lengthField;
|
||||||
return returnvalue::OK;
|
return returnvalue::OK;
|
||||||
|
@ -243,13 +243,14 @@ class LocalDataPoolManager : public ProvidesDataPoolSubscriptionIF, public Acces
|
|||||||
LocalDataPoolManager* getPoolManagerHandle() override;
|
LocalDataPoolManager* getPoolManagerHandle() override;
|
||||||
ReturnValue_t subscribeForRegularPeriodicPacket(subdp::RegularHkPeriodicParams params) override;
|
ReturnValue_t subscribeForRegularPeriodicPacket(subdp::RegularHkPeriodicParams params) override;
|
||||||
ReturnValue_t subscribeForDiagPeriodicPacket(subdp::DiagnosticsHkPeriodicParams params) override;
|
ReturnValue_t subscribeForDiagPeriodicPacket(subdp::DiagnosticsHkPeriodicParams params) override;
|
||||||
ReturnValue_t subscribeForPeriodicPacket(subdp::ParamsBase& params);
|
|
||||||
|
|
||||||
ReturnValue_t subscribeForRegularUpdatePacket(subdp::RegularHkUpdateParams params) override;
|
ReturnValue_t subscribeForRegularUpdatePacket(subdp::RegularHkUpdateParams params) override;
|
||||||
ReturnValue_t subscribeForDiagUpdatePacket(subdp::DiagnosticsHkUpdateParams params) override;
|
ReturnValue_t subscribeForDiagUpdatePacket(subdp::DiagnosticsHkUpdateParams params) override;
|
||||||
ReturnValue_t subscribeForUpdatePacket(subdp::ParamsBase& params);
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
ReturnValue_t subscribeForPeriodicPacket(subdp::ParamsBase& params);
|
||||||
|
ReturnValue_t subscribeForUpdatePacket(subdp::ParamsBase& params);
|
||||||
|
|
||||||
/** Core data structure for the actual pool data */
|
/** Core data structure for the actual pool data */
|
||||||
localpool::DataPool localPoolMap;
|
localpool::DataPool localPoolMap;
|
||||||
/** Every housekeeping data manager has a mutex to protect access
|
/** Every housekeeping data manager has a mutex to protect access
|
||||||
|
@ -4,8 +4,6 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#include "fwSubsystemIdRanges.h"
|
#include "fwSubsystemIdRanges.h"
|
||||||
// could be moved to more suitable location
|
|
||||||
#include <events/subsystemIdRanges.h>
|
|
||||||
|
|
||||||
using EventId_t = uint16_t;
|
using EventId_t = uint16_t;
|
||||||
using EventSeverity_t = uint8_t;
|
using EventSeverity_t = uint8_t;
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
#ifndef FSFW_RETURNVALUES_RETURNVALUE_H_
|
#ifndef FSFW_RETURNVALUES_RETURNVALUE_H_
|
||||||
#define FSFW_RETURNVALUES_RETURNVALUE_H_
|
#define FSFW_RETURNVALUES_RETURNVALUE_H_
|
||||||
|
|
||||||
#include <returnvalues/classIds.h>
|
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|
||||||
#include "FwClassIds.h"
|
#include "FwClassIds.h"
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#include "fsfw/serviceinterface/ServiceInterfaceBuffer.h"
|
#include "ServiceInterfaceBuffer.h"
|
||||||
|
|
||||||
#if FSFW_CPP_OSTREAM_ENABLED == 1
|
#if FSFW_CPP_OSTREAM_ENABLED == 1
|
||||||
|
|
||||||
#include <inttypes.h>
|
#include <cinttypes>
|
||||||
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
||||||
@ -16,8 +16,6 @@
|
|||||||
// to be implemented by bsp
|
// to be implemented by bsp
|
||||||
extern "C" void printChar(const char*, bool errStream);
|
extern "C" void printChar(const char*, bool errStream);
|
||||||
|
|
||||||
#ifndef UT699
|
|
||||||
|
|
||||||
ServiceInterfaceBuffer::ServiceInterfaceBuffer(std::string setMessage, bool addCrToPreamble,
|
ServiceInterfaceBuffer::ServiceInterfaceBuffer(std::string setMessage, bool addCrToPreamble,
|
||||||
bool buffered, bool errStream, uint16_t port)
|
bool buffered, bool errStream, uint16_t port)
|
||||||
: isActive(true),
|
: isActive(true),
|
||||||
@ -58,6 +56,9 @@ ServiceInterfaceBuffer::ServiceInterfaceBuffer(std::string setMessage, bool addC
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ServiceInterfaceBuffer::putChars(char const* begin, char const* end) {
|
void ServiceInterfaceBuffer::putChars(char const* begin, char const* end) {
|
||||||
|
if (not isActive) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
char array[BUF_SIZE];
|
char array[BUF_SIZE];
|
||||||
uint32_t length = end - begin;
|
uint32_t length = end - begin;
|
||||||
if (length > sizeof(array)) {
|
if (length > sizeof(array)) {
|
||||||
@ -74,8 +75,6 @@ void ServiceInterfaceBuffer::putChars(char const* begin, char const* end) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int ServiceInterfaceBuffer::overflow(int c) {
|
int ServiceInterfaceBuffer::overflow(int c) {
|
||||||
if (not buffered and this->isActive) {
|
if (not buffered and this->isActive) {
|
||||||
if (c != Traits::eof()) {
|
if (c != Traits::eof()) {
|
||||||
@ -169,89 +168,4 @@ void ServiceInterfaceBuffer::setAsciiColorPrefix(std::string colorPrefix) {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef UT699
|
#endif
|
||||||
#include "../osal/rtems/Interrupt.h"
|
|
||||||
|
|
||||||
ServiceInterfaceBuffer::ServiceInterfaceBuffer(std::string set_message, uint16_t port) {
|
|
||||||
this->log_message = set_message;
|
|
||||||
this->isActive = true;
|
|
||||||
setp(buf, buf + BUF_SIZE);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ServiceInterfaceBuffer::putChars(char const* begin, char const* end) {
|
|
||||||
char array[BUF_SIZE];
|
|
||||||
uint32_t length = end - begin;
|
|
||||||
if (length > sizeof(array)) {
|
|
||||||
length = sizeof(array);
|
|
||||||
}
|
|
||||||
memcpy(array, begin, length);
|
|
||||||
|
|
||||||
if (!Interrupt::isInterruptInProgress()) {
|
|
||||||
std::cout << array;
|
|
||||||
} else {
|
|
||||||
// Uncomment the following line if you need ISR debug output.
|
|
||||||
// printk(array);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif // UT699
|
|
||||||
|
|
||||||
#ifdef ML505
|
|
||||||
#include <bsp_flp/network/networkconfig.h>
|
|
||||||
ServiceInterfaceBuffer::ServiceInterfaceBuffer(std::string set_message, uint16_t port)
|
|
||||||
: isActive(true),
|
|
||||||
log_message(set_message),
|
|
||||||
udpSocket(0),
|
|
||||||
remoteAddressLength(sizeof(remoteAddress)) {
|
|
||||||
setp(buf, buf + BUF_SIZE);
|
|
||||||
memset((uint8_t*)&remoteAddress, 0, sizeof(remoteAddress));
|
|
||||||
remoteAddress.sin_family = AF_INET;
|
|
||||||
remoteAddress.sin_port = htons(port);
|
|
||||||
remoteAddress.sin_addr.s_addr = htonl(inet_addr("192.168.250.100"));
|
|
||||||
}
|
|
||||||
|
|
||||||
void ServiceInterfaceBuffer::putChars(char const* begin, char const* end) {
|
|
||||||
char array[BUF_SIZE];
|
|
||||||
uint32_t length = end - begin;
|
|
||||||
if (length > sizeof(array)) {
|
|
||||||
length = sizeof(array);
|
|
||||||
}
|
|
||||||
memcpy(array, begin, length);
|
|
||||||
|
|
||||||
if (udpSocket <= 0) {
|
|
||||||
initSocket();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (udpSocket > 0) {
|
|
||||||
sendto(udpSocket, array, length, 0, (sockaddr*)&remoteAddress, sizeof(remoteAddress));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void ServiceInterfaceBuffer::initSocket() {
|
|
||||||
sockaddr_in address;
|
|
||||||
memset((uint8_t*)&address, 0, sizeof(address));
|
|
||||||
address.sin_family = AF_INET;
|
|
||||||
address.sin_port = htons(0);
|
|
||||||
address.sin_addr.s_addr = htonl(INADDR_ANY);
|
|
||||||
|
|
||||||
udpSocket = socket(PF_INET, SOCK_DGRAM, 0);
|
|
||||||
if (socket < 0) {
|
|
||||||
printf("Error opening socket!\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
timeval timeout = {0, 20};
|
|
||||||
if (setsockopt(udpSocket, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)) < 0) {
|
|
||||||
printf("Error setting SO_RCVTIMEO socket options!\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (setsockopt(udpSocket, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout)) < 0) {
|
|
||||||
printf("Error setting SO_SNDTIMEO socket options!\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (bind(udpSocket, (sockaddr*)&address, sizeof(address)) < 0) {
|
|
||||||
printf("Error binding socket!\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // ML505
|
|
||||||
|
|
||||||
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
|
|
||||||
|
@ -10,8 +10,6 @@
|
|||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
#ifndef UT699
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief This is the underlying stream buffer which implements the
|
* @brief This is the underlying stream buffer which implements the
|
||||||
* streambuf class and overloads the overflow() and sync() methods
|
* streambuf class and overloads the overflow() and sync() methods
|
||||||
@ -76,85 +74,6 @@ class ServiceInterfaceBuffer : public std::streambuf {
|
|||||||
bool crAdditionEnabled() const;
|
bool crAdditionEnabled() const;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef UT699
|
|
||||||
class ServiceInterfaceBuffer : public std::basic_streambuf<char, std::char_traits<char> > {
|
|
||||||
friend class ServiceInterfaceStream;
|
|
||||||
|
|
||||||
public:
|
|
||||||
ServiceInterfaceBuffer(std::string set_message, uint16_t port);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
bool isActive;
|
|
||||||
// This is called when buffer becomes full. If
|
|
||||||
// buffer is not used, then this is called every
|
|
||||||
// time when characters are put to stream.
|
|
||||||
virtual int overflow(int c = Traits::eof());
|
|
||||||
|
|
||||||
// This function is called when stream is flushed,
|
|
||||||
// for example when std::endl is put to stream.
|
|
||||||
virtual int sync(void);
|
|
||||||
|
|
||||||
private:
|
|
||||||
// For additional message information
|
|
||||||
std::string log_message;
|
|
||||||
// For EOF detection
|
|
||||||
typedef std::char_traits<char> Traits;
|
|
||||||
|
|
||||||
// Work in buffer mode. It is also possible to work without buffer.
|
|
||||||
static size_t const BUF_SIZE = 128;
|
|
||||||
char buf[BUF_SIZE];
|
|
||||||
|
|
||||||
// In this function, the characters are parsed.
|
|
||||||
void putChars(char const* begin, char const* end);
|
|
||||||
};
|
|
||||||
#endif // UT699
|
|
||||||
|
|
||||||
#ifdef ML505
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#include <netinet/udp.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
class ServiceInterfaceBuffer : public std::basic_streambuf<char, std::char_traits<char> > {
|
|
||||||
friend class ServiceInterfaceStream;
|
|
||||||
|
|
||||||
public:
|
|
||||||
ServiceInterfaceBuffer(std::string set_message, uint16_t port);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
bool isActive;
|
|
||||||
// This is called when buffer becomes full. If
|
|
||||||
// buffer is not used, then this is called every
|
|
||||||
// time when characters are put to stream.
|
|
||||||
virtual int overflow(int c = Traits::eof());
|
|
||||||
|
|
||||||
// This function is called when stream is flushed,
|
|
||||||
// for example when std::endl is put to stream.
|
|
||||||
virtual int sync(void);
|
|
||||||
|
|
||||||
private:
|
|
||||||
// For additional message information
|
|
||||||
std::string log_message;
|
|
||||||
// For EOF detection
|
|
||||||
typedef std::char_traits<char> Traits;
|
|
||||||
|
|
||||||
// Work in buffer mode. It is also possible to work without buffer.
|
|
||||||
static size_t const BUF_SIZE = 128;
|
|
||||||
char buf[BUF_SIZE];
|
|
||||||
|
|
||||||
// In this function, the characters are parsed.
|
|
||||||
void putChars(char const* begin, char const* end);
|
|
||||||
|
|
||||||
int udpSocket;
|
|
||||||
sockaddr_in remoteAddress;
|
|
||||||
socklen_t remoteAddressLength;
|
|
||||||
void initSocket();
|
|
||||||
};
|
|
||||||
#endif // ML505
|
|
||||||
|
|
||||||
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
|
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
|
||||||
|
|
||||||
#endif /* FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACEBUFFER_H_ */
|
#endif /* FRAMEWORK_SERVICEINTERFACE_SERVICEINTERFACEBUFFER_H_ */
|
||||||
|
@ -1 +1,3 @@
|
|||||||
add_subdirectory(gpio)
|
add_subdirectory(gpio)
|
||||||
|
|
||||||
|
target_sources(${LIB_FSFW_NAME} PRIVATE printChar.c)
|
10
src/fsfw_hal/common/printChar.c
Normal file
10
src/fsfw_hal/common/printChar.c
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
#include <stdio.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
void __attribute__((weak)) printChar(const char* character, bool errStream) {
|
||||||
|
if (errStream) {
|
||||||
|
fprintf(stderr, "%c", *character);
|
||||||
|
} else {
|
||||||
|
printf("%c", *character);
|
||||||
|
}
|
||||||
|
}
|
@ -2,7 +2,6 @@
|
|||||||
#define MISSION_DEVICES_MGMLIS3MDLHANDLER_H_
|
#define MISSION_DEVICES_MGMLIS3MDLHANDLER_H_
|
||||||
|
|
||||||
#include "devicedefinitions/MgmLIS3HandlerDefs.h"
|
#include "devicedefinitions/MgmLIS3HandlerDefs.h"
|
||||||
#include "events/subsystemIdRanges.h"
|
|
||||||
#include "fsfw/devicehandlers/DeviceHandlerBase.h"
|
#include "fsfw/devicehandlers/DeviceHandlerBase.h"
|
||||||
#include "fsfw/globalfunctions/PeriodicOperationDivider.h"
|
#include "fsfw/globalfunctions/PeriodicOperationDivider.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user