fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

WIP: develop_update #706

Draft
muellerr wants to merge 710 commits from eive/fsfw:develop_update into development
pull from: eive/fsfw:develop_update
merge into: fsfw:development
Conversation 0 Commits 710 Files Changed 187 +3 -5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2d6622b8b8 - Show all commits

8
src/fsfw_hal/linux/i2c/I2cComIF.cpp
View File

@ -102,13 +102,12 @@ ReturnValue_t I2cComIF::sendMessage(CookieIF* cookie, const uint8_t* sendData, s
if (fileHelper.getOpenResult() != returnvalue::OK) { if (fileHelper.getOpenResult() != returnvalue::OK) {
return fileHelper.getOpenResult(); return fileHelper.getOpenResult();
} }
int slaveFd = 0; result = openI2cSlave(deviceFile, i2cAddress, fd);
result = openI2cSlave(deviceFile, i2cAddress, slaveFd);
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
return result; return result;
} }
if (write(slaveFd, sendData, sendLen) != static_cast<int>(sendLen)) { if (write(fd, sendData, sendLen) != static_cast<int>(sendLen)) {
i2cCookie->errorCounter++; i2cCookie->errorCounter++;
if (i2cCookie->errorCounter < 3) { if (i2cCookie->errorCounter < 3) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
@ -161,8 +160,7 @@ ReturnValue_t I2cComIF::requestReceiveMessage(CookieIF* cookie, size_t requestLe
if (fileHelper.getOpenResult() != returnvalue::OK) { if (fileHelper.getOpenResult() != returnvalue::OK) {
return fileHelper.getOpenResult(); return fileHelper.getOpenResult();
} }
int slaveFd = 0; result = openI2cSlave(deviceFile, i2cAddress, fd);
result = openI2cSlave(deviceFile, i2cAddress, slaveFd);
if (result != returnvalue::OK) { if (result != returnvalue::OK) {
return result; return result;
} }