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

fix core controller
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2022-10-11 22:58:31 +02:00
parent cca96f2a96
commit 21258c2d79
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
5 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bsp_q7s/core/CoreController.cpp
View File

@ -1230,10 +1230,8 @@ void CoreController::performWatchdogControlOperation() {
} }
void CoreController::performMountedSdCardOperations() { void CoreController::performMountedSdCardOperations() {
auto mountedSdCardOp = [&](bool &mntSwitch, sd::SdCard sdCard, std::string mntPoint) { auto mountedSdCardOp = [&](sd::SdCard sdCard, std::string mntPoint) {
if (mntSwitch) { if (not performOneShotSdCardOpsSwitch) {
bool sdCardMounted = sdcMan->isSdCardUsable(sdCard);
if (sdCardMounted and not performOneShotSdCardOpsSwitch) {
std::ostringstream path; std::ostringstream path;
path << mntPoint << "/" << CONF_FOLDER; path << mntPoint << "/" << CONF_FOLDER;
if (not std::filesystem::exists(path.str())) { if (not std::filesystem::exists(path.str())) {
@ -1242,17 +1240,19 @@ void CoreController::performMountedSdCardOperations() {
initVersionFile(); initVersionFile();
initClockFromTimeFile(); initClockFromTimeFile();
performRebootFileHandling(false); performRebootFileHandling(false);
performOneShotSdCardOpsSwitch = true;
}
mntSwitch = false;
} }
}; };
if (sdInfo.active == sd::SdCard::SLOT_1) { bool clearOneShotFlag = false;
mountedSdCardOp(sdInfo.mountSwitch.second, sd::SdCard::SLOT_1, config::SD_1_MOUNT_POINT); if (sdInfo.active == sd::SdCard::SLOT_0 and sdcMan->isSdCardUsable(sd::SdCard::SLOT_0)) {
mountedSdCardOp(sdInfo.mountSwitch.first, sd::SdCard::SLOT_0, config::SD_0_MOUNT_POINT); mountedSdCardOp(sd::SdCard::SLOT_0, config::SD_0_MOUNT_POINT);
} else { clearOneShotFlag = true;
mountedSdCardOp(sdInfo.mountSwitch.first, sd::SdCard::SLOT_0, config::SD_0_MOUNT_POINT); }
mountedSdCardOp(sdInfo.mountSwitch.second, sd::SdCard::SLOT_1, config::SD_1_MOUNT_POINT); if (sdInfo.active == sd::SdCard::SLOT_1 and sdcMan->isSdCardUsable(sd::SdCard::SLOT_1)) {
mountedSdCardOp(sd::SdCard::SLOT_1, config::SD_1_MOUNT_POINT);
clearOneShotFlag = true;
}
if (clearOneShotFlag) {
performOneShotSdCardOpsSwitch = true;
} }
timeFileHandler(); timeFileHandler();
} }

2
bsp_q7s/core/CoreController.h
View File

@ -205,7 +205,7 @@ class CoreController : public ExtendedControllerBase {
RebootFile rebootFile = {}; RebootFile rebootFile = {};
std::string currMntPrefix; std::string currMntPrefix;
bool performOneShotSdCardOpsSwitch = true; bool performOneShotSdCardOpsSwitch = false;
/** /**
* Index 0: Chip 0 Copy 0 * Index 0: Chip 0 Copy 0

2
fsfw

@ -1 +1 @@
Subproject commit a8fb83dfcedb5391ac942d6bcffa64f0cbca38c5 Subproject commit 692be9df8d06beb3bfc83aad77cefd727d8f7c35

10
mission/controller/ThermalController.cpp
View File

@ -238,7 +238,8 @@ void ThermalController::copySensors() {
PoolReadGuard pg0(&max31865Set0); PoolReadGuard pg0(&max31865Set0);
if (pg0.getReadResult() == returnvalue::OK) { if (pg0.getReadResult() == returnvalue::OK) {
sensorTemperatures.sensor_ploc_heatspreader.value = max31865Set0.temperatureCelcius.value; sensorTemperatures.sensor_ploc_heatspreader.value = max31865Set0.temperatureCelcius.value;
sensorTemperatures.sensor_ploc_heatspreader.setValid(max31865Set0.temperatureCelcius.isValid()); sensorTemperatures.sensor_ploc_heatspreader.setValid(
max31865Set0.temperatureCelcius.isValid());
if (not sensorTemperatures.sensor_ploc_heatspreader.isValid()) { if (not sensorTemperatures.sensor_ploc_heatspreader.isValid()) {
sensorTemperatures.sensor_ploc_heatspreader.value = INVALID_TEMPERATURE; sensorTemperatures.sensor_ploc_heatspreader.value = INVALID_TEMPERATURE;
} }
@ -249,7 +250,8 @@ void ThermalController::copySensors() {
PoolReadGuard pg1(&max31865Set1); PoolReadGuard pg1(&max31865Set1);
if (pg1.getReadResult() == returnvalue::OK) { if (pg1.getReadResult() == returnvalue::OK) {
sensorTemperatures.sensor_ploc_missionboard.value = max31865Set1.temperatureCelcius.value; sensorTemperatures.sensor_ploc_missionboard.value = max31865Set1.temperatureCelcius.value;
sensorTemperatures.sensor_ploc_missionboard.setValid(max31865Set1.temperatureCelcius.isValid()); sensorTemperatures.sensor_ploc_missionboard.setValid(
max31865Set1.temperatureCelcius.isValid());
if (not sensorTemperatures.sensor_ploc_missionboard.isValid()) { if (not sensorTemperatures.sensor_ploc_missionboard.isValid()) {
sensorTemperatures.sensor_ploc_missionboard.value = INVALID_TEMPERATURE; sensorTemperatures.sensor_ploc_missionboard.value = INVALID_TEMPERATURE;
} }
@ -271,7 +273,8 @@ void ThermalController::copySensors() {
PoolReadGuard pg3(&max31865Set3); PoolReadGuard pg3(&max31865Set3);
if (pg3.getReadResult() == returnvalue::OK) { if (pg3.getReadResult() == returnvalue::OK) {
sensorTemperatures.sensor_dac_heatspreader.value = max31865Set3.temperatureCelcius.value; sensorTemperatures.sensor_dac_heatspreader.value = max31865Set3.temperatureCelcius.value;
sensorTemperatures.sensor_dac_heatspreader.setValid(max31865Set3.temperatureCelcius.isValid()); sensorTemperatures.sensor_dac_heatspreader.setValid(
max31865Set3.temperatureCelcius.isValid());
if (not sensorTemperatures.sensor_dac_heatspreader.isValid()) { if (not sensorTemperatures.sensor_dac_heatspreader.isValid()) {
sensorTemperatures.sensor_dac_heatspreader.value = INVALID_TEMPERATURE; sensorTemperatures.sensor_dac_heatspreader.value = INVALID_TEMPERATURE;
} }
@ -389,7 +392,6 @@ void ThermalController::copySensors() {
} }
} }
{ {
PoolReadGuard pg14(&max31865Set14); PoolReadGuard pg14(&max31865Set14);
if (pg14.getReadResult() == returnvalue::OK) { if (pg14.getReadResult() == returnvalue::OK) {

2
tmtc

@ -1 +1 @@
Subproject commit a91d40f3337a948bc061b033e194dd629fd34be1 Subproject commit 4c3f5f28256be0dbfc5b46ea87f8f484c93a9996