Changeset 165 in flair-src for trunk/lib/FlairMeta/src


Ignore:
Timestamp:
03/07/17 20:26:53 (5 years ago)
Author:
Sanahuja Guillaume
Message:

modifs

Location:
trunk/lib/FlairMeta/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairMeta/src/HdsX8.h

    r157 r165  
    3030        std::string GetDefaultVrpnAddress(void) const{return "192.168.147.197:3883";}
    3131  bool isReadyToFly(void) const;
     32  virtual std::string GetType(void) const{return "hds_x8";}
    3233
    3334private:
  • trunk/lib/FlairMeta/src/SimuX4.h

    r160 r165  
    3131    ~SimuX4();
    3232    void StartSensors(void);
     33    virtual std::string GetType(void) const{return "x4_simu";}
    3334
    3435  private:
  • trunk/lib/FlairMeta/src/SimuX8.h

    r160 r165  
    3030    ~SimuX8();
    3131    void StartSensors(void);
     32    virtual std::string GetType(void) const{return "simu_x8";}
    3233 
    3334  private:
  • trunk/lib/FlairMeta/src/Uav.h

    r157 r165  
    6464        virtual std::string GetDefaultVrpnAddress(void) const{return "127.0.0.1:3883";}
    6565  virtual bool isReadyToFly(void) const { return true;}
     66  virtual std::string GetType(void) const=0;
    6667
    6768protected:
  • trunk/lib/FlairMeta/src/UavStateMachine.h

    r122 r165  
    227227
    228228  const sensor::TargetController *GetJoystick(void) const;
     229  MetaDualShock3 *joy;
    229230
    230231  gui::Tab *setupLawTab, *graphLawTab;
     
    297298  filter::Pid *uYaw;
    298299  filter::PidThrust *uZ;
    299 
    300   MetaDualShock3 *joy;
    301300  filter::TrajectoryGenerator1D *altitudeTrajectory;
    302301};
  • trunk/lib/FlairMeta/src/XAir.h

    r157 r165  
    3030        std::string GetDefaultVrpnAddress(void) const{return "192.168.147.197:3883";}
    3131  bool isReadyToFly(void) const;
     32  virtual std::string GetType(void) const{return "xair";}
    3233
    3334private:
Note: See TracChangeset for help on using the changeset viewer.