resolved merge conflicts

2021-04-10 22:22:39 +02:00
parent 43a3bcbf0a
commit f2c7bfc942
4 changed files with 6 additions and 64 deletions
--- a/linux/boardtest/SpiTestClass.h
+++ b/linux/boardtest/SpiTestClass.h
@ -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;