Changeset 68 in flair-dev for trunk/include/FlairSensorActuator
- Timestamp:
- Mar 6, 2018, 12:14:17 PM (7 years ago)
- Location:
- trunk/include/FlairSensorActuator
- Files:
-
- 1 added
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/FlairSensorActuator/BlCtrlV2_x4_speed.h
r50 r68 24 24 namespace flair { 25 25 namespace core { 26 class cvmatrix;26 class Matrix; 27 27 class I2cPort; 28 28 } … … 97 97 98 98 // matrix 99 core:: cvmatrix *input;100 core:: cvmatrix *output;99 core::Matrix *input; 100 core::Matrix *output; 101 101 102 102 int tested_motor; -
trunk/include/FlairSensorActuator/Bldc.h
r50 r68 19 19 namespace flair { 20 20 namespace core { 21 class cvmatrix;21 class Matrix; 22 22 } 23 23 namespace gui { … … 96 96 * 97 97 */ 98 core:: cvmatrix *Output(void) const;98 core::Matrix *Output(void) const; 99 99 100 100 /*! … … 161 161 162 162 protected: 163 core:: cvmatrix *output;163 core::Matrix *output; 164 164 165 165 private: -
trunk/include/FlairSensorActuator/EmulatedController.h
r50 r68 21 21 namespace flair { 22 22 namespace core { 23 class cvmatrix;23 class Matrix; 24 24 } 25 25 namespace gui { … … 52 52 bool ProcessMessage(core::Message *msg); 53 53 bool IsDataFrameReady(); 54 void AcquireAxisData(core:: cvmatrix &axis); //responsible for getting the axis data from the hardware55 void AcquireButtonData(core:: cvmatrix &button); //responsible for getting the button data from the hardware54 void AcquireAxisData(core::Matrix &axis); //responsible for getting the axis data from the hardware 55 void AcquireButtonData(core::Matrix &button); //responsible for getting the button data from the hardware 56 56 bool ControllerInitialization(); 57 57 58 58 private: 59 59 enum class DataType { axis,button }; 60 void ComputeControllerData(DataType dataType, core:: cvmatrix &data);61 template<typename T> void fillVectorNoMutex(core:: cvmatrix &vector,T data[],unsigned int size);62 void fillVectorNoMutex(core:: cvmatrix &destination,core::cvmatrix &source,unsigned int size);60 void ComputeControllerData(DataType dataType, core::Matrix &data); 61 template<typename T> void fillVectorNoMutex(core::Matrix &vector,T data[],unsigned int size); 62 void fillVectorNoMutex(core::Matrix &destination,core::Matrix &source,unsigned int size); 63 63 struct StepData { 64 64 unsigned int durationMs; //milliseconds 65 core:: cvmatrix *axisData;66 core:: cvmatrix *buttonData;65 core::Matrix *axisData; 66 core::Matrix *buttonData; 67 67 std::string description; 68 68 void Print(); -
trunk/include/FlairSensorActuator/HokuyoUTM30Lx.h
r50 r68 23 23 namespace flair { 24 24 namespace core { 25 class cvmatrix;25 class Matrix; 26 26 class SerialPort; 27 27 class Mutex; … … 56 56 void getMesure(int startStep, int endStep, int clusterCount, int interval, 57 57 int scanNumber = 0); 58 core:: cvmatrix *getDatas(void);58 core::Matrix *getDatas(void); 59 59 60 60 /*! … … 78 78 79 79 // matrix 80 core:: cvmatrix *output;80 core::Matrix *output; 81 81 82 82 std::queue<std::string> bufRet; -
trunk/include/FlairSensorActuator/HostEthController.h
r50 r68 26 26 namespace flair { 27 27 namespace core { 28 class cvmatrix;28 class Matrix; 29 29 class TcpSocket; 30 30 class UdpSocket; … … 81 81 GetAxisData() = 0; // responsible for getting the axis data from the hardware 82 82 unsigned int axisNumber; 83 core:: cvmatrix *axis;83 core::Matrix *axis; 84 84 gui::DataPlot1D **axisPlot; 85 85 uint32_t bitsPerAxis; … … 90 90 // from the hardware 91 91 unsigned int buttonNumber; 92 core:: cvmatrix *button;92 core::Matrix *button; 93 93 uint8_t buttonOffset; 94 94 bool meaningfulDataAvailable; -
trunk/include/FlairSensorActuator/LaserRangeFinder.h
r50 r68 19 19 namespace core { 20 20 class FrameworkManager; 21 class cvmatrix;21 class Matrix; 22 22 } 23 23 namespace gui { … … 102 102 * \return output matrix 103 103 */ 104 core:: cvmatrix *output;104 core::Matrix *output; 105 105 106 106 /*! -
trunk/include/FlairSensorActuator/RadioReceiver.h
r50 r68 19 19 namespace flair { 20 20 namespace core { 21 class cvmatrix;21 class Matrix; 22 22 } 23 23 namespace gui { … … 87 87 void UpdateFrom(const core::io_data *data){}; 88 88 89 core:: cvmatrix *output;89 core::Matrix *output; 90 90 bool is_connected; 91 91 unsigned int nb_channels; -
trunk/include/FlairSensorActuator/SimuBldc.h
r50 r68 20 20 class SharedMem; 21 21 class IODevice; 22 class cvmatrix;22 class Matrix; 23 23 } 24 24 namespace gui { … … 40 40 * \brief Constructor 41 41 * 42 * Construct a SimuBldc . Control part.42 * Construct a SimuBldc 43 43 * 44 44 * \param parent parent … … 53 53 54 54 /*! 55 * \brief Constructor56 *57 * Construct a SimuBldc. Simulation part.58 *59 * \param parent parent60 * \param name name61 * \param motors_count number of motors62 * \param modelId Model id63 * \param deviceId Bldc id of the Model64 */65 SimuBldc(const core::Object *parent, std::string name, uint8_t motors_count,66 uint32_t modelId,uint32_t deviceId);67 68 /*!69 55 * \brief Destructor 70 56 * 71 57 */ 72 58 ~SimuBldc(); 73 74 /*!75 * \brief Get motors speeds.76 *77 * This function should only be used for the simulation part.78 *79 * \param value array to store motors speeds80 */81 void GetSpeeds(float *value) const;82 59 83 60 /*! … … 113 90 core::SharedMem *shmem; 114 91 gui::DoubleSpinBox *k; 92 char *buf; 93 115 94 }; 116 95 } // end namespace actuator -
trunk/include/FlairSensorActuator/SimuCamera.h
r50 r68 35 35 * \brief Constructor 36 36 * 37 * Construct a SimuCamera. Control part.37 * Construct a SimuCamera. 38 38 * It will be child of the FrameworkManager. 39 39 * … … 50 50 uint8_t priority); 51 51 52 /*!53 * \brief Constructor54 *55 * Construct a SimuCamera. Simulation part.\n56 * The Thread of this class should not be run.57 *58 * \param parent parent59 * \param name name60 * \param width width61 * \param height height62 * \param channels number of channels63 * \param modelId Model id64 * \param deviceId Camera id of the Model65 */66 SimuCamera(const core::IODevice *parent, std::string name, uint16_t width,67 uint16_t height, uint8_t channels, uint32_t modelId,uint32_t deviceId);68 52 69 53 /*! -
trunk/include/FlairSensorActuator/SimuGps.h
r62 r68 38 38 * \brief Constructor 39 39 * 40 * Construct a simulation GPS . Control part.40 * Construct a simulation GPS 41 41 * It will be child of the FrameworkManager. 42 42 * … … 49 49 SimuGps(std::string name, 50 50 NmeaGps::NMEAFlags_t NMEAFlags, uint32_t modelId,uint32_t deviceId,uint8_t priority); 51 52 /*!53 * \brief Constructor54 *55 * Construct a simulation GPS. Simulation part.\n56 * The Thread of this class should not be run.57 *58 * \param parent parent59 * \param name name60 * \param modelId Model id61 * \param deviceId Gps id of the Model62 */63 SimuGps(const core::IODevice *parent, std::string name, uint32_t modelId,uint32_t deviceId);64 51 65 52 /*! … … 77 64 * \param data data from the parent to process 78 65 */ 79 void UpdateFrom(const core::io_data *data) ;66 void UpdateFrom(const core::io_data *data){}; 80 67 81 68 /*! -
trunk/include/FlairSensorActuator/SimuImu.h
r56 r68 38 38 * \brief Constructor 39 39 * 40 * Construct a SimuImu. Control part.40 * Construct a SimuImu. 41 41 * It will be child of the FrameworkManager. 42 42 * … … 48 48 SimuImu(std::string name, 49 49 uint32_t modelId,uint32_t deviceId, uint8_t priority); 50 51 /*!52 * \brief Constructor53 *54 * Construct a SimuImu. Simulation part.\n55 * The Thread of this class should not be run.56 *57 * \param parent parent58 * \param name name59 * \param modelId Model id60 * \param deviceId Imu id of the Model61 */62 SimuImu(const core::IODevice *parent, std::string name, uint32_t modelId,uint32_t deviceId);63 50 64 51 /*! … … 84 71 * \param data data from the parent to process 85 72 */ 86 void UpdateFrom(const core::io_data *data) ;73 void UpdateFrom(const core::io_data *data){}; 87 74 88 75 typedef struct { -
trunk/include/FlairSensorActuator/SimuLaser.h
r50 r68 37 37 * \brief Constructor 38 38 * 39 * Construct a SimuUs. Control part. 40 * It will be child of the FrameworkManager. 39 * Construct a SimuUs. 41 40 * 42 41 * \param name name … … 47 46 SimuLaser(std::string name, 48 47 uint32_t modelId,uint32_t deviceId, uint8_t priority); 49 50 /*!51 * \brief Constructor52 *53 * Construct a SimuUs. Simulation part.\n54 * The Thread of this class should not be run.55 *56 * \param parent parent57 * \param name name58 * \param modelId Model id59 * \param deviceId LaserRangeFinder id of the Model60 */61 SimuLaser(const core::IODevice *parent, std::string name, uint32_t modelId,uint32_t deviceId);62 48 63 49 /*! -
trunk/include/FlairSensorActuator/SimuUs.h
r50 r68 37 37 * \brief Constructor 38 38 * 39 * Construct a SimuUs. Control part.39 * Construct a SimuUs. 40 40 * It will be child of the FrameworkManager. 41 41 * … … 47 47 SimuUs(std::string name, 48 48 uint32_t modelId,uint32_t deviceId, uint8_t priority); 49 50 /*!51 * \brief Constructor52 *53 * Construct a SimuUs. Simulation part.\n54 * The Thread of this class should not be run.55 *56 * \param parent parent57 * \param name name58 * \param modelId Model id59 * \param deviceId UsRangeFinder id of the Model60 */61 SimuUs(const core::IODevice *parent, std::string name, uint32_t modelId,uint32_t deviceId);62 49 63 50 /*! -
trunk/include/FlairSensorActuator/TargetController.h
r50 r68 27 27 namespace core { 28 28 class FrameworkManager; 29 class cvmatrix;29 class Matrix; 30 30 class Socket; 31 31 class io_data; … … 82 82 // axis stuff 83 83 unsigned int axisNumber; 84 core:: cvmatrix *axis = NULL;85 virtual void AcquireAxisData(core:: cvmatrix &axis) = 0; // responsible for84 core::Matrix *axis = NULL; 85 virtual void AcquireAxisData(core::Matrix &axis) = 0; // responsible for 86 86 // getting the axis 87 87 // data from the … … 90 90 // button stuff 91 91 unsigned int buttonNumber; 92 core:: cvmatrix *button = NULL;93 virtual void AcquireButtonData(core:: cvmatrix &button) = 0; // responsible for92 core::Matrix *button = NULL; 93 virtual void AcquireButtonData(core::Matrix &button) = 0; // responsible for 94 94 // getting the 95 95 // button data -
trunk/include/FlairSensorActuator/TargetEthController.h
r50 r68 27 27 namespace core { 28 28 class FrameworkManager; 29 class cvmatrix;29 class Matrix; 30 30 class TcpSocket; 31 31 class UdpSocket; … … 62 62 63 63 bool IsDataFrameReady(); 64 void AcquireAxisData(core:: cvmatrix &axis); // responsible for getting the64 void AcquireAxisData(core::Matrix &axis); // responsible for getting the 65 65 // axis data from the hardware 66 void AcquireButtonData(core:: cvmatrix &button); // responsible for getting the66 void AcquireButtonData(core::Matrix &button); // responsible for getting the 67 67 // button data from the 68 68 // hardware -
trunk/include/FlairSensorActuator/UsRangeFinder.h
r50 r68 17 17 18 18 namespace flair { 19 namespace core {20 class cvmatrix;21 }22 namespace gui {23 class Tab;24 class TabWidget;25 class GroupBox;26 class Layout;27 class DataPlot1D;28 }19 namespace core { 20 class Matrix; 21 } 22 namespace gui { 23 class Tab; 24 class TabWidget; 25 class GroupBox; 26 class Layout; 27 class DataPlot1D; 28 } 29 29 } 30 30 … … 105 105 */ 106 106 gui::Tab *GetPlotTab(void) const; 107 108 /*! 109 * \brief Tab widget 110 * 111 * \return tab widget 112 */ 113 gui::TabWidget *GetTabWidget(void) const; 107 114 108 115 /*! … … 119 126 * \return output matrix 120 127 */ 121 core:: cvmatrix *output;128 core::Matrix *output; 122 129 123 130 /*! -
trunk/include/FlairSensorActuator/VrpnObject.h
r50 r68 21 21 namespace flair { 22 22 namespace core { 23 class cvmatrix;23 class Matrix; 24 24 class Quaternion; 25 25 } … … 126 126 * \return Output matrix 127 127 */ 128 core:: cvmatrix *Output(void) const;128 core::Matrix *Output(void) const; 129 129 130 130 /*! … … 139 139 * \return State matrix 140 140 */ 141 core:: cvmatrix *State(void) const;141 core::Matrix *State(void) const; 142 142 143 143 /*!
Note:
See TracChangeset
for help on using the changeset viewer.