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

resolved merge conflicts

Browse Source
This commit is contained in:
Robin Müller
2021-04-10 22:22:39 +02:00
parent c4a6a680c8
commit 3046b62ddb
4 changed files with 6 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
linux/boardtest/SpiTestClass.cpp
View File

@ -329,7 +329,6 @@ void SpiTestClass::acsInit() {
gpio = new GpiodRegular(rpiGpioName, mgm3Rm3100ChipSelect, "MGM_3_RM3100",
gpio::Direction::OUT, 1);
gpioCookie->addGpio(gpioIds::MGM_3_RM3100_CS, gpio);
}
#elif defined(XIPHOS_Q7S)
std::string q7sGpioName5 = "gpiochip5";
std::string q7sGpioName6 = "gpiochip6";
@ -362,10 +361,9 @@ void SpiTestClass::acsInit() {
gpio::Direction::OUT, gpio::HIGH);
gpioCookie->addGpio(gpioIds::MGM_3_RM3100_CS, gpio);
#endif
if(gpioIF != nullptr) {
gpioIF->addGpios(gpioCookie);
}
if(gpioIF != nullptr) {
gpioIF->addGpios(gpioCookie);
}
}
void SpiTestClass::setSpiSpeedAndMode(int spiFd, spi::SpiModes mode, uint32_t speed) {

2
linux/boardtest/SpiTestClass.h
View File

@ -39,7 +39,7 @@ private:
/* ACS board specific variables */
#ifdef RASPBERRY_PI
uint8_t mgm0Lis3ChipSelect = 0;
uint8_t mgm0Lis3mdlChipSelect = 0;
uint8_t mgm1Rm3100ChipSelect = 1;
uint8_t gyro0AdisChipSelect = 5;
uint8_t gyro1L3gd20ChipSelect = 6;