apply auto-formatter
fsfw/fsfw example hosted/pipeline/head This commit looks good Details

This commit is contained in:
Robin Müller 2022-05-05 20:55:48 +02:00
parent a9907fc7b3
commit d2337a769c
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
21 changed files with 513 additions and 532 deletions

View File

@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="fsfw-example-hosted" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="fsfw-example-hosted" TARGET_NAME="fsfw-example-hosted" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="fsfw-example-hosted" RUN_TARGET_NAME="fsfw-example-hosted">
<configuration default="false" name="fsfw-example-hosted" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="fsfw-example-hosted" TARGET_NAME="fsfw-example-hosted" CONFIG_NAME="Release" RUN_TARGET_PROJECT_NAME="fsfw-example-hosted" RUN_TARGET_NAME="fsfw-example-hosted">
<method v="2">
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
</method>

View File

@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 3.13)
# set(CMAKE_VERBOSE TRUE)
set(CMAKE_SCRIPT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
if(NOT FSFW_OSAL)
set(FSFW_OSAL host CACHE STRING "OS for the FSFW.")
@ -173,5 +173,5 @@ add_custom_command(
COMMENT ${POST_BUILD_COMMENT}
)
include (${CMAKE_SCRIPT_PATH}/BuildType.cmake)
include (BuildType)
set_build_type()

View File

@ -1,12 +1,7 @@
#include <OBSWConfig.h>
#include <bsp_hosted/core/InitMission.h>
#include <bsp_hosted/fsfwconfig/objects/systemObjectList.h>
#include <bsp_hosted/fsfwconfig/pollingsequence/pollingSequenceFactory.h>
#include "example/utility/TaskCreation.h"
#include "fsfw_tests/integration/assemblies/TestAssembly.h"
#include <fsfw/modes/HasModesIF.h>
#include <fsfw/returnvalues/HasReturnvaluesIF.h>
#include <fsfw/serviceinterface/ServiceInterface.h>
@ -14,15 +9,16 @@
#include <fsfw/tasks/PeriodicTaskIF.h>
#include <fsfw/tasks/TaskFactory.h>
#include "example/utility/TaskCreation.h"
#include "fsfw_tests/integration/assemblies/TestAssembly.h"
#ifdef _WIN32
#include <fsfw/osal/windows/winTaskHelpers.h>
#endif
void InitMission::createTasks() {
TaskFactory* taskFactory = TaskFactory::instance();
if(taskFactory == nullptr) {
if (taskFactory == nullptr) {
return;
}
@ -44,13 +40,12 @@ void InitMission::createTasks() {
/* TMTC Distribution */
PeriodicTaskIF* distributerTask = taskFactory->createPeriodicTask(
"DIST", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.1, deadlineMissedFunc);
ReturnValue_t result = distributerTask->addComponent(
objects::CCSDS_DISTRIBUTOR);
ReturnValue_t result = distributerTask->addComponent(objects::CCSDS_DISTRIBUTOR);
if (result != HasReturnvaluesIF::RETURN_OK) {
task::printInitError("CCSDS distributor", objects::CCSDS_DISTRIBUTOR);
}
result = distributerTask->addComponent(objects::PUS_DISTRIBUTOR);
if (result!=HasReturnvaluesIF::RETURN_OK) {
if (result != HasReturnvaluesIF::RETURN_OK) {
task::printInitError("PUS distributor", objects::PUS_DISTRIBUTOR);
}
result = distributerTask->addComponent(objects::TM_FUNNEL);
@ -63,11 +58,9 @@ void InitMission::createTasks() {
#endif
/* UDP bridge */
PeriodicTaskIF* udpBridgeTask = taskFactory->createPeriodicTask(
"TCPIP_TMTC_BRIDGE", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2,
deadlineMissedFunc
);
"TCPIP_TMTC_BRIDGE", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, deadlineMissedFunc);
result = udpBridgeTask->addComponent(objects::TCPIP_TMTC_BRIDGE);
if(result != HasReturnvaluesIF::RETURN_OK) {
if (result != HasReturnvaluesIF::RETURN_OK) {
task::printInitError("TMTC bridge", objects::TCPIP_TMTC_BRIDGE);
}
@ -75,10 +68,9 @@ void InitMission::createTasks() {
currPrio = 80;
#endif
PeriodicTaskIF* udpPollingTask = taskFactory->createPeriodicTask(
"TMTC_POLLING", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, deadlineMissedFunc
);
"TMTC_POLLING", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, deadlineMissedFunc);
result = udpPollingTask->addComponent(objects::TCPIP_TMTC_POLLING_TASK);
if(result != HasReturnvaluesIF::RETURN_OK) {
if (result != HasReturnvaluesIF::RETURN_OK) {
task::printInitError("TMTC polling", objects::TCPIP_TMTC_POLLING_TASK);
}
@ -86,10 +78,9 @@ void InitMission::createTasks() {
currPrio = 20;
#endif
PeriodicTaskIF* eventTask = taskFactory->createPeriodicTask(
"EVENT", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.100, deadlineMissedFunc
);
"EVENT", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.100, deadlineMissedFunc);
result = eventTask->addComponent(objects::EVENT_MANAGER);
if(result != HasReturnvaluesIF::RETURN_OK) {
if (result != HasReturnvaluesIF::RETURN_OK) {
task::printInitError("Event Manager", objects::EVENT_MANAGER);
}
#endif /* OBSW_ADD_CORE_COMPONENTS == 1 */
@ -102,10 +93,10 @@ void InitMission::createTasks() {
FixedTimeslotTaskIF* timeslotDemoTask = taskFactory->createFixedTimeslotTask(
"PST_TASK", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.5, deadlineMissedFunc);
result = pst::pollingSequenceExamples(timeslotDemoTask);
if(result != HasReturnvaluesIF::RETURN_OK) {
if (result != HasReturnvaluesIF::RETURN_OK) {
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "InitMission::createTasks: Timeslot demo task initialization failed!" <<
std::endl;
sif::error << "InitMission::createTasks: Timeslot demo task initialization failed!"
<< std::endl;
#else
sif::printError("InitMission::createTasks: Timeslot demo task initialization failed!\n");
#endif
@ -117,12 +108,11 @@ void InitMission::createTasks() {
PeriodicTaskIF* readerTask = taskFactory->createPeriodicTask(
"READER_TASK", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, deadlineMissedFunc);
result = readerTask->addComponent(objects::TEST_DUMMY_4);
if(result != HasReturnvaluesIF::RETURN_OK) {
if (result != HasReturnvaluesIF::RETURN_OK) {
task::printInitError("Dummy 4", objects::TEST_DUMMY_4);
}
#endif /* OBSW_ADD_TASK_EXAMPLE == 1 */
#if OBSW_ADD_PUS_STACK == 1
/* PUS Services */
#ifdef __unix__
@ -131,7 +121,7 @@ void InitMission::createTasks() {
PeriodicTaskIF* pusVerification = taskFactory->createPeriodicTask(
"PUS_VERIF_1", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.200, deadlineMissedFunc);
result = pusVerification->addComponent(objects::PUS_SERVICE_1_VERIFICATION);
if(result != HasReturnvaluesIF::RETURN_OK) {
if (result != HasReturnvaluesIF::RETURN_OK) {
task::printInitError("PUS 1", objects::PUS_SERVICE_1_VERIFICATION);
}
@ -145,8 +135,8 @@ void InitMission::createTasks() {
task::printInitError("PUS 2", objects::PUS_SERVICE_2_DEVICE_ACCESS);
}
result = pusHighPrio->addComponent(objects::PUS_SERVICE_5_EVENT_REPORTING);
if(result != HasReturnvaluesIF::RETURN_OK){
task::printInitError("PUS 5",objects::PUS_SERVICE_5_EVENT_REPORTING);
if (result != HasReturnvaluesIF::RETURN_OK) {
task::printInitError("PUS 5", objects::PUS_SERVICE_5_EVENT_REPORTING);
}
result = pusHighPrio->addComponent(objects::PUS_SERVICE_9_TIME_MGMT);
if (result != HasReturnvaluesIF::RETURN_OK) {
@ -181,7 +171,7 @@ void InitMission::createTasks() {
PeriodicTaskIF* pusLowPrio = taskFactory->createPeriodicTask(
"PUS_LOW_PRIO", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.2, deadlineMissedFunc);
result = pusLowPrio->addComponent(objects::PUS_SERVICE_17_TEST);
if(result!=HasReturnvaluesIF::RETURN_OK) {
if (result != HasReturnvaluesIF::RETURN_OK) {
task::printInitError("PUS 17", objects::PUS_SERVICE_17_TEST);
}
#endif /* OBSW_ADD_PUS_STACK == 1 */
@ -190,32 +180,31 @@ void InitMission::createTasks() {
#ifdef __unix__
currPrio = 60;
#elif _WIN32
currPrio = tasks::makeWinPriority(tasks::PriorityClass::CLASS_HIGH,
tasks::PriorityNumber::HIGHEST);
currPrio =
tasks::makeWinPriority(tasks::PriorityClass::CLASS_HIGH, tasks::PriorityNumber::HIGHEST);
#endif
FixedTimeslotTaskIF* testDevicesTimeslotTask = taskFactory->createFixedTimeslotTask(
"PST_TEST_TASK", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, deadlineMissedFunc);
result = pst::pollingSequenceDevices(testDevicesTimeslotTask);
if(result != HasReturnvaluesIF::RETURN_OK) {
if (result != HasReturnvaluesIF::RETURN_OK) {
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::error << "InitMission::createTasks: Test PST initialization failed!" << std::endl;
#else
sif::printError("InitMission::createTasks: Test PST initialization failed!\n");
#endif
}
#if _WIN32
currPrio = tasks::makeWinPriority();
#endif
PeriodicTaskIF* assemblyTask = taskFactory->createPeriodicTask("ASS_TASK", currPrio,
PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, nullptr);
if(assemblyTask == nullptr){
PeriodicTaskIF* assemblyTask = taskFactory->createPeriodicTask(
"ASS_TASK", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, nullptr);
if (assemblyTask == nullptr) {
task::printInitError("ASS_TASK", objects::TEST_ASSEMBLY);
}
result = assemblyTask->addComponent(objects::TEST_ASSEMBLY);
if(result != HasReturnvaluesIF::RETURN_OK) {
if (result != HasReturnvaluesIF::RETURN_OK) {
task::printInitError("ASS_TASK", objects::TEST_ASSEMBLY);
}
#endif /* OBSW_ADD_DEVICE_HANDLER_DEMO == 1 */
@ -227,7 +216,7 @@ void InitMission::createTasks() {
PeriodicTaskIF* controllerTask = taskFactory->createPeriodicTask(
"TEST_CTRL", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.8, deadlineMissedFunc);
result = controllerTask->addComponent(objects::TEST_CONTROLLER);
if(result != HasReturnvaluesIF::RETURN_OK) {
if (result != HasReturnvaluesIF::RETURN_OK) {
task::printInitError("Controller Task", objects::TEST_CONTROLLER);
}
#endif /* OBSW_ADD_CONTROLLER_DEMO == 1 */
@ -237,7 +226,7 @@ void InitMission::createTasks() {
PeriodicTaskIF* testTask = TaskFactory::instance()->createPeriodicTask(
"TEST_TASK", currPrio, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, deadlineMissedFunc);
result = testTask->addComponent(objects::TEST_TASK);
if(result != HasReturnvaluesIF::RETURN_OK) {
if (result != HasReturnvaluesIF::RETURN_OK) {
task::printInitError("Test Task", objects::TEST_TASK);
}
@ -285,10 +274,8 @@ void InitMission::createTasks() {
#if OBSW_ADD_DEVICE_HANDLER_DEMO
auto* assembly = ObjectManager::instance()->get<HasModesIF>(objects::TEST_ASSEMBLY);
if (assembly == nullptr){
if (assembly == nullptr) {
return;
}
#endif /* OBSW_ADD_DEVICE_HANDLER_DEMO */
}

View File

@ -1,26 +1,26 @@
#include "ObjectFactory.h"
#include "OBSWConfig.h"
#include <bsp_hosted/fsfwconfig/objects/systemObjectList.h>
#include <bsp_hosted/fsfwconfig/tmtc/apid.h>
#include <bsp_hosted/fsfwconfig/tmtc/pusIds.h>
#include "example/test/FsfwTestTask.h"
#include "example/utility/TmFunnel.h"
#include "example/core/GenericFactory.h"
#include <fsfw/datapoollocal/LocalDataPoolManager.h>
#include <fsfw/monitoring/MonitoringMessageContent.h>
#include <fsfw/storagemanager/PoolManager.h>
#include <fsfw/datapoollocal/LocalDataPoolManager.h>
#include <fsfw/tmtcpacket/pus/tm.h>
#include <fsfw/tmtcservices/CommandingServiceBase.h>
#include <fsfw/tmtcservices/PusServiceBase.h>
#include "OBSWConfig.h"
#include "example/core/GenericFactory.h"
#include "example/test/FsfwTestTask.h"
#include "example/utility/TmFunnel.h"
#if OBSW_USE_TCP_SERVER == 0
#include <fsfw/osal/common/UdpTcPollingTask.h>
#include <fsfw/osal/common/UdpTmTcBridge.h>
#else
#include "fsfw/osal/common/TcpTmTcServer.h"
#include "fsfw/osal/common/TcpTmTcBridge.h"
#include "fsfw/osal/common/TcpTmTcServer.h"
#endif
void ObjectFactory::produce(void* args) {
@ -28,23 +28,17 @@ void ObjectFactory::produce(void* args) {
#if OBSW_ADD_CORE_COMPONENTS == 1
{
LocalPool::LocalPoolConfig poolCfg = {
{16, 100}, {32, 50}, {64, 25}, {128,15}, {1024, 5}
};
LocalPool::LocalPoolConfig poolCfg = {{16, 100}, {32, 50}, {64, 25}, {128, 15}, {1024, 5}};
new PoolManager(objects::TC_STORE, poolCfg);
}
{
LocalPool::LocalPoolConfig poolCfg = {
{16, 100}, {32, 50}, {64, 25}, {128,15}, {1024, 5}
};
LocalPool::LocalPoolConfig poolCfg = {{16, 100}, {32, 50}, {64, 25}, {128, 15}, {1024, 5}};
new PoolManager(objects::TM_STORE, poolCfg);
}
{
LocalPool::LocalPoolConfig poolCfg = {
{16, 100}, {32, 50}, {64, 25}, {128,15}, {1024, 5}
};
LocalPool::LocalPoolConfig poolCfg = {{16, 100}, {32, 50}, {64, 25}, {128, 15}, {1024, 5}};
new PoolManager(objects::IPC_STORE, poolCfg);
}

View File

@ -6,7 +6,6 @@ namespace ObjectFactory {
void setStatics();
void produce(void* args);
};
}; // namespace ObjectFactory
#endif /* MISSION_CORE_OBJECTFACTORY_H_ */

View File

@ -4,8 +4,7 @@
#include "commonSubsystemIds.h"
namespace SUBSYSTEM_ID {
enum subsystemId: uint8_t {
};
enum subsystemId : uint8_t {};
}
#endif /* FSFWCONFIG_TMTC_SUBSYSTEMIDRANGES_H_ */

View File

@ -84,163 +84,163 @@ const char *CLOCK_SET_STRING = "CLOCK_SET";
const char *CLOCK_SET_FAILURE_STRING = "CLOCK_SET_FAILURE";
const char *TEST_STRING = "TEST";
const char * translateEvents(Event event) {
switch( (event & 0xffff) ) {
case(2200):
const char *translateEvents(Event event) {
switch ((event & 0xffff)) {
case (2200):
return STORE_SEND_WRITE_FAILED_STRING;
case(2201):
case (2201):
return STORE_WRITE_FAILED_STRING;
case(2202):
case (2202):
return STORE_SEND_READ_FAILED_STRING;
case(2203):
case (2203):
return STORE_READ_FAILED_STRING;
case(2204):
case (2204):
return UNEXPECTED_MSG_STRING;
case(2205):
case (2205):
return STORING_FAILED_STRING;
case(2206):
case (2206):
return TM_DUMP_FAILED_STRING;
case(2207):
case (2207):
return STORE_INIT_FAILED_STRING;
case(2208):
case (2208):
return STORE_INIT_EMPTY_STRING;
case(2209):
case (2209):
return STORE_CONTENT_CORRUPTED_STRING;
case(2210):
case (2210):
return STORE_INITIALIZE_STRING;
case(2211):
case (2211):
return INIT_DONE_STRING;
case(2212):
case (2212):
return DUMP_FINISHED_STRING;
case(2213):
case (2213):
return DELETION_FINISHED_STRING;
case(2214):
case (2214):
return DELETION_FAILED_STRING;
case(2215):
case (2215):
return AUTO_CATALOGS_SENDING_FAILED_STRING;
case(2600):
case (2600):
return GET_DATA_FAILED_STRING;
case(2601):
case (2601):
return STORE_DATA_FAILED_STRING;
case(2800):
case (2800):
return DEVICE_BUILDING_COMMAND_FAILED_STRING;
case(2801):
case (2801):
return DEVICE_SENDING_COMMAND_FAILED_STRING;
case(2802):
case (2802):
return DEVICE_REQUESTING_REPLY_FAILED_STRING;
case(2803):
case (2803):
return DEVICE_READING_REPLY_FAILED_STRING;
case(2804):
case (2804):
return DEVICE_INTERPRETING_REPLY_FAILED_STRING;
case(2805):
case (2805):
return DEVICE_MISSED_REPLY_STRING;
case(2806):
case (2806):
return DEVICE_UNKNOWN_REPLY_STRING;
case(2807):
case (2807):
return DEVICE_UNREQUESTED_REPLY_STRING;
case(2808):
case (2808):
return INVALID_DEVICE_COMMAND_STRING;
case(2809):
case (2809):
return MONITORING_LIMIT_EXCEEDED_STRING;
case(2810):
case (2810):
return MONITORING_AMBIGUOUS_STRING;
case(4201):
case (4201):
return FUSE_CURRENT_HIGH_STRING;
case(4202):
case (4202):
return FUSE_WENT_OFF_STRING;
case(4204):
case (4204):
return POWER_ABOVE_HIGH_LIMIT_STRING;
case(4205):
case (4205):
return POWER_BELOW_LOW_LIMIT_STRING;
case(4300):
case (4300):
return SWITCH_WENT_OFF_STRING;
case(5000):
case (5000):
return HEATER_ON_STRING;
case(5001):
case (5001):
return HEATER_OFF_STRING;
case(5002):
case (5002):
return HEATER_TIMEOUT_STRING;
case(5003):
case (5003):
return HEATER_STAYED_ON_STRING;
case(5004):
case (5004):
return HEATER_STAYED_OFF_STRING;
case(5200):
case (5200):
return TEMP_SENSOR_HIGH_STRING;
case(5201):
case (5201):
return TEMP_SENSOR_LOW_STRING;
case(5202):
case (5202):
return TEMP_SENSOR_GRADIENT_STRING;
case(5901):
case (5901):
return COMPONENT_TEMP_LOW_STRING;
case(5902):
case (5902):
return COMPONENT_TEMP_HIGH_STRING;
case(5903):
case (5903):
return COMPONENT_TEMP_OOL_LOW_STRING;
case(5904):
case (5904):
return COMPONENT_TEMP_OOL_HIGH_STRING;
case(5905):
case (5905):
return TEMP_NOT_IN_OP_RANGE_STRING;
case(7101):
case (7101):
return FDIR_CHANGED_STATE_STRING;
case(7102):
case (7102):
return FDIR_STARTS_RECOVERY_STRING;
case(7103):
case (7103):
return FDIR_TURNS_OFF_DEVICE_STRING;
case(7201):
case (7201):
return MONITOR_CHANGED_STATE_STRING;
case(7202):
case (7202):
return VALUE_BELOW_LOW_LIMIT_STRING;
case(7203):
case (7203):
return VALUE_ABOVE_HIGH_LIMIT_STRING;
case(7204):
case (7204):
return VALUE_OUT_OF_RANGE_STRING;
case(7301):
case (7301):
return SWITCHING_TM_FAILED_STRING;
case(7400):
case (7400):
return CHANGING_MODE_STRING;
case(7401):
case (7401):
return MODE_INFO_STRING;
case(7402):
case (7402):
return FALLBACK_FAILED_STRING;
case(7403):
case (7403):
return MODE_TRANSITION_FAILED_STRING;
case(7404):
case (7404):
return CANT_KEEP_MODE_STRING;
case(7405):
case (7405):
return OBJECT_IN_INVALID_MODE_STRING;
case(7406):
case (7406):
return FORCING_MODE_STRING;
case(7407):
case (7407):
return MODE_CMD_REJECTED_STRING;
case(7506):
case (7506):
return HEALTH_INFO_STRING;
case(7507):
case (7507):
return CHILD_CHANGED_HEALTH_STRING;
case(7508):
case (7508):
return CHILD_PROBLEMS_STRING;
case(7509):
case (7509):
return OVERWRITING_HEALTH_STRING;
case(7510):
case (7510):
return TRYING_RECOVERY_STRING;
case(7511):
case (7511):
return RECOVERY_STEP_STRING;
case(7512):
case (7512):
return RECOVERY_DONE_STRING;
case(7900):
case (7900):
return RF_AVAILABLE_STRING;
case(7901):
case (7901):
return RF_LOST_STRING;
case(7902):
case (7902):
return BIT_LOCK_STRING;
case(7903):
case (7903):
return BIT_LOCK_LOST_STRING;
case(7905):
case (7905):
return FRAME_PROCESSING_FAILED_STRING;
case(8900):
case (8900):
return CLOCK_SET_STRING;
case(8901):
case (8901):
return CLOCK_SET_FAILURE_STRING;
case(9700):
case (9700):
return TEST_STRING;
default:
return "UNKNOWN_EVENT";

View File

@ -3,6 +3,6 @@
#include <fsfw/events/Event.h>
const char * translateEvents(Event event);
const char* translateEvents(Event event);
#endif /* FSFWCONFIG_EVENTS_TRANSLATEEVENTS_H_ */

View File

@ -1,9 +1,10 @@
#include "missionMessageTypes.h"
#include <fsfw/ipc/CommandMessage.h>
#include <fsfw/ipc/CommandMessageCleaner.h>
void messagetypes::clearMissionMessage(CommandMessage* message) {
switch((message->getMessageType())) {
switch ((message->getMessageType())) {
default:
message->setCommand(CommandMessage::CMD_NONE);
break;

View File

@ -14,6 +14,6 @@ enum MISSION_MESSAGE_TYPE {
void clearMissionMessage(CommandMessage* message);
}
} // namespace messagetypes
#endif /* FSFWCONFIG_IPC_MISSIONMESSAGETYPES_H_ */

View File

@ -44,8 +44,8 @@ const char *TEST_DUMMY_5_STRING = "TEST_DUMMY_5";
const char *TEST_TASK_STRING = "TEST_TASK";
const char *NO_OBJECT_STRING = "NO_OBJECT";
const char* translateObject(object_id_t object) {
switch( (object & 0xFFFFFFFF) ) {
const char *translateObject(object_id_t object) {
switch ((object & 0xFFFFFFFF)) {
case 0x4100CAFE:
return TEST_ASSEMBLY_STRING;
case 0x4301CAFE:

View File

@ -2,4 +2,3 @@
* Add polling sequence initialization which are not common to every BSP here.
*/
#include "pollingSequenceFactory.h"

View File

@ -1,14 +1,15 @@
#ifndef POLLINGSEQUENCE_POLLINGSEQUENCFACTORY_H_
#define POLLINGSEQUENCE_POLLINGSEQUENCFACTORY_H_
#include "OBSWConfig.h"
#include <fsfw/returnvalues/HasReturnvaluesIF.h>
#include "OBSWConfig.h"
class FixedTimeslotTaskIF;
namespace pst {
ReturnValue_t pollingSequenceExamples(FixedTimeslotTaskIF *thisSequence);
ReturnValue_t pollingSequenceExamples(FixedTimeslotTaskIF* thisSequence);
ReturnValue_t pollingSequenceDevices(FixedTimeslotTaskIF* thisSequence);
}
} // namespace pst
#endif /* POLLINGSEQUENCE_POLLINGSEQUENCFACTORY_H_ */

View File

@ -4,11 +4,10 @@
#include "commonClassIds.h"
namespace CLASS_ID {
enum classIds: uint8_t {
enum classIds : uint8_t {
CLASS_ID_START = COMMON_CLASS_ID_END,
CLASS_ID_END // [EXPORT] : [END]
};
}
#endif /* FSFWCONFIG_RETURNVALUES_CLASSIDS_H_ */

View File

@ -1,9 +1,10 @@
#ifndef FSFWCONFIG_TMTC_APID_H_
#define FSFWCONFIG_TMTC_APID_H_
#include <cstdint>
#include <commonConfig.h>
#include <cstdint>
namespace apid {
static const uint16_t APID = COMMON_APID;
};

View File

@ -3,5 +3,4 @@
#include <commonConfig.h>
#endif /* FSFWCONFIG_TMTC_PUSIDS_H_ */

View File

@ -1,16 +1,15 @@
#include <bsp_hosted/core/InitMission.h>
#include <bsp_hosted/core/ObjectFactory.h>
#include "example/test/MutexExample.h"
#include "example/utility/utility.h"
#include <fsfw/platform.h>
#include <fsfw/objectmanager/ObjectManager.h>
#include <fsfw/platform.h>
#include <fsfw/serviceinterface/ServiceInterface.h>
#include <fsfw/tasks/TaskFactory.h>
#include <chrono>
#include "example/test/MutexExample.h"
#include "example/utility/utility.h"
#ifdef PLATFORM_WIN
static const char* COMPILE_PRINTOUT = "Windows";
#elif defined(PLATFORM_UNIX)
@ -27,7 +26,6 @@ ServiceInterfaceStream sif::error("ERROR", false, true, true);
#endif
int main() {
utility::commonInitPrint("Hosted", COMPILE_PRINTOUT);
#if FSFW_CPP_OSTREAM_ENABLED == 1
@ -57,10 +55,10 @@ int main() {
InitMission::createTasks();
MutexExample::example();
//PusPacketCreator::createPusPacketAndPrint();
// PusPacketCreator::createPusPacketAndPrint();
/* Permanent loop. */
for(;;) {
for (;;) {
/* Sleep main thread, not needed anymore. */
TaskFactory::delayTask(5000);
}

View File

@ -1,13 +1,10 @@
#include <stdio.h>
#include <stdbool.h>
#include <stdio.h>
void printChar(const char* character, bool errStream) {
if(errStream) {
if (errStream) {
fprintf(stderr, "%c", *character);
}
else {
} else {
printf("%c", *character);
}
}

@ -1 +1 @@
Subproject commit c2a9db8ac8f7d8a153673a1c4d74a8d56922b56b
Subproject commit c88a534e1c48387c6de584a4c9b0b75a81f9eeba

7
scripts/apply-clang-format.sh Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
if [[ ! -f README.md ]]; then
cd ..
fi
find ./bsp_hosted -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i
find ./example_common -iname *.h -o -iname *.cpp -o -iname *.c | xargs clang-format --style=file -i