eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

windows build working

Browse Source
This commit is contained in:
Robin Müller 2020-09-30 21:17:16 +02:00
parent da79e0ec07
commit e09027f601
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile-Hosted
View File

@ -183,7 +183,6 @@ ifeq ($(DETECTED_OS), LINUX)
CXXSRC += $(FRAMEWORK_PATH)/osal/linux/TcUnixUdpPollingTask.cpp CXXSRC += $(FRAMEWORK_PATH)/osal/linux/TcUnixUdpPollingTask.cpp
CXXSRC += $(FRAMEWORK_PATH)/osal/linux/TmTcUnixUdpBridge.cpp CXXSRC += $(FRAMEWORK_PATH)/osal/linux/TmTcUnixUdpBridge.cpp
endif endif
# CXXSRC += Service17Test.cpp
# All C Sources included by .mk files are assigned here # All C Sources included by .mk files are assigned here
# Add the objects to sources so dependency handling works # Add the objects to sources so dependency handling works
@ -255,7 +254,7 @@ CXXDEFINES := $(CUSTOM_DEFINES)
CFLAGS += CFLAGS +=
CXXFLAGS += -I. $(DEBUG_LEVEL) $(WARNIING_FLAGS) $(I_INCLUDES) $(DEPFLAGS) \ CXXFLAGS += -I. $(DEBUG_LEVEL) $(WARNIING_FLAGS) $(I_INCLUDES) $(DEPFLAGS) \
-fmessage-length=0 $(CXXDEFINES) $(OPTIMIZATION) -fmessage-length=0 $(CXXDEFINES) $(OPTIMIZATION)
CPPFLAGS += -std=c++17 -fno-exceptions CPPFLAGS += -std=c++2a -fno-exceptions
ASFLAGS = -Wall -g $(OPTIMIZATION) $(I_INCLUDES) -D__ASSEMBLY__ ASFLAGS = -Wall -g $(OPTIMIZATION) $(I_INCLUDES) -D__ASSEMBLY__
# Flags for the linker call # Flags for the linker call

15
hosted/main.cpp
View File

@ -2,12 +2,15 @@
#include <fsfw/tasks/TaskFactory.h> #include <fsfw/tasks/TaskFactory.h>
#include <iostream> #include <iostream>
#include <stdio.h>
#include <version.h> #include <version.h>
#include <unistd.h>
#ifdef WIN32
static const char* COMPILE_PRINTOUT = "Windows";
#elif LINUX
static const char* COMPILE_PRINTOUT = "Linux";
#else
static const char* COMPILE_PRINTOUT = "unknown OS";
#endif
/** /**
* @brief This is the main program for the hosted build. It can be run for * @brief This is the main program for the hosted build. It can be run for
* Linux and Windows. * Linux and Windows.
@ -16,13 +19,13 @@
int main(void) int main(void)
{ {
std::cout << "-- EIVE OBSW --" << std::endl; std::cout << "-- EIVE OBSW --" << std::endl;
std::cout << "-- Compiled for Linux " << " --" << std::endl; std::cout << "-- Compiled for " << COMPILE_PRINTOUT << " --" << std::endl;
std::cout << "-- Software version v" << SW_VERSION << "." << SW_SUBVERSION std::cout << "-- Software version v" << SW_VERSION << "." << SW_SUBVERSION
<< " -- " << std::endl; << " -- " << std::endl;
std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl; std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;
InitMission::initMission(); InitMission::initMission();
std::cout << std::endl;
for(;;) { for(;;) {
// suspend main thread by sleeping it. // suspend main thread by sleeping it.
TaskFactory::delayTask(5000); TaskFactory::delayTask(5000);