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

I2C fatal error counter #496

Merged
meggert merged 6 commits from feature_i2c_fatal_error_counter into develop 2023-03-21 13:38:29 +01:00
Conversation 1 Commits 6 Files Changed 8 +1 -3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8843a0d8c5 - Show all commits

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();