Changeset 253 in flair-src for trunk

Timestamp:

Jul 13, 2018, 5:59:30 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

correction bug logs non fonctionnels

Location:

trunk

Files:

• lib/FlairCore/src/ui_com.cpp (modified) (1 diff)
• lib/FlairCore/src/unexported/communication.h (modified) (1 diff)
• tools/FlairGCS/src/ConnectionLayout.cpp (modified) (2 diffs)
• tools/FlairGCS/src/UdtSocket.cpp (modified) (6 diffs)

trunk/lib/FlairCore/src/ui_com.cpp

@@ -244 +244 @@
   char header;
   if (IsBigEndian()) {
-    header = DATAS_BIG_ENDIAN;
+    header = DATA_BIG_ENDIAN;
     Printf("System is big endian\n");
   } else {
-    header = DATAS_LITTLE_ENDIAN;
+    header = DATA_LITTLE_ENDIAN;
     Printf("System is little endian\n");
   }

trunk/lib/FlairCore/src/unexported/communication.h

@@ -10 +10 @@
 #define ZLIB_HEADER 0x78
 #define WATCHDOG_HEADER 0x01
-#define DATAS_LITTLE_ENDIAN 0x02
-#define DATAS_BIG_ENDIAN 0x03
+#define DATA_LITTLE_ENDIAN 0x02
+#define DATA_BIG_ENDIAN 0x03
 #define CLOSING_CONNECTION 0x04
 

trunk/tools/FlairGCS/src/ConnectionLayout.cpp

@@ -37 +37 @@
     break;
   }
-  case DATAS_BIG_ENDIAN: {
+  case DATA_BIG_ENDIAN: {
     // for(int i=0;i<size;i++) fprintf(stderr,"%x ",buf[i]);
     // fprintf(stderr,"\n");
@@ -46 +46 @@
     break;
   }
-  case DATAS_LITTLE_ENDIAN: {
+  case DATA_LITTLE_ENDIAN: {
     // for(int i=0;i<size;i++) fprintf(stderr,"%x ",buf[i]);
     // fprintf(stderr,"\n");

trunk/tools/FlairGCS/src/UdtSocket.cpp

@@ -45 +45 @@
   connect(heartbeat_timer, SIGNAL(timeout()), this, SLOT(heartbeat()));
   heartbeat_timer->start(HEARTBEAT_TIMER);
-  heartbeat();//send directly the first one
+  //heartbeat();//send directly the first one, but conflicts if this socket is for logs... TODO: delay start of watchdog timer on uav side
   udtstats_timer = new QTimer(this);
   connect(udtstats_timer, SIGNAL(timeout()), this, SLOT(getUTDStats()));
@@ -166 +166 @@
         size=UDT::recvmsg(socket, buf, buf_size);
       
-        //fprintf(stderr,"recu %i\n",size);
+        //fprintf(stderr,"recu %i %x\n",size,buf[0]);
         if (size > 0) {
           total_received+=size;
@@ -184 +184 @@
             }
             case START_SENDING_FILES: {
+              printf("log\n");
               if((unsigned char)uncompressbuf[0]==XML_HEADER && socketType==unknown) {
                 socketType=log;
@@ -192 +193 @@
               deleteLater();
               stop=true;
+              size=-1;//exit from do while loop
               destroySocket=false;
               break;
@@ -202 +204 @@
                 emit newConnectionLayout(remoteName);
               }
-            case DATAS_BIG_ENDIAN:
-            case DATAS_LITTLE_ENDIAN:
+            case DATA_BIG_ENDIAN:
+            case DATA_LITTLE_ENDIAN:
               emit dataReady(buf, size );
               break;
@@ -214 +216 @@
               break;
             default:
-              fprintf(stderr,"trame non supportée %x\n", buf[0]);
+              fprintf(stderr,"udt trame non supportée %x\n", buf[0]);
           }
         } else {