fsfw
/
fsfw_example_public
Archived
12
1
Fork 1
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'mueller/master' into mueller/bbb-guide

This commit is contained in:
Robin Müller 2021-05-01 18:45:37 +02:00
parent 85d9ff1c8c 2f73e80930
commit d8a377ec9a
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp_hosted/fsfwconfig/FSFWConfig.h
View File

@ -17,7 +17,7 @@
#define FSFW_DISABLE_PRINTOUT 0
#endif
#define FSFW_USE_PUS_C_TELEMETRY 0
#define FSFW_USE_PUS_C_TELEMETRY 1
//! Can be used to disable the ANSI color sequences for C stdio.
#define FSFW_COLORED_OUTPUT 1

2
cmake/BBBCrossCompileConfig.cmake
View File

@ -79,7 +79,7 @@ set(CMAKE_PREFIX_PATH
)
set(CMAKE_C_FLAGS
"-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp ${COMMON_FLAGS}"
"-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=hard ${COMMON_FLAGS}"
CACHE STRING "Flags for Beagle Bone Black"
)
set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}"

4
mission/utility/TmFunnel.cpp
View File

@ -1,7 +1,7 @@
#include <fsfw/ipc/QueueFactory.h>
#include <fsfw/tmtcpacket/pus/TmPacketStored.h>
#include <fsfw/serviceinterface/ServiceInterface.h>
#include <fsfw/tmtcpacket/pus/TmPacketBase.h>
#include <fsfw/tmtcpacket/pus/TmPacketPusC.h>
#include <mission/utility/TmFunnel.h>
object_id_t TmFunnel::downlinkDestination = objects::NO_OBJECT;
@ -50,7 +50,7 @@ ReturnValue_t TmFunnel::handlePacket(TmTcMessage* message) {
if(result != HasReturnvaluesIF::RETURN_OK){
return result;
}
TmPacketBase packet(packetData);
TmPacketPusC packet(packetData);
packet.setPacketSequenceCount(this->sourceSequenceCount);
sourceSequenceCount++;
sourceSequenceCount = sourceSequenceCount %

3
tmtc/config/hook_base.py
View File

@ -4,7 +4,6 @@ from typing import Dict, Union, Tuple
from tmtccmd.core.hook_base import TmTcHookBase
from tmtccmd.ecss.tc import PusTelecommand
from tmtccmd.pus_tm.service_3_base import Service3Base
from tmtccmd.ecss.conf import PusVersion
class FsfwHookBase(TmTcHookBase):
@ -20,7 +19,7 @@ class FsfwHookBase(TmTcHookBase):
def add_globals_pre_args_parsing(self, gui: bool = False):
from tmtccmd.defaults.globals_setup import set_default_globals_pre_args_parsing
set_default_globals_pre_args_parsing(gui=gui, apid=0xef, pus_tm_version=PusVersion.PUS_A)
set_default_globals_pre_args_parsing(gui=gui, apid=0xef)
def add_globals_post_args_parsing(self, args: argparse.Namespace, json_cfg_path: str = ""):
from tmtccmd.defaults.globals_setup import set_default_globals_post_args_parsing