Changeset 76 in flair-dev for trunk/include


Ignore:
Timestamp:
09/12/18 17:43:31 (6 years ago)
Author:
Sanahuja Guillaume
Message:

m

Location:
trunk/include
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/FlairCore/AhrsData.h

    r50 r76  
    161161private:
    162162  /*!
    163   * \brief Copy datas
     163  * \brief Raw read datas
    164164  *
    165165  * Reimplemented from io_data. \n
    166   * See io_data::CopyDatas.
     166  * See io_data::RawRead.
    167167  *
    168168  * \param dst destination buffer
    169169  */
    170   void CopyDatas(char *dst) const;
     170  void RawRead(char *dst) const;
    171171
    172172  void Queue(char **dst, const void *src, size_t size) const;

  • trunk/include/FlairCore/FrameworkManager.h

    r68 r76  
    7777  * \param rcv_buf_size receive buffer size
    7878  */
    79   void SetupConnection(std::string address, uint16_t port,Time watchdogTimeout=(Time)1000000000,
     79  void SetupConnection(std::string address, uint16_t port,Time watchdogTimeout=(Time)1500000000,
    8080                       size_t rcv_buf_size = 10000);
    8181

  • trunk/include/FlairCore/GeoCoordinate.h

    r13 r76  
    9696private:
    9797  /*!
    98   * \brief Copy datas
     98  * \brief Raw read datas
    9999  *
    100100  * Reimplemented from io_data. \n
    101   * See io_data::CopyDatas.
     101  * See io_data::RawRead.
    102102  *
    103103  * \param dst destination buffer
    104104  */
    105   void CopyDatas(char *ptr) const;
     105  void RawRead(char *ptr) const;
    106106
    107107  double latitude;

  • trunk/include/FlairCore/GpsData.h

    r50 r76  
    244244
    245245  Type const &GetDataType() const { return dataType; }
     246 
     247  /*!
     248  * \brief Raw read datas
     249  *
     250  * Reimplemented from io_data. \n
     251  * See io_data::RawRead.
     252  *
     253  * \param dst destination buffer
     254  */
     255  void RawRead(char *dst) const;
    246256
    247257private:
    248   /*!
    249   * \brief Copy datas
    250   *
    251   * Reimplemented from io_data. \n
    252   * See io_data::CopyDatas.
    253   *
    254   * \param dst destination buffer
    255   */
    256   void CopyDatas(char *dst) const;
    257 
    258258  void Queue(char **dst, const void *src, size_t size) const;
    259259  Type dataType;

  • trunk/include/FlairCore/ImuData.h

    r50 r76  
    186186private:
    187187  /*!
    188   * \brief Copy datas
     188  * \brief Raw read datas
    189189  *
    190190  * Reimplemented from io_data. \n
    191   * See io_data::CopyDatas.
     191  * See io_data::RawRead.
    192192  *
    193193  * \param dst destination buffer
    194194  */
    195   void CopyDatas(char *dst) const;
     195  void RawRead(char *dst) const;
    196196
    197197  /*!

  • trunk/include/FlairCore/Matrix.h

    r68 r76  
    194194
    195195  Type const &GetDataType() const { return dataType; };
    196 void CopyDatas(char *dst) const;
     196 
     197  /*!
     198  * \brief Raw read datas
     199  *
     200  * Reimplemented from io_data. \n
     201  * See io_data::RawRead.
     202  *
     203  * \param dst destination buffer
     204  */
     205  void RawRead(char *dst) const;
     206
     207  /*!
     208  * \brief Raw write datas
     209  *
     210  * Copy the source to the internal datas. Source must be of the corresponding size.
     211  *
     212  * \param src source buffer
     213  */
     214  void RawWrite(char *src);
     215 
    197216private:
    198   /*!
    199   * \brief Copy datas
    200   *
    201   * Reimplemented from io_data. \n
    202   * See io_data::CopyDatas.
    203   *
    204   * \param dst destination buffer
    205   */
    206   //void CopyDatas(char *dst) const;
    207 
    208217  class Matrix_impl *pimpl_;
    209218  Type dataType;

  • trunk/include/FlairCore/Vector3Ddata.h

    r50 r76  
    7878  *
    7979  * Reimplemented from io_data. \n
    80   * See io_data::CopyDatas.
     80  * See io_data::RawRead.
    8181  *
    8282  * \param dst destination buffer

  • trunk/include/FlairCore/cvimage.h

    r47 r76  
    108108private:
    109109  /*!
    110   * \brief Copy datas
     110  * \brief Raw read datas
    111111  *
    112112  * Reimplemented from io_data. \n
    113   * See io_data::CopyDatas.
     113  * See io_data::RawRead.
    114114  *
    115115  * \param dst destination buffer
    116116  */
    117   void CopyDatas(char *dst) const;
     117  void RawRead(char *dst) const;
    118118
    119119  bool allocate_data;

  • trunk/include/FlairCore/cvmatrix.h

    r50 r76  
    209209  *
    210210  * Reimplemented from io_data. \n
    211   * See io_data::CopyDatas.
     211  * See io_data::RawRead.
    212212  *
    213213  * \param dst destination buffer

  • trunk/include/FlairCore/io_data.h

    r68 r76  
    176176
    177177  virtual DataType const &GetDataType() const = 0;
     178 
     179  /*!
     180  * \brief Raw write datas
     181  *
     182  * Copy the source to the internal datas. Source must be of the corresponding size.
     183  *
     184  * \param src source buffer
     185  */
     186  virtual void RawWrite(char *src)  {};//todo put pure virtual
     187 
     188  /*!
     189  * \brief Raw read datas
     190  *
     191  * This method is automatically called by IODevice::ProcessUpdate to log
     192  * io_data datas. \n
     193  * This method must be reimplemented, in order to copy the datas to the logs.
     194  * Copy the internal datas to destination. Destination must be of the corresponding size.
     195  *
     196  * \param dst destination buffer
     197  */
     198  virtual void RawRead(char *dst) const = 0;
     199
    178200
    179201protected:
    … …  
    208230
    209231private:
    210   /*!
    211   * \brief Copy datas
    212   *
    213   * This method is automatically called by IODevice::ProcessUpdate to log
    214   *io_data datas. \n
    215   * This method must be reimplemented, in order to copy the datas to the logs.
    216   * Copied datas must be of size io_data::Size.
    217   *
    218   * \param dst destination buffer
    219   */
    220   virtual void CopyDatas(char *dst) const = 0;
    221 
    222232  io_data_impl *pimpl_;
    223233};

  • trunk/include/FlairFilter/Pid.h

    r13 r76  
    5858  */
    5959  void Reset(void);
     60 
     61   /*!
     62  * \brief Get intergral part
     63  *
     64  * \return current integral part
     65  */
     66  float GetIntegral(void) const;
     67
    6068
    6169  /*!

  • trunk/include/FlairSensorActuator/TargetController.h

    r68 r76  
    8282  // axis stuff
    8383  unsigned int axisNumber;
    84   core::Matrix *axis = NULL;
     84  core::Matrix *axis = nullptr;
    8585  virtual void AcquireAxisData(core::Matrix &axis) = 0; // responsible for
    8686                                                          // getting the axis
    … …  
    9090  // button stuff
    9191  unsigned int buttonNumber;
    92   core::Matrix *button = NULL;
     92  core::Matrix *button = nullptr;
    9393  virtual void AcquireButtonData(core::Matrix &button) = 0; // responsible for
    9494                                                              // getting the

  • trunk/include/FlairSensorActuator/TargetEthController.h

    r68 r76  
    7777  core::TcpSocket *listeningSocket;
    7878  int listeningPort;
    79   core::TcpSocket *controlSocket = NULL;
     79  core::TcpSocket *controlSocket = nullptr;
    8080  core::UdpSocket *dataSocket;
    81   std::string *axisName = NULL;
    82   std::string *buttonName = NULL;
     81  std::string *axisName = nullptr;
     82  std::string *buttonName = nullptr;
    8383  size_t dataFrameSize;
    8484  char *dataFrameBuffer;

  • trunk/include/FlairVisionFilter/OpticalFlowData.h

    r44 r76  
    129129
    130130        OpticalFlowData::Type const &GetDataType() const {return dataType;}
     131       
     132        /*!
     133        * \brief Raw read datas
     134        *
     135        * Reimplemented from io_data. \n
     136        * See io_data::RawRead.
     137        *
     138        * \param dst destination buffer
     139        */
     140        void RawRead(char *dst) const;
    131141
    132142    private:
    … …  
    137147        char *found_features;
    138148        uint32_t *features_error;
    139         void CopyDatas(char* dst) const;
    140149        Type dataType;
    141150    };
Note: See TracChangeset for help on using the changeset viewer.