Added some fixes to the Makefiles and setup.py as suggested by Сергей…

… Тищенко
horo2016 · Apr 7, 2018 · b91b789 · b91b789
1 parent 907330a
commit b91b789
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Linux/RTIMULibCal/Makefile b/Linux/RTIMULibCal/Makefile
@@ -80,7 +80,8 @@ DEPS    = $(RTIMULIBPATH)/RTMath.h \
     $(RTIMULIBPATH)/IMUDrivers/RTPressureBMP180.h \
     $(RTIMULIBPATH)/IMUDrivers/RTPressureLPS25H.h \
     $(RTIMULIBPATH)/IMUDrivers/RTPressureMS5611.h \
-    $(RTIMULIBPATH)/IMUDrivers/RTPressureMS5637.h 
+    $(RTIMULIBPATH)/IMUDrivers/RTPressureMS5637.h \
+    $(RTIMULIBPATH)/IMUDrivers/RTIMUHMC5883LADXL345.h
 
 OBJECTS = objects/RTIMULibCal.o \
     objects/RTMath.o \
@@ -106,7 +107,8 @@ OBJECTS = objects/RTIMULibCal.o \
     objects/RTPressureBMP180.o \
     objects/RTPressureLPS25H.o \
     objects/RTPressureMS5611.o \
-    objects/RTPressureMS5637.o 
+    objects/RTPressureMS5637.o \
+    objects/RTIMUHMC5883LADXL345.o
 
 MAKE_TARGET	= RTIMULibCal
 DESTDIR		= Output/

diff --git a/Linux/python/setup.py b/Linux/python/setup.py
@@ -51,6 +51,7 @@
     "IMUDrivers/RTHumidity.cpp",
     "IMUDrivers/RTHumidityHTS221.cpp",
     "IMUDrivers/RTHumidityHTU21D.cpp",
+    "IMUDrivers/RTIMUHMC5883LADXL345.cpp"
    ]
 RTIMU_sourcedir = "../../RTIMULib"
 

diff --git a/RTIMULib/IMUDrivers/RTIMUHMC5883LADXL345.cpp b/RTIMULib/IMUDrivers/RTIMUHMC5883LADXL345.cpp
@@ -245,9 +245,9 @@ bool RTIMU5883L::IMURead()
     //  Swap the axes to match the board
     //  Might have to change these depending on specific board layout
     RTFLOAT temp;
-    temp = m_imuData.gyro.x();
-    m_imuData.gyro.setX(-m_imuData.gyro.y());
-    m_imuData.gyro.setY(-temp);
+//    temp = m_imuData.gyro.x();
+//    m_imuData.gyro.setX(-m_imuData.gyro.y());
+//    m_imuData.gyro.setY(-temp);
 
     temp = m_imuData.accel.x();
     m_imuData.accel.setX(m_imuData.accel.y());