fsfw/fsfw-example-hosted
fsfw/fsfw-example-hosted
12
1
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

compiling fmt replacement

Browse Source
This commit is contained in:
Robin Müller 2022-05-09 00:10:01 +02:00
parent 100910d13c
commit aea14e10c3
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
6 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/codeStyles/Project.xml generated
View File

@ -6,7 +6,7 @@
<codeStyleSettings language="CMake"> <codeStyleSettings language="CMake">
<indentOptions> <indentOptions>
<option name="INDENT_SIZE" value="2" /> <option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="0" /> <option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" /> <option name="TAB_SIZE" value="2" />
</indentOptions> </indentOptions>
</codeStyleSettings> </codeStyleSettings>

9
bsp_hosted/core/InitMission.cpp
View File

@ -95,8 +95,7 @@ void InitMission::createTasks() {
result = pst::pollingSequenceExamples(timeslotDemoTask); result = pst::pollingSequenceExamples(timeslotDemoTask);
if (result != HasReturnvaluesIF::RETURN_OK) { if (result != HasReturnvaluesIF::RETURN_OK) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "InitMission::createTasks: Timeslot demo task initialization failed!" std::cerr << "InitMission::createTasks: Timeslot demo task initialization failed!" << std::endl;
<< std::endl;
#else #else
sif::printError("InitMission::createTasks: Timeslot demo task initialization failed!\n"); sif::printError("InitMission::createTasks: Timeslot demo task initialization failed!\n");
#endif #endif
@ -188,7 +187,7 @@ void InitMission::createTasks() {
result = pst::pollingSequenceDevices(testDevicesTimeslotTask); result = pst::pollingSequenceDevices(testDevicesTimeslotTask);
if (result != HasReturnvaluesIF::RETURN_OK) { if (result != HasReturnvaluesIF::RETURN_OK) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "InitMission::createTasks: Test PST initialization failed!" << std::endl; std::cerr << "InitMission::createTasks: Test PST initialization failed!" << std::endl;
#else #else
sif::printError("InitMission::createTasks: Test PST initialization failed!\n"); sif::printError("InitMission::createTasks: Test PST initialization failed!\n");
#endif #endif
@ -231,7 +230,7 @@ void InitMission::createTasks() {
} }
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::info << "Starting tasks.." << std::endl; std::cout << "Starting tasks.." << std::endl;
#else #else
sif::printInfo("Starting tasks..\n"); sif::printInfo("Starting tasks..\n");
#endif #endif
@ -267,7 +266,7 @@ void InitMission::createTasks() {
testTask->startTask(); testTask->startTask();
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::info << "Tasks started.." << std::endl; std::cout << "Tasks started.." << std::endl;
#else #else
sif::printInfo("Tasks started..\n"); sif::printInfo("Tasks started..\n");
#endif #endif

2
bsp_hosted/core/ObjectFactory.cpp
View File

@ -46,7 +46,7 @@ void ObjectFactory::produce(void* args) {
#if OBSW_USE_TCP_SERVER == 0 #if OBSW_USE_TCP_SERVER == 0
auto tmtcBridge = new UdpTmTcBridge(objects::TCPIP_TMTC_BRIDGE, objects::CCSDS_DISTRIBUTOR); auto tmtcBridge = new UdpTmTcBridge(objects::TCPIP_TMTC_BRIDGE, objects::CCSDS_DISTRIBUTOR);
tmtcBridge->setMaxNumberOfPacketsStored(50); tmtcBridge->setMaxNumberOfPacketsStored(50);
sif::info << "Opening UDP TMTC server on port " << tmtcBridge->getUdpPort() << std::endl; std::cout << "Opening UDP TMTC server on port " << tmtcBridge->getUdpPort() << std::endl;
new UdpTcPollingTask(objects::TCPIP_TMTC_POLLING_TASK, objects::TCPIP_TMTC_BRIDGE); new UdpTcPollingTask(objects::TCPIP_TMTC_POLLING_TASK, objects::TCPIP_TMTC_BRIDGE);
#else #else
auto tmtcBridge = new TcpTmTcBridge(objects::TCPIP_TMTC_BRIDGE, objects::CCSDS_DISTRIBUTOR); auto tmtcBridge = new TcpTmTcBridge(objects::TCPIP_TMTC_BRIDGE, objects::CCSDS_DISTRIBUTOR);

17
bsp_hosted/main.cpp
View File

@ -1,6 +1,5 @@
#include <bsp_hosted/core/InitMission.h> #include <bsp_hosted/core/InitMission.h>
#include <bsp_hosted/core/ObjectFactory.h> #include <bsp_hosted/core/ObjectFactory.h>
#include <fsfw/objectmanager/ObjectManager.h> #include <fsfw/objectmanager/ObjectManager.h>
#include <fsfw/platform.h> #include <fsfw/platform.h>
#include <fsfw/serviceinterface/ServiceInterface.h> #include <fsfw/serviceinterface/ServiceInterface.h>
@ -21,17 +20,17 @@ static const char* COMPILE_PRINTOUT = "unknown OS";
#endif #endif
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
ServiceInterfaceStream sif::debug("DEBUG", false); // ServiceInterfaceStream sif::debug("DEBUG", false);
ServiceInterfaceStream sif::info("INFO", false); // ServiceInterfaceStream sif::info("INFO", false);
ServiceInterfaceStream sif::warning("WARNING", false); // ServiceInterfaceStream sif::warning("WARNING", false);
ServiceInterfaceStream sif::error("ERROR", false, true, true); // ServiceInterfaceStream sif::error("ERROR", false, true, true);
#endif #endif
int main() { int main() {
utility::commonInitPrint("Hosted", COMPILE_PRINTOUT); utility::commonInitPrint("Hosted", COMPILE_PRINTOUT);
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::info << "Producing system objects.." << std::endl; std::cout << "Producing system objects.." << std::endl;
#else #else
sif::printInfo("Producing system objects..\n"); sif::printInfo("Producing system objects..\n");
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */ #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
@ -40,8 +39,8 @@ int main() {
objManager->setObjectFactoryFunction(ObjectFactory::produce, nullptr); objManager->setObjectFactoryFunction(ObjectFactory::produce, nullptr);
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::info << "Objects created successfully.." << std::endl; std::cout << "Objects created successfully.." << std::endl;
sif::info << "Initializing objects.." << std::endl; std::cout << "Initializing objects.." << std::endl;
#else #else
sif::printInfo("Objects created successfully..\n"); sif::printInfo("Objects created successfully..\n");
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */ #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
@ -49,7 +48,7 @@ int main() {
objManager->initialize(); objManager->initialize();
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::info << "Creating tasks.." << std::endl; std::cout << "Creating tasks.." << std::endl;
#else #else
sif::printInfo("Creating tasks..\n"); sif::printInfo("Creating tasks..\n");
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */ #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */

2
example_common

@ -1 +1 @@
Subproject commit ca501272d839a41c1f6a8d298941905fb99a0877 Subproject commit 6f2e03f0031fd54eb89ed0a12996400868ee7d7f

2
fsfw

@ -1 +1 @@
Subproject commit 1a07864a5faf0ceba707b3174172e133e083ff53 Subproject commit 83a2882f9d46df5bd480f3ac9e6f9d85dc7f4dcc