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

Update to v1.1.0 #29

Merged
muellerr merged 427 commits from develop into master 2021-04-25 12:43:23 +02:00
Conversation 0 Commits 427 Files Changed 381 +30807 -1732
371 changed files with 30807 additions and 1732 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 88537fabc7 - Show all commits

2
fsfw

Submodule fsfw updated: 778ef4ef23...0e92fa4046

6
linux/spi/SpiComIF.cpp
View File

@ -5,7 +5,7 @@
#include <linux/spi/SpiCookie.h> #include <linux/spi/SpiCookie.h>
#include <fsfw/ipc/MutexFactory.h> #include <fsfw/ipc/MutexFactory.h>
#include <fsfw/ipc/MutexHelper.h> #include <fsfw/ipc/MutexGuard.h>
#include <fsfw/globalfunctions/arrayprinter.h> #include <fsfw/globalfunctions/arrayprinter.h>
#include <linux/spi/spidev.h> #include <linux/spi/spidev.h>
@ -174,7 +174,7 @@ ReturnValue_t SpiComIF::sendMessage(CookieIF *cookie, const uint8_t *sendData, s
gpioId_t gpioId = spiCookie->getChipSelectPin(); gpioId_t gpioId = spiCookie->getChipSelectPin();
/* GPIO access is mutex protected */ /* GPIO access is mutex protected */
MutexHelper(spiMutex, timeoutType, timeoutMs); MutexGuard(spiMutex, timeoutType, timeoutMs);
/* Pull SPI CS low. For now, no support for active high given */ /* Pull SPI CS low. For now, no support for active high given */
if(gpioId != gpio::NO_GPIO) { if(gpioId != gpio::NO_GPIO) {
@ -255,7 +255,7 @@ ReturnValue_t SpiComIF::requestReceiveMessage(CookieIF *cookie, size_t requestLe
} }
gpioId_t gpioId = spiCookie->getChipSelectPin(); gpioId_t gpioId = spiCookie->getChipSelectPin();
MutexHelper(spiMutex, timeoutType, timeoutMs); MutexGuard(spiMutex, timeoutType, timeoutMs);
if(gpioId != gpio::NO_GPIO) { if(gpioId != gpio::NO_GPIO) {
gpioComIF->pullLow(gpioId); gpioComIF->pullLow(gpioId);
} }