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

resolve merge conflict
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
Details
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-03-20 11:48:23 +01:00
parent ec18cb7007
commit 8843a0d8c5
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsp_q7s/core/CoreController.cpp
View File

@ -108,13 +108,12 @@ void CoreController::performControlOperation() {
sdStateMachine(); sdStateMachine();
performMountedSdCardOperations(); performMountedSdCardOperations();
readHkData(); readHkData();
<<<<<<< HEAD
if(i2cErrors >= 5) { if(i2cErrors >= 5) {
bool protOpPerformed = false; bool protOpPerformed = false;
triggerEvent(I2C_UNAVAILABLE_REBOOT); triggerEvent(I2C_UNAVAILABLE_REBOOT);
gracefulShutdownTasks(CURRENT_CHIP, CURRENT_COPY, protOpPerformed); gracefulShutdownTasks(CURRENT_CHIP, CURRENT_COPY, protOpPerformed);
std::system("xsc_boot_copy -r"); std::system("xsc_boot_copy -r");
======= }
if (shellCmdIsExecuting) { if (shellCmdIsExecuting) {
bool replyReceived = false; bool replyReceived = false;
// TODO: We could read the data in the ring buffer and send it as an action data reply. // TODO: We could read the data in the ring buffer and send it as an action data reply.
@ -127,7 +126,6 @@ void CoreController::performControlOperation() {
} }
successRecipient = MessageQueueIF::NO_QUEUE; successRecipient = MessageQueueIF::NO_QUEUE;
} }
>>>>>>> origin/develop
} }
opDivider5.checkAndIncrement(); opDivider5.checkAndIncrement();
opDivider10.checkAndIncrement(); opDivider10.checkAndIncrement();