Changeset 32 in flair-dev for trunk/include/FlairSensorActuator
- Timestamp:
- Jul 29, 2016, 3:32:59 PM (8 years ago)
- Location:
- trunk/include/FlairSensorActuator
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/FlairSensorActuator/Imu.h
r13 r32 17 17 18 18 namespace 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 } 30 30 } 31 31 -
trunk/include/FlairSensorActuator/Mb800.h
r13 r32 15 15 16 16 #include <Thread.h> 17 #include < Gps.h>17 #include <NmeaGps.h> 18 18 19 19 namespace flair { … … 30 30 * \brief Class for mb800 gps receiver 31 31 */ 32 class Mb800 : public core::Thread, public Gps {32 class Mb800 : public core::Thread, public NmeaGps { 33 33 public: 34 34 /*! … … 44 44 */ 45 45 Mb800(const core::FrameworkManager *parent, std::string name, 46 core::SerialPort *serialport, Gps::NMEAFlags_t NMEAFlags,46 core::SerialPort *serialport, NmeaGps::NMEAFlags_t NMEAFlags, 47 47 uint8_t priority); 48 48 -
trunk/include/FlairSensorActuator/Novatel.h
r13 r32 15 15 16 16 #include <Thread.h> 17 #include < Gps.h>17 #include <NmeaGps.h> 18 18 19 19 namespace flair { … … 30 30 * \brief Class for Novatel gps receiver 31 31 */ 32 class Novatel : public core::Thread, public Gps {32 class Novatel : public core::Thread, public NmeaGps { 33 33 public: 34 34 /*! … … 44 44 */ 45 45 Novatel(const core::FrameworkManager *parent, std::string name, 46 core::SerialPort *serialport, Gps::NMEAFlags_t NMEAFlags,46 core::SerialPort *serialport, NmeaGps::NMEAFlags_t NMEAFlags, 47 47 uint8_t priority); 48 48 -
trunk/include/FlairSensorActuator/SimuGps.h
r13 r32 15 15 16 16 #include <Thread.h> 17 #include < Gps.h>17 #include <NmeaGps.h> 18 18 19 19 namespace 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 } 23 28 } 24 29 … … 29 34 * \brief Class for a simulation GPS 30 35 */ 31 class SimuGps : public core::Thread, public Gps {36 class SimuGps : public core::Thread, public NmeaGps { 32 37 public: 33 38 /*! 34 39 * \brief Constructor 35 40 * 36 * Construct a Novatel.41 * Construct a simulation GPS. Control part. 37 42 * 38 43 * \param parent parent 39 44 * \param name name 40 45 * \param NMEAFlags NMEA sentances to enable 46 * \param deviceId device id 41 47 * \param priority priority of the Thread 42 48 */ 43 49 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); 45 63 46 64 /*! … … 58 76 * \param data data from the parent to process 59 77 */ 60 void UpdateFrom(const core::io_data *data) {};78 void UpdateFrom(const core::io_data *data); 61 79 62 80 /*! … … 67 85 */ 68 86 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; 69 97 }; 70 98 } // end namespace sensor -
trunk/include/FlairSensorActuator/SimuImu.h
r13 r32 18 18 19 19 namespace 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 } 27 27 } 28 28 … … 93 93 float wz; 94 94 } imu_states_t; 95 gui::SpinBox *data_rate; 95 96 gui::SpinBox *dataRate; 96 97 core::SharedMem *shmem; 97 98 core::AhrsData *ahrsData; -
trunk/include/FlairSensorActuator/Srf08.h
r13 r32 40 40 * \brief Constructor 41 41 * 42 * Construct a S imuUs. Control part.42 * Construct a SRF08 sensor 43 43 * 44 44 * \param parent parent
Note:
See TracChangeset
for help on using the changeset viewer.