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

mueller/master #37

Closed
muellerr wants to merge 126 commits from mueller/master into eive/develop
pull from: mueller/master
merge into: eive:eive/develop
Conversation 0 Commits 126 Files Changed 42 +7 -2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f5d0c06bd4 - Show all commits

5
src/fsfw/osal/common/TcpTmTcServer.cpp
View File

@ -51,7 +51,6 @@ ReturnValue_t TcpTmTcServer::initialize() {
#endif #endif
} }
} }
tcStore = ObjectManager::instance()->get<StorageManagerIF>(objects::TC_STORE); tcStore = ObjectManager::instance()->get<StorageManagerIF>(objects::TC_STORE);
if (tcStore == nullptr) { if (tcStore == nullptr) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
@ -178,7 +177,7 @@ void TcpTmTcServer::handleServerOperation(socket_t& connSocket) {
ringBuffer.writeData(receptionBuffer.data(), retval); ringBuffer.writeData(receptionBuffer.data(), retval);
} }
else if(retval < 0) { else if(retval < 0) {
int errorValue = GetLastError(); int errorValue = getLastSocketError();
#if defined PLATFORM_UNIX #if defined PLATFORM_UNIX
int wouldBlockValue = EAGAIN; int wouldBlockValue = EAGAIN;
#elif defined PLATFORM_WIN #elif defined PLATFORM_WIN
@ -388,6 +387,7 @@ void TcpTmTcServer::handleSocketError(ConstStorageAccessor &accessor) {
} }
} }
#if defined PLATFORM_WIN
void TcpTmTcServer::setSocketNonBlocking(socket_t &connSocket) { void TcpTmTcServer::setSocketNonBlocking(socket_t &connSocket) {
u_long iMode = 1; u_long iMode = 1;
int iResult = ioctlsocket(connSocket, FIONBIO, &iMode); int iResult = ioctlsocket(connSocket, FIONBIO, &iMode);
@ -403,3 +403,4 @@ void TcpTmTcServer::setSocketNonBlocking(socket_t &connSocket) {
#endif #endif
} }
} }
#endif

4
src/fsfw/tmtcpacket/SpacePacket.h
View File

@ -69,6 +69,8 @@ protected:
SpacePacketData localData; SpacePacketData localData;
}; };
namespace spacepacket {
constexpr uint16_t getTcSpacePacketIdFromApid(uint16_t apid) { constexpr uint16_t getTcSpacePacketIdFromApid(uint16_t apid) {
return (0x18 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff); return (0x18 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
} }
@ -77,4 +79,6 @@ constexpr uint16_t getTmSpacePacketIdFromApid(uint16_t apid) {
return (0x08 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff); return (0x08 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
} }
}
#endif /* SPACEPACKET_H_ */ #endif /* SPACEPACKET_H_ */