fix merge bugs

lib/Sensors/sensorData.h

@@ -21,7 +21,6 @@
 
 #include <SparkFun_u-blox_GNSS_Arduino_Library.h>
 #include <QMC5883LCompass.h>
-#include <MPU6050_6Axis_MotionApps20.h>
 #include "calcAzimuth.h"
 
 #include "point.h"
@@ -37,8 +36,6 @@ public:
     SensorData();
     ~SensorData();
 
-    void enableNtrip(String host, uint16_t port, String mountPoint, String user, String password);
-
     /**
      * @brief Enable the gnss module over spi
      *
@@ -54,7 +51,6 @@ public:
 
     void enableRealCompass();
     void enableCalcCompass();
-    void enableGyroscope();
 
     // Interface Const
     /**
@@ -84,19 +80,6 @@ public:
 
     Point getCurrentPos() const { return this->currentPosition; }
     const UBX_NAV_PVT_data_t *getGnssData() const { return this->gnssData; };
-    NTRIPClientStates getNtripState() const;
-
-    /**
-     * @brief Get the data from the gyroscope
-     *
-     * The returned float pointer is an array of 3 floats
-     * - Yaw
-     * - Pitch
-     * - Roll
-     *
-     * @return const float*
-     */
-    const float *getGyroData() const { return this->yawPitchRoll; }
 
     /**
      * @brief Get the CalcCompass object
@@ -110,18 +93,6 @@ public:
      */
     QMC5883LCompass *getRealCompass() const { return this->realCompass; }
 
-    /**
-     * @brief Get the NTRIPClient object
-     * @return NTRIPClient*
-     */
-    NTRIPClient *getNtripClient() const { return this->ntripClient; }
-
-    /**
-     * @brief Get the Gyroscope object
-     * @return MPU6050*
-     */
-    MPU6050 *getGyroscope() const { return this->gyroscope; }
-
     // static
     /**
      * @brief Set the output status for PVTdata.
@@ -142,29 +113,14 @@ private:
     QMC5883LCompass *realCompass = nullptr;
     CalcAzimuth *calcCompass = nullptr;
     SFE_UBLOX_GNSS *gnss = nullptr;
-    NTRIPClient *ntripClient = nullptr;
-    MPU6050 *gyroscope = nullptr;
 
     UBX_NAV_PVT_data_t *gnssData = nullptr;
     Point currentPosition;
-    Quaternion quaternion;
-    VectorFloat gravity;
 
-    char *host = nullptr;
-    char *mountPoint = nullptr;
-    char *user = nullptr;
-    char *password = nullptr;
-
-    bool isNtripInit = false;
-
-    uint8_t gyroBuffer[64];
-    uint16_t port = 0;
     int16_t realAzimuth = INT16_MAX;
     int16_t calcAzimuth = INT16_MAX;
     uint32_t lastUbxUpdate = 0;
 
-    float yawPitchRoll[3]{0, 0, 0};
-
     // static
     static void printPVTdata(UBX_NAV_PVT_data_t *ubxDataStruct);
     static void savePVTdata(UBX_NAV_PVT_data_t *ubxDataStruct);