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

SPI update, Version bump #22

Merged
meierj merged 52 commits from mueller/spi-com-if-tested into develop 2021-03-04 18:23:43 +01:00
Conversation 1 Commits 52 Files Changed 84 +16 -3
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cb0fa384ca - Show all commits

17
linux/boardtest/SpiTestClass.cpp
View File

@ -42,12 +42,22 @@ ReturnValue_t SpiTestClass::performPeriodicAction() {
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }
void SpiTestClass::performRm3100Test() { void SpiTestClass::performRm3100Test(uint8_t mgmId) {
/* Configure all SPI chip selects and pull them high */ /* Configure all SPI chip selects and pull them high */
acsInit(); acsInit();
/* Adapt accordingly */ /* Adapt accordingly */
uint8_t chipSelectPin = mgm1Rm3100ChipSelect; if(mgmId != mgm1Rm3100ChipSelect or mgmId != mgm3Rm3100ChipSelect) {
sif::warning << "SpiTestClass::performRm3100Test: Invalid MGM ID!" << std::endl;
}
gpioId_t currentGpioId = 0;
uint8_t chipSelectPin = mgmId;
if(chipSelectPin == mgm1Rm3100ChipSelect) {
currentGpioId = gpioIds::MGM_1_RM3100_CS;
}
else {
currentGpioId = gpioIds::MGM_3_RM3100_CS;
}
uint32_t rm3100Speed = 3'900'000; uint32_t rm3100Speed = 3'900'000;
uint8_t rm3100whoAmIReg = 0b0000'1111; uint8_t rm3100whoAmIReg = 0b0000'1111;
int rm3100mode = SPI_MODE_3; int rm3100mode = SPI_MODE_3;
@ -75,6 +85,9 @@ void SpiTestClass::performRm3100Test() {
utility::handleIoctlError("SpiTestClass::performRm3100Test: Setting SPI speed failed!"); utility::handleIoctlError("SpiTestClass::performRm3100Test: Setting SPI speed failed!");
} }
gpioIF->pullLow(currentGpioId);
} }
void SpiTestClass::acsInit() { void SpiTestClass::acsInit() {

2
linux/boardtest/SpiTestClass.h
View File

@ -29,7 +29,7 @@ private:
std::array<uint8_t, 128> sendBuffer; std::array<uint8_t, 128> sendBuffer;
struct spi_ioc_transfer spiTransferStruct; struct spi_ioc_transfer spiTransferStruct;
void performRm3100Test(); void performRm3100Test(uint8_t mgmId);
/* ACS board specific code which pulls all GPIOs high */ /* ACS board specific code which pulls all GPIOs high */
void acsInit(); void acsInit();