Changeset 252 in flair-src for trunk/lib

Timestamp:

07/05/18 17:57:08 (6 years ago)

Author:

Sanahuja Guillaume

Message:

change io_data CopyDate to RawRead

Location:

trunk/lib

Files:

• FlairCore/src/AhrsData.cpp (modified) (1 diff)
• FlairCore/src/AhrsData.h (modified) (1 diff)
• FlairCore/src/GeoCoordinate.cpp (modified) (1 diff)
• FlairCore/src/GeoCoordinate.h (modified) (1 diff)
• FlairCore/src/GpsData.cpp (modified) (1 diff)
• FlairCore/src/GpsData.h (modified) (1 diff)
• FlairCore/src/IODevice_impl.cpp (modified) (1 diff)
• FlairCore/src/ImuData.cpp (modified) (1 diff)
• FlairCore/src/ImuData.h (modified) (1 diff)
• FlairCore/src/Matrix.cpp (modified) (2 diffs)
• FlairCore/src/Matrix.h (modified) (1 diff)
• FlairCore/src/RangeFinderPlot.cpp (modified) (1 diff)
• FlairCore/src/Thread.cpp (modified) (1 diff)
• FlairCore/src/UsSensorPlot.cpp (modified) (1 diff)
• FlairCore/src/Vector3Ddata.h (modified) (1 diff)
• FlairCore/src/Watchdog.cpp (modified) (1 diff)
• FlairCore/src/cvimage.cpp (modified) (1 diff)
• FlairCore/src/cvimage.h (modified) (1 diff)
• FlairCore/src/cvmatrix.h (modified) (1 diff)
• FlairCore/src/io_data.h (modified) (2 diffs)
• FlairCore/src/ui_com.cpp (modified) (4 diffs)
• FlairCore/src/unexported/ui_com.h (modified) (1 diff)
• FlairVisionFilter/src/OpticalFlowData.cpp (modified) (1 diff)
• FlairVisionFilter/src/OpticalFlowData.h (modified) (2 diffs)

trunk/lib/FlairCore/src/AhrsData.cpp

@@ -232 +232 @@
 }
 
-void AhrsData::CopyDatas(char *dst) const {
+void AhrsData::RawRead(char *dst) const {
   GetMutex();
   Queue(&dst, &quaternion.q0, sizeof(quaternion.q0));

trunk/lib/FlairCore/src/AhrsData.h

@@ -161 +161 @@
 private:
   /*!
-  * \brief Copy datas
+  * \brief Raw read datas
   *
   * Reimplemented from io_data. \n
-  * See io_data::CopyDatas.
+  * See io_data::RawRead.
   *
   * \param dst destination buffer
   */
-  void CopyDatas(char *dst) const;
+  void RawRead(char *dst) const;
 
   void Queue(char **dst, const void *src, size_t size) const;

trunk/lib/FlairCore/src/GeoCoordinate.cpp

@@ -69 +69 @@
 }
 
-void GeoCoordinate::CopyDatas(char *ptr) const { Warn("a ecrire"); }
+void GeoCoordinate::RawRead(char *ptr) const { Warn("a ecrire"); }
 
 } // end namespace core

trunk/lib/FlairCore/src/GeoCoordinate.h

@@ -96 +96 @@
 private:
   /*!
-  * \brief Copy datas
+  * \brief Raw read datas
   *
   * Reimplemented from io_data. \n
-  * See io_data::CopyDatas.
+  * See io_data::RawRead.
   *
   * \param dst destination buffer
   */
-  void CopyDatas(char *ptr) const;
+  void RawRead(char *ptr) const;
 
   double latitude;

trunk/lib/FlairCore/src/GpsData.cpp

@@ -298 +298 @@
 }
 
-void GpsData::CopyDatas(char *dst) const {
+void GpsData::RawRead(char *dst) const {
   GetMutex();
 

trunk/lib/FlairCore/src/GpsData.h

@@ -244 +244 @@
 
   Type const &GetDataType() const { return dataType; }
+  
+  /*!
+  * \brief Raw read datas
+  *
+  * Reimplemented from io_data. \n
+  * See io_data::RawRead.
+  *
+  * \param dst destination buffer
+  */
+  void RawRead(char *dst) const;
 
 private:
-  /*!
-  * \brief Copy datas
-  *
-  * Reimplemented from io_data. \n
-  * See io_data::CopyDatas.
-  *
-  * \param dst destination buffer
-  */
-  void CopyDatas(char *dst) const;
-
   void Queue(char **dst, const void *src, size_t size) const;
   Type dataType;

trunk/lib/FlairCore/src/IODevice_impl.cpp

@@ -204 +204 @@
   for (size_t i = 0; i < datasToLog.size(); i++) {
     // printf("copy %s\n",datasToLog.at(i)->ObjectName().c_str());
-    datasToLog.at(i)->CopyDatas(*ptr);
+    datasToLog.at(i)->RawRead(*ptr);
     (*ptr) += datasToLog.at(i)->GetDataType().GetSize();
   }

trunk/lib/FlairCore/src/ImuData.cpp

@@ -226 +226 @@
 }
 
-void ImuData::CopyDatas(char *dst) const {
+void ImuData::RawRead(char *dst) const {
   GetMutex();
 

trunk/lib/FlairCore/src/ImuData.h

@@ -186 +186 @@
 private:
   /*!
-  * \brief Copy datas
+  * \brief Raw read datas
   *
   * Reimplemented from io_data. \n
-  * See io_data::CopyDatas.
+  * See io_data::RawRead.
   *
   * \param dst destination buffer
   */
-  void CopyDatas(char *dst) const;
+  void RawRead(char *dst) const;
 
   /*!

trunk/lib/FlairCore/src/Matrix.cpp

@@ -188 +188 @@
 }
 
-void Matrix::CopyDatas(char *dst) const {
+void Matrix::RawRead(char *dst) const {
   GetMutex();
   memcpy(dst, pimpl_->datas, dataType.GetSize());
@@ -194 +194 @@
 }
 
+void Matrix::RawWrite(char *src) {
+  GetMutex();
+  memcpy(pimpl_->datas, src,dataType.GetSize());
+  ReleaseMutex();
+}
+
 uint32_t Matrix::Rows(void) const { return pimpl_->descriptor->Rows(); }
 

trunk/lib/FlairCore/src/Matrix.h

@@ -194 +194 @@
 
   Type const &GetDataType() const { return dataType; };
-void CopyDatas(char *dst) const;
+  
+  /*!
+  * \brief Raw read datas
+  *
+  * Reimplemented from io_data. \n
+  * See io_data::RawRead.
+  *
+  * \param dst destination buffer
+  */
+  void RawRead(char *dst) const;
+
+  /*!
+  * \brief Raw write datas
+  *
+  * Copy the source to the internal datas. Source must be of the corresponding size.
+  *
+  * \param src source buffer
+  */
+  void RawWrite(char *src);
+  
 private:
-  /*!
-  * \brief Copy datas
-  *
-  * Reimplemented from io_data. \n
-  * See io_data::CopyDatas.
-  *
-  * \param dst destination buffer
-  */
-  //void CopyDatas(char *dst) const;
-
   class Matrix_impl *pimpl_;
   Type dataType;

trunk/lib/FlairCore/src/RangeFinderPlot.cpp

@@ -58 +58 @@
 
 void RangeFinderPlot::CopyDatas(char *buf) const {
-  datas->CopyDatas(buf);
+  datas->RawRead(buf);
 }
 

trunk/lib/FlairCore/src/Thread.cpp

@@ -107 +107 @@
     if(nanosleep(&req,&rem)!=0) Err("error in nanosleep\n");//todo, handle EINTR
   } else {
-    Err("error resume time is passed by %lldns\n", ( current-time));
+    Err("error resume time (%lldns) is passed by %lldns\n",time, ( current-time));
   }
 #endif

trunk/lib/FlairCore/src/UsSensorPlot.cpp

@@ -63 +63 @@
 
 void UsSensorPlot::CopyDatas(char *buf) const {
-  datas->CopyDatas(buf);
-  peakInfos->CopyDatas(buf+datas->GetDataType().GetSize());
+  datas->RawRead(buf);
+  peakInfos->RawRead(buf+datas->GetDataType().GetSize());
 }
 

trunk/lib/FlairCore/src/Vector3Ddata.h

@@ -78 +78 @@
   *
   * Reimplemented from io_data. \n
-  * See io_data::CopyDatas.
+  * See io_data::RawRead.
   *
   * \param dst destination buffer

trunk/lib/FlairCore/src/Watchdog.cpp

@@ -43 +43 @@
     Time current = GetTime();
     Time date = current + timer;
-    // Printf("watchdog goes to sleep at %llu, scheduled to wake up at
-    // %llu\n",current,date);
+    //Printf("watchdog goes to sleep at %llu, scheduled to wake up at %llu\n",current,date);
     if (!SuspendUntil(date)) {
+      //Printf("watchdog expired at %llu!!!!!!!!!!!!!!!!\n",GetTime());
       expired();
     }

trunk/lib/FlairCore/src/cvimage.cpp

@@ -76 +76 @@
 }
 
-void cvimage::CopyDatas(char *dst) const { Warn("non implementé\n"); }
+void cvimage::RawRead(char *dst) const { Warn("non implementé\n"); }
 
 } // end namespace core

trunk/lib/FlairCore/src/cvimage.h

@@ -108 +108 @@
 private:
   /*!
-  * \brief Copy datas
+  * \brief Raw read datas
   *
   * Reimplemented from io_data. \n
-  * See io_data::CopyDatas.
+  * See io_data::RawRead.
   *
   * \param dst destination buffer
   */
-  void CopyDatas(char *dst) const;
+  void RawRead(char *dst) const;
 
   bool allocate_data;

trunk/lib/FlairCore/src/cvmatrix.h

@@ -209 +209 @@
   *
   * Reimplemented from io_data. \n
-  * See io_data::CopyDatas.
+  * See io_data::RawRead.
   *
   * \param dst destination buffer

trunk/lib/FlairCore/src/io_data.h

@@ -176 +176 @@
 
   virtual DataType const &GetDataType() const = 0;
+  
+  /*!
+  * \brief Raw write datas
+  *
+  * Copy the source to the internal datas. Source must be of the corresponding size.
+  *
+  * \param src source buffer
+  */
+  virtual void RawWrite(char *src)  {};//todo put pure virtual
+  
+  /*!
+  * \brief Raw read datas
+  *
+  * This method is automatically called by IODevice::ProcessUpdate to log
+  * io_data datas. \n
+  * This method must be reimplemented, in order to copy the datas to the logs.
+  * Copy the internal datas to destination. Destination must be of the corresponding size.
+  *
+  * \param dst destination buffer
+  */
+  virtual void RawRead(char *dst) const = 0;
+
 
 protected:
@@ -208 +230 @@
 
 private:
-  /*!
-  * \brief Copy datas
-  *
-  * This method is automatically called by IODevice::ProcessUpdate to log
-  *io_data datas. \n
-  * This method must be reimplemented, in order to copy the datas to the logs.
-  * Copied datas must be of size io_data::Size.
-  *
-  * \param dst destination buffer
-  */
-  virtual void CopyDatas(char *dst) const = 0;
-
   io_data_impl *pimpl_;
 };

trunk/lib/FlairCore/src/ui_com.cpp

@@ -153 +153 @@
 }
 
-void ui_com::Send(char *buf, ssize_t size) {
+void ui_com::Send(char *buf, ssize_t size,int ttl) {
   if (connection_lost == true)
     return;
@@ -188 +188 @@
     if (compressBuffer(tosend, size, &out, &out_size, 9) == Z_OK) {
       size = out_size;
-      nb_write = UDT::sendmsg(socket_fd, out, size, -1, true);
+      nb_write = UDT::sendmsg(socket_fd, out, size,ttl, true);
       free(out);
     } else {
@@ -197 +197 @@
 
   if (!sendItCompressed) {
-    nb_write = UDT::sendmsg(socket_fd, tosend, size, -1, true);
+    nb_write = UDT::sendmsg(socket_fd, tosend, size, ttl, true);
   }
 
 #else // COMPRESS_FRAMES
-  nb_write = UDT::sendmsg(socket_fd, tosend, size, -1, true);
+  nb_write = UDT::sendmsg(socket_fd, tosend, size, ttl, true);
 #endif // COMPRESS_FRAMES
    //Printf("write %i %i\n",nb_write,size);
@@ -295 +295 @@
       if (offset != 3) {
         memcpy(&send_buffer[1], &resume_period, sizeof(uint16_t));
-        // printf("send %i %i %i %x %x\n",resume_period,offset,sizeof(uint16_t),send_buffer,&send_buffer[1]);
+        //printf("send %i %i %i %x %x\n",resume_period,offset,sizeof(uint16_t),send_buffer,&send_buffer[1]);
         // for(int i=0;i<offset;i++) printf("%x ",send_buffer[i]);
         // printf("\n");
-        Send(send_buffer, offset);
+        Send(send_buffer, offset,resume_period);
       }
 

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

@@ -39 +39 @@
   ui_com(const flair::core::Object *parent, UDTSOCKET sock);
   ~ui_com();
-  void Send(char *buf, ssize_t size);
+  void Send(char *buf, ssize_t size,int ttl = -1);//ttl in ms, -1 for infinite; not used in RT (todo!)
   ssize_t Receive(char *buf, ssize_t buf_size);
   void AddSendData(const flair::gui::SendData *obj);

trunk/lib/FlairVisionFilter/src/OpticalFlowData.cpp

@@ -103 +103 @@
 }
 
-void OpticalFlowData::CopyDatas(char* dst) const
+void OpticalFlowData::RawRead(char* dst) const
 {
     Warn("non implementé\n");

trunk/lib/FlairVisionFilter/src/OpticalFlowData.h

@@ -129 +129 @@
 
         OpticalFlowData::Type const &GetDataType() const {return dataType;}
+        
+        /*!
+        * \brief Raw read datas
+        *
+        * Reimplemented from io_data. \n
+        * See io_data::RawRead.
+        *
+        * \param dst destination buffer
+        */
+        void RawRead(char *dst) const;
 
     private:
@@ -137 +147 @@
         char *found_features;
         uint32_t *features_error;
-        void CopyDatas(char* dst) const;
         Type dataType;
     };