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

Merge branch 'develop' into meier/plocSupvUpdate

Browse Source
This commit is contained in:
Jakob Meier 2022-04-21 17:34:26 +02:00
commit a8f5a4054f
8 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp_q7s/core/CoreController.cpp
View File

@ -8,7 +8,7 @@
#include "fsfw/serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#include "fsfw/timemanager/Stopwatch.h" #include "fsfw/timemanager/Stopwatch.h"
#include "fsfw/version.h" #include "fsfw/version.h"
#include "watchdogConf.h" #include "watchdog/definitions.h"
#if OBSW_USE_TMTC_TCP_BRIDGE == 0 #if OBSW_USE_TMTC_TCP_BRIDGE == 0
#include "fsfw/osal/common/UdpTmTcBridge.h" #include "fsfw/osal/common/UdpTmTcBridge.h"
#else #else

2
bsp_q7s/core/obsw.cpp
View File

@ -8,7 +8,7 @@
#include "OBSWVersion.h" #include "OBSWVersion.h"
#include "fsfw/tasks/TaskFactory.h" #include "fsfw/tasks/TaskFactory.h"
#include "fsfw/version.h" #include "fsfw/version.h"
#include "watchdogConf.h" #include "watchdog/definitions.h"
static int OBSW_ALREADY_RUNNING = -2; static int OBSW_ALREADY_RUNNING = -2;

4
mission/devices/IMTQHandler.cpp
View File

@ -10,7 +10,6 @@
IMTQHandler::IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie, IMTQHandler::IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
power::Switch_t pwrSwitcher) power::Switch_t pwrSwitcher)
: DeviceHandlerBase(objectId, comIF, comCookie), : DeviceHandlerBase(objectId, comIF, comCookie),
switcher(pwrSwitcher),
engHkDataset(this), engHkDataset(this),
calMtmMeasurementSet(this), calMtmMeasurementSet(this),
rawMtmMeasurementSet(this), rawMtmMeasurementSet(this),
@ -19,7 +18,8 @@ IMTQHandler::IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF* comC
posYselfTestDataset(this), posYselfTestDataset(this),
negYselfTestDataset(this), negYselfTestDataset(this),
posZselfTestDataset(this), posZselfTestDataset(this),
negZselfTestDataset(this) { negZselfTestDataset(this),
switcher(pwrSwitcher) {
if (comCookie == NULL) { if (comCookie == NULL) {
sif::error << "IMTQHandler: Invalid com cookie" << std::endl; sif::error << "IMTQHandler: Invalid com cookie" << std::endl;
} }

14
mission/devices/PCDUHandler.cpp
View File

@ -81,12 +81,16 @@ ReturnValue_t PCDUHandler::initialize() {
void PCDUHandler::initializeSwitchStates() { void PCDUHandler::initializeSwitchStates() {
using namespace pcdu; using namespace pcdu;
for (uint8_t idx = 0; idx < NUMBER_OF_SWITCHES; idx++) { try {
if (idx < PDU::CHANNELS_LEN) { for (uint8_t idx = 0; idx < NUMBER_OF_SWITCHES; idx++) {
switchStates[idx] = INIT_SWITCHES_PDU1[idx]; if (idx < PDU::CHANNELS_LEN) {
} else { switchStates[idx] = INIT_SWITCHES_PDU1.at(idx);
switchStates[idx] = INIT_SWITCHES_PDU2[idx]; } else {
switchStates[idx] = INIT_SWITCHES_PDU2.at(idx - PDU::CHANNELS_LEN);
}
} }
} catch (const std::out_of_range& err) {
sif::error << "PCDUHandler::initializeSwitchStates: " << err.what() << std::endl;
} }
} }

2
scripts/q7s-cp.py
View File

@ -92,7 +92,7 @@ def build_cmd(args):
else: else:
target = args.target target = args.target
if args.invert: if args.invert:
cmd += f"{port_args} {address}:{args.source} {target}" cmd += f"{port_args} {address}:{source_files} {target}"
else: else:
cmd += f"{port_args} {source_files} {address}:{target}" cmd += f"{port_args} {source_files} {address}:{target}"
return cmd return cmd

2
watchdog/Watchdog.cpp
View File

@ -1,5 +1,5 @@
#include "Watchdog.h" #include "Watchdog.h"
#include "watchdogConf.h" #include "definitions.h"
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>

2
watchdog/definitions.h
View File

@ -1,6 +1,8 @@
#ifndef WATCHDOG_DEFINITIONS_H_ #ifndef WATCHDOG_DEFINITIONS_H_
#define WATCHDOG_DEFINITIONS_H_ #define WATCHDOG_DEFINITIONS_H_
#include <watchdogConf.h>
namespace watchdog { namespace watchdog {
// Suspend watchdog operations temporarily // Suspend watchdog operations temporarily

2
watchdog/watchdogConf.h.in
View File

@ -1,8 +1,6 @@
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include "watchdog/definitions.h"
#define WATCHDOG_VERBOSE_LEVEL 1 #define WATCHDOG_VERBOSE_LEVEL 1
/** /**
* This flag instructs the watchdog to create a special file in /tmp if the OBSW is running * This flag instructs the watchdog to create a special file in /tmp if the OBSW is running