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

v1.11.0 #243

Merged
muellerr merged 159 commits from develop into main 2022-05-04 17:19:57 +02:00
Conversation 0 Commits 159 Files Changed 144 +9 -7
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a14af7f728 - Show all commits

12
bsp_q7s/core/CoreController.cpp
View File

@ -29,7 +29,9 @@ xsc::Chip CoreController::CURRENT_CHIP = xsc::Chip::NO_CHIP;
xsc::Copy CoreController::CURRENT_COPY = xsc::Copy::NO_COPY; xsc::Copy CoreController::CURRENT_COPY = xsc::Copy::NO_COPY;
CoreController::CoreController(object_id_t objectId) CoreController::CoreController(object_id_t objectId)
: ExtendedControllerBase(objectId, objects::NO_OBJECT, 5), opDivider5(5), opDivider10(10), : ExtendedControllerBase(objectId, objects::NO_OBJECT, 5),
opDivider5(5),
opDivider10(10),
hkSet(this) { hkSet(this) {
ReturnValue_t result = HasReturnvaluesIF::RETURN_OK; ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
try { try {
@ -144,7 +146,7 @@ ReturnValue_t CoreController::initializeAfterTaskCreation() {
} }
// Add script folder to path // Add script folder to path
char *currentEnvPath = getenv("PATH"); char *currentEnvPath = getenv("PATH");
std::string updatedEnvPath = std::string(currentEnvPath) + ":/home/root/scripts"; std::string updatedEnvPath = std::string(currentEnvPath) + ":/home/root/scripts:/usr/local/bin";
setenv("PATH", updatedEnvPath.c_str(), true); setenv("PATH", updatedEnvPath.c_str(), true);
updateProtInfo(); updateProtInfo();
initPrint(); initPrint();
@ -1697,7 +1699,7 @@ void CoreController::setRebootMechanismLock(bool lock, xsc::Chip tgtChip, xsc::C
ReturnValue_t CoreController::timeFileHandler() { ReturnValue_t CoreController::timeFileHandler() {
// Always set time. We could only set it if it is updated by GPS, but then the backup time would // Always set time. We could only set it if it is updated by GPS, but then the backup time would
// become obsolete on GPS problems. // become obsolete on GPS problems.
if(opDivider10.check()) { if (opDivider10.check()) {
// It is assumed that the system time is set from the GPS time // It is assumed that the system time is set from the GPS time
timeval currentTime = {}; timeval currentTime = {};
ReturnValue_t result = Clock::getClock_timeval(&currentTime); ReturnValue_t result = Clock::getClock_timeval(&currentTime);
@ -1707,8 +1709,8 @@ ReturnValue_t CoreController::timeFileHandler() {
std::string fileName = currMntPrefix + TIME_FILE; std::string fileName = currMntPrefix + TIME_FILE;
std::ofstream timeFile(fileName); std::ofstream timeFile(fileName);
if (not timeFile.good()) { if (not timeFile.good()) {
sif::error << "CoreController::timeFileHandler: Error opening time file: " << sif::error << "CoreController::timeFileHandler: Error opening time file: " << strerror(errno)
strerror(errno) << std::endl; << std::endl;
return RETURN_FAILED; return RETURN_FAILED;
} }
timeFile << "UNIX SECONDS: " << currentTime.tv_sec << std::endl; timeFile << "UNIX SECONDS: " << currentTime.tv_sec << std::endl;

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;
} }