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


Ignore:
Timestamp:
01/09/18 11:43:37 (4 years ago)
Author:
Sanahuja Guillaume
Message:

m

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

Legend:

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

    r186 r206  
    7676  ((SimuUs *)GetUsRangeFinder())->Start();
    7777  ((SimuCamera *)GetVerticalCamera())->Start();
    78   ((SimuCamera *)GetHorizontalCamera())->Start();
     78  //((SimuCamera *)GetHorizontalCamera())->Start();
    7979  if(GetGps()) ((SimuGps *)GetGps())->Start();
    8080}
  • trunk/lib/FlairMeta/src/UavStateMachine.cpp

    r201 r206  
    469469    joy->SetZRef(0);
    470470
    471     uZ->SetOffset(); // positionne l'offset de compensation de la gravité à sa
     471    uZ->SetDefaultOffset(); // positionne l'offset de compensation de la gravité à sa
    472472                     // valeur initiale (station sol)
    473473
     
    761761  return true;
    762762}
     763
     764NestedSat* UavStateMachine::GetURoll(void) { return uRoll;};
     765NestedSat* UavStateMachine::GetUPitch(void) { return uPitch;};
     766Pid* UavStateMachine::GetUYaw(void) { return uYaw;};
     767PidThrust* UavStateMachine::GetUZ(void) { return uZ;};
     768TrajectoryGenerator1D * UavStateMachine::GetAltitudeTrajectory(void) { return altitudeTrajectory;};
  • trunk/lib/FlairMeta/src/UavStateMachine.h

    r167 r206  
    228228  const sensor::TargetController *GetJoystick(void) const;
    229229  MetaDualShock3 *joy;
     230 
     231  filter::NestedSat *GetURoll(void);
     232  filter::NestedSat *GetUPitch(void);
     233  filter::Pid *GetUYaw(void);
     234  filter::PidThrust *GetUZ(void);
     235  filter::TrajectoryGenerator1D *GetAltitudeTrajectory(void);
    230236
    231237  gui::Tab *setupLawTab, *graphLawTab;
Note: See TracChangeset for help on using the changeset viewer.