Changeset 32 in flair-dev for trunk/include/FlairSensorActuator


Ignore:
Timestamp:
Jul 29, 2016, 3:32:59 PM (8 years ago)
Author:
Sanahuja Guillaume
Message:

m

Location:
trunk/include/FlairSensorActuator
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/FlairSensorActuator/Imu.h

    r13 r32  
    1717
    1818namespace flair {
    19 namespace core {
    20 class ImuData;
    21 class OneAxisRotation;
    22 }
    23 namespace gui {
    24 class Tab;
    25 class TabWidget;
    26 class GroupBox;
    27 class Layout;
    28 class DataPlot1D;
    29 }
     19  namespace core {
     20    class ImuData;
     21    class OneAxisRotation;
     22  }
     23  namespace gui {
     24    class Tab;
     25    class TabWidget;
     26    class GroupBox;
     27    class Layout;
     28    class DataPlot1D;
     29  }
    3030}
    3131

  • trunk/include/FlairSensorActuator/Mb800.h

    r13 r32  
    1515
    1616#include <Thread.h>
    17 #include <Gps.h>
     17#include <NmeaGps.h>
    1818
    1919namespace flair {
    … …  
    3030* \brief Class for mb800 gps receiver
    3131*/
    32 class Mb800 : public core::Thread, public Gps {
     32class Mb800 : public core::Thread, public NmeaGps {
    3333public:
    3434  /*!
    … …  
    4444  */
    4545  Mb800(const core::FrameworkManager *parent, std::string name,
    46         core::SerialPort *serialport, Gps::NMEAFlags_t NMEAFlags,
     46        core::SerialPort *serialport, NmeaGps::NMEAFlags_t NMEAFlags,
    4747        uint8_t priority);
    4848

  • trunk/include/FlairSensorActuator/Novatel.h

    r13 r32  
    1515
    1616#include <Thread.h>
    17 #include <Gps.h>
     17#include <NmeaGps.h>
    1818
    1919namespace flair {
    … …  
    3030* \brief Class for Novatel gps receiver
    3131*/
    32 class Novatel : public core::Thread, public Gps {
     32class Novatel : public core::Thread, public NmeaGps {
    3333public:
    3434  /*!
    … …  
    4444  */
    4545  Novatel(const core::FrameworkManager *parent, std::string name,
    46           core::SerialPort *serialport, Gps::NMEAFlags_t NMEAFlags,
     46          core::SerialPort *serialport, NmeaGps::NMEAFlags_t NMEAFlags,
    4747          uint8_t priority);
    4848

  • trunk/include/FlairSensorActuator/SimuGps.h

    r13 r32  
    1515
    1616#include <Thread.h>
    17 #include <Gps.h>
     17#include <NmeaGps.h>
    1818
    1919namespace flair {
    20 namespace core {
    21 class FrameworkManager;
    22 }
     20  namespace core {
     21    class FrameworkManager;
     22    class SharedMem;
     23  }
     24  namespace gui {
     25    class SpinBox;
     26    class DoubleSpinBox;
     27  }
    2328}
    2429
    … …  
    2934* \brief Class for a simulation GPS
    3035*/
    31 class SimuGps : public core::Thread, public Gps {
     36class SimuGps : public core::Thread, public NmeaGps {
    3237public:
    3338  /*!
    3439  * \brief Constructor
    3540  *
    36   * Construct a Novatel.
     41  * Construct a simulation GPS. Control part.
    3742  *
    3843  * \param parent parent
    3944  * \param name name
    4045  * \param NMEAFlags NMEA sentances to enable
     46  * \param deviceId device id
    4147  * \param priority priority of the Thread
    4248  */
    4349  SimuGps(const core::FrameworkManager *parent, std::string name,
    44           Gps::NMEAFlags_t NMEAFlags, uint8_t priority);
     50          NmeaGps::NMEAFlags_t NMEAFlags, uint32_t deviceId,uint8_t priority);
     51
     52  /*!
     53  * \brief Constructor
     54  *
     55  * Construct a simulation GPS. Simulation part.\n
     56  * The Thread of this class should not be run.
     57  *
     58  * \param parent parent
     59  * \param name name
     60  * \param deviceId device id
     61  */
     62  SimuGps(const core::IODevice *parent, std::string name, uint32_t deviceId);
    4563
    4664  /*!
    … …  
    5876  * \param data data from the parent to process
    5977  */
    60   void UpdateFrom(const core::io_data *data){};
     78  void UpdateFrom(const core::io_data *data);
    6179
    6280  /*!
    … …  
    6785  */
    6886  void Run(void);
     87
     88  typedef struct {
     89    float x;
     90    float y;
     91    float z;
     92  } gps_states_t;
     93
     94  core::SharedMem *shmem;
     95  gui::SpinBox *dataRate,*fixQuality,*numberOfSatellites;
     96  gui::DoubleSpinBox *latitudeRef,*longitudeRef,*altitudeRef;
    6997};
    7098} // end namespace sensor

  • trunk/include/FlairSensorActuator/SimuImu.h

    r13 r32  
    1818
    1919namespace flair {
    20 namespace core {
    21 class SharedMem;
    22 class AhrsData;
    23 }
    24 namespace gui {
    25 class SpinBox;
    26 }
     20  namespace core {
     21    class SharedMem;
     22    class AhrsData;
     23  }
     24  namespace gui {
     25    class SpinBox;
     26  }
    2727}
    2828
    … …  
    9393    float wz;
    9494  } imu_states_t;
    95   gui::SpinBox *data_rate;
     95
     96  gui::SpinBox *dataRate;
    9697  core::SharedMem *shmem;
    9798  core::AhrsData *ahrsData;

  • trunk/include/FlairSensorActuator/Srf08.h

    r13 r32  
    4040  * \brief Constructor
    4141  *
    42   * Construct a SimuUs. Control part.
     42  * Construct a SRF08 sensor
    4343  *
    4444  * \param parent parent
Note: See TracChangeset for help on using the changeset viewer.