bug git merging

main.cpp

@@ -17,8 +17,6 @@ int main(int argc, char *argv[])
 
     initBackends();
 
-    //QObject::connect(&zigateBkd, SIGNAL(readyRead()), &zigateBkd, SLOT(getData()));
-
     return a.exec();
 }
 

serial.inc.cpp

@@ -4,7 +4,6 @@
 
 extern QApplication a;
 extern ZigateBackend zigateBkd;
-//extern SerialManager serialManager;
 
 using namespace std;
 

serial.inc.h

@@ -27,8 +27,10 @@ class SerialManager : public QSerialPort
         QString serialDeviceProduct;
         quint32 baudRate = 115200;
         void write(QByteArray datas);
+
         SerialManager();
         ~SerialManager();
+
         void initSerial();
         bool findSerialDevice();
         //void getData();

version.h

@@ -1,7 +0,0 @@
-#ifndef VERSION_H
-#define VERSION_H
-
-QString version = "0.1";
-
-
-#endif // VERSION_H

zigateBackend.cpp

@@ -153,6 +153,7 @@ void ZigateBackend::interpretResult(QByteArray payload)
         //type de message
         type = payloadD.mid(0, 2);
         ln = payloadD.mid(2, 2).toHex().toUInt(nullptr, 16);
+
         if ((unsigned char)type[0] == 128 or (unsigned char)type[0] == 0 or (unsigned char)type[0] == 153)
         {
             crctmp = crctmp ^ payloadD.at(0) ^ payloadD.at(1);

zigateBackend.h

@@ -128,6 +128,10 @@ class ZigateBackend : QObject
         //int interpretResult(QByteArray datas);
         //void getResponse();
         bool resetCoordinator();
+        void interpretResult();
+
+        // commands
+        void getVersion();
 
         // commands
         void getVersion();
@@ -326,7 +330,6 @@ class ZigateBackend : QObject
             {"FF02", " Xiaomi private"},
             {"1234", " Xiaomi private"}
         };
-
 };