get HonaLowLevelAPI.cpp change

Plx/src/LowLevel/HonaLowLevelAPI.cpp

@@ -2,10 +2,8 @@
 #include <include/LowLevel/Utils/Utils.h>
 #include "include/LowLevel/HonaLowLevelAPI.h"
 #include "include/Wrapper/PlxWrapper.h"
-
 #include <QDebug>
 #include <QTimer>
-
 quint32 HonaLowLevelAPI::packetLenInt4;
 quint32 HonaLowLevelAPI::packetLenRes4;
 quint32 HonaLowLevelAPI::packetLenSinglePulse;
@@ -26,7 +24,6 @@ quint32 HonaLowLevelAPI::nextIntS;
 
 #define PLX_ID 0x9054
 
-
 /*************************************************************************************************/
 HonaLowLevelAPI::HonaLowLevelAPI(QObject* parent) : QObject(parent)
 {
@@ -516,12 +513,8 @@ quint32 HonaLowLevelAPI::hsruParserIntS(const QVector<quint32>& honaData,
         else if(((honaData[Ind] & 0xF0000000) == 0x60000000) && (nextIntS == 6))
         {
             tempHonaPacketIntS.setCodeM(tempHonaPacketIntS.getCodeM() +
-<<<<<<< HEAD
-                                        ((static_cast<qulonglong>(honaData[Ind] & 0x0FFFFFFF)) << 36));
-=======
                                         (static_cast<quint64>(honaData[Ind] & 0x0FFFFFFF)) <<
                                         36);
->>>>>>> b4c9ce73b677efe5e06e4c2aaa524c112a0e9313
             tempHonaPacketIntS.setCodeL(0);
             nextIntS = 7;
         }
@@ -534,12 +527,8 @@ quint32 HonaLowLevelAPI::hsruParserIntS(const QVector<quint32>& honaData,
         else if(((honaData[Ind] & 0xF0000000) == 0x80000000) && (nextIntS == 8))
         {
             tempHonaPacketIntS.setCodeM(tempHonaPacketIntS.getCodeM() +
-<<<<<<< HEAD
-                                        ((static_cast<qulonglong>(honaData[Ind] & 0x0FFFFFFF)) << 36));
-=======
                                         (static_cast<quint64>(honaData[Ind] & 0x0FFFFFFF)) <<
                                         36);
->>>>>>> b4c9ce73b677efe5e06e4c2aaa524c112a0e9313
             nextIntS = 9;
         }
 
@@ -624,12 +613,8 @@ quint32 HonaLowLevelAPI::hsruParserResS(const QVector<quint32>& honaData,
         else if(((honaData[Ind] & 0xF0000000) == 0x60000000) && (nextResS == 6))
         {
             tempHonaPacketResS.setCodeM(tempHonaPacketResS.getCodeM() +
-<<<<<<< HEAD
-                                        ((static_cast<qulonglong>(honaData[Ind] & 0x0FFFFFFF)) << 36));
-=======
                                         (static_cast<quint64>(honaData[Ind] & 0x0FFFFFFF)) <<
                                         36);
->>>>>>> b4c9ce73b677efe5e06e4c2aaa524c112a0e9313
             tempHonaPacketResS.setCodeL(0);
             nextResS = 7;
         }
@@ -642,12 +627,8 @@ quint32 HonaLowLevelAPI::hsruParserResS(const QVector<quint32>& honaData,
         else if(((honaData[Ind] & 0xF0000000) == 0x80000000) && (nextResS == 8))
         {
             tempHonaPacketResS.setCodeM(tempHonaPacketResS.getCodeM() +
-<<<<<<< HEAD
-                                        ((static_cast<qulonglong>(honaData[Ind] & 0x0FFFFFFF)) << 36));
-=======
                                         (static_cast<quint64>(honaData[Ind] & 0x0FFFFFFF)) <<
                                         36);
->>>>>>> b4c9ce73b677efe5e06e4c2aaa524c112a0e9313
             nextResS = 9;
         }
         if(nextResS == packetLenResS)
@@ -912,7 +893,6 @@ QVector<quint32> HonaLowLevelAPI::hsruReadHonaBuffer(honaReceivers receiver)
 //        for(auto i = 0 ; i < 10; i++)
 //        qDebug() << "[" << i << "] " << "0x" << QString::number(honaData[i], 16);
 //        qDebug() << "------------------------------------------------------------";
-
     return honaData;
 }