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

obsw configuration running on egse

Browse Source
This commit is contained in:
Jakob Meier 2022-02-05 15:39:16 +01:00
parent 19c97546b6
commit b4d1046928
6 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp_egse/InitMission.cpp
View File

@ -82,7 +82,7 @@ void initmission::initTasks() {
std::vector<PeriodicTaskIF*> pstTasks; std::vector<PeriodicTaskIF*> pstTasks;
FixedTimeslotTaskIF* pst = factory->createFixedTimeslotTask( FixedTimeslotTaskIF* pst = factory->createFixedTimeslotTask(
"STAR_TRACKER_PST", 70, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 3.0, missedDeadlineFunc); "STAR_TRACKER_PST", 70, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 0.5, missedDeadlineFunc);
result = pst::pstUart(pst); result = pst::pstUart(pst);
if (result != HasReturnvaluesIF::RETURN_OK) { if (result != HasReturnvaluesIF::RETURN_OK) {
sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl; sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl;

5
linux/devices/startracker/StarTrackerHandler.h
View File

@ -268,8 +268,11 @@ class StarTrackerHandler : public DeviceHandlerBase {
// Countdown to insert delay for star tracker to switch from bootloader to firmware program // Countdown to insert delay for star tracker to switch from bootloader to firmware program
Countdown bootCountdown; Countdown bootCountdown;
#ifdef EGSE
std::string paramJsonFile = "/mnt/sd0/startracker/full.json"; std::string paramJsonFile = "/mnt/sd0/startracker/full.json";
#else
std::string paramJsonFile = "/home/pi/arcsec/flight-config.json";
#endif
enum class InternalState { TEMPERATURE_REQUEST }; enum class InternalState { TEMPERATURE_REQUEST };

2
linux/devices/startracker/StrHelper.h
View File

@ -122,7 +122,7 @@ class StrHelper : public SystemObject, public ExecutableObjectIF, public HasRetu
* *
* @param path Path where file with read flash data will be created * @param path Path where file with read flash data will be created
* @param region Region ID of flash region to read from * @param region Region ID of flash region to read from
* @param address Start address of flash section to read * @param address Start address of flash section to read
* @param length Number of bytes to read from flash * @param length Number of bytes to read from flash
*/ */
ReturnValue_t startFlashRead(std::string path, uint8_t region, uint32_t address, uint32_t length); ReturnValue_t startFlashRead(std::string path, uint8_t region, uint32_t address, uint32_t length);

11
linux/fsfwconfig/OBSWConfig.h.in
View File

@ -58,6 +58,10 @@ debugging. */
#endif #endif
#if defined EGSE
#define OBSW_ADD_STAR_TRACKER 1
#endif
/*******************************************************************/ /*******************************************************************/
/** All of the following flags should be disabled for mission code */ /** All of the following flags should be disabled for mission code */
/*******************************************************************/ /*******************************************************************/
@ -92,11 +96,16 @@ debugging. */
#define OBSW_DEBUG_SUS 0 #define OBSW_DEBUG_SUS 0
#define OBSW_DEBUG_RTD 0 #define OBSW_DEBUG_RTD 0
#define OBSW_DEBUG_RW 0 #define OBSW_DEBUG_RW 0
#define OBSW_DEBUG_STARTRACKER 0
#define OBSW_DEBUG_PLOC_MPSOC 0 #define OBSW_DEBUG_PLOC_MPSOC 0
#define OBSW_DEBUG_PLOC_SUPERVISOR 0 #define OBSW_DEBUG_PLOC_SUPERVISOR 0
#define OBSW_DEBUG_PDEC_HANDLER 0 #define OBSW_DEBUG_PDEC_HANDLER 0
#if defined EGSE
#define OBSW_DEBUG_STARTRACKER 1
#else
#define OBSW_DEBUG_STARTRACKER 0
#endif
#ifdef RASPBERRY_PI #ifdef RASPBERRY_PI
#define OBSW_ENABLE_TIMERS 1 #define OBSW_ENABLE_TIMERS 1

4
linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
View File

@ -549,9 +549,11 @@ ReturnValue_t pst::pstUart(FixedTimeslotTaskIF *thisSequence) {
thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0.8, DeviceHandlerIF::GET_READ); thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0.8, DeviceHandlerIF::GET_READ);
#endif #endif
#ifdef XIPHOS_Q7S
thisSequence->addSlot(objects::PLOC_UPDATER, length * 0, DeviceHandlerIF::PERFORM_OPERATION); thisSequence->addSlot(objects::PLOC_UPDATER, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
thisSequence->addSlot(objects::PLOC_MEMORY_DUMPER, length * 0, thisSequence->addSlot(objects::PLOC_MEMORY_DUMPER, length * 0,
DeviceHandlerIF::PERFORM_OPERATION); DeviceHandlerIF::PERFORM_OPERATION);
#endif
#if OBSW_ADD_PLOC_SUPERVISOR == 1 #if OBSW_ADD_PLOC_SUPERVISOR == 1
thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0, thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0,
DeviceHandlerIF::PERFORM_OPERATION); DeviceHandlerIF::PERFORM_OPERATION);
@ -580,7 +582,7 @@ ReturnValue_t pst::pstUart(FixedTimeslotTaskIF *thisSequence) {
thisSequence->addSlot(objects::STAR_TRACKER, length * 0.6, DeviceHandlerIF::SEND_READ); thisSequence->addSlot(objects::STAR_TRACKER, length * 0.6, DeviceHandlerIF::SEND_READ);
thisSequence->addSlot(objects::STAR_TRACKER, length * 0.8, DeviceHandlerIF::GET_READ); thisSequence->addSlot(objects::STAR_TRACKER, length * 0.8, DeviceHandlerIF::GET_READ);
#endif #endif
static_cast<void>(length);
if (uartPstEmpty) { if (uartPstEmpty) {
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }

4
scripts/egse-port.sh
View File

@ -2,5 +2,5 @@
echo "-L 1534:localhost:1534 portforwarding for tcf agent" echo "-L 1534:localhost:1534 portforwarding for tcf agent"
echo "-L 1537:192.168.133.10:7301 for TMTC commanding using the TCP/IP IF" echo "-L 1537:192.168.133.10:7301 for TMTC commanding using the TCP/IP IF"
ssh -L 1534:localhost:1534 pi@192.168.18.31 ssh -L 1534:localhost:1534 \
ssh -L 1537:localhost:7301 pi@192.168.18.31 -L 1537:localhost:7301 pi@192.168.18.31