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


Ignore:
Timestamp:
03/21/19 11:30:17 (3 years ago)
Author:
Sanahuja Guillaume
Message:

maj thread

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

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairMeta/src/UavStateMachine.cpp

    r310 r313  
    124124}
    125125
    126 const TargetController *UavStateMachine::GetJoystick(void) const {
     126const TargetController *UavStateMachine::GetTargetController(void) const {
    127127    return controller;
     128}
     129
     130MetaDualShock3 *UavStateMachine::GetJoystick(void) const {
     131    return joy;
    128132}
    129133
  • trunk/lib/FlairMeta/src/UavStateMachine.h

    r206 r313  
    226226  void AddDataToControlLawLog(const core::io_data *data);
    227227
    228   const sensor::TargetController *GetJoystick(void) const;
    229   MetaDualShock3 *joy;
     228  const sensor::TargetController *GetTargetController(void) const;
     229  MetaDualShock3 *GetJoystick(void) const;
    230230 
    231231  filter::NestedSat *GetURoll(void);
     
    269269  bool IsValuePossible(float value,std::string desc);
    270270
    271   meta::Uav *uav;
     271  Uav *uav;
     272  MetaDualShock3 *joy;
    272273  sensor::TargetController *controller;
    273274
Note: See TracChangeset for help on using the changeset viewer.