Changeset 129 in flair-src


Ignore:
Timestamp:
Jan 19, 2017, 9:31:41 AM (4 years ago)
Author:
Sanahuja Guillaume
Message:

resolution bug vrpn client pas demarré

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/demos/CircleFollower/uav/src/CircleFollower.cpp

    r122 r129  
    4141CircleFollower::CircleFollower(TargetController *controller): UavStateMachine(controller), behaviourMode(BehaviourMode_t::Default), vrpnLost(false) {
    4242    Uav* uav=GetUav();
    43                
     43
    4444                VrpnClient* vrpnclient=new VrpnClient("vrpn", uav->GetDefaultVrpnAddress(),10000, 80);
    4545                uavVrpn = new MetaVrpnObject(uav->ObjectName());
    4646                getFrameworkManager()->AddDeviceToLog(uavVrpn);
    4747                uav->GetAhrs()->YawPlot()->AddCurve(uavVrpn->State()->Element(2),DataPlot::Green);
     48                vrpnclient->Start();
    4849                                                                                                                                 
    4950    startCircle=new PushButton(GetButtonsLayout()->NewRow(),"start_circle");
  • trunk/demos/SimpleFleet/uav/src/SimpleFleet.cpp

    r122 r129  
    5353    Uav* uav=GetUav();
    5454               
    55                 VrpnClient* vrpnclient=new VrpnClient("vrpn", uav->GetDefaultVrpnAddress(),10000, 80);
    56                 uavVrpn = new MetaVrpnObject(uav->ObjectName());
    57                 getFrameworkManager()->AddDeviceToLog(uavVrpn);
    58                 uav->GetAhrs()->YawPlot()->AddCurve(uavVrpn->State()->Element(2),DataPlot::Green);
     55        VrpnClient* vrpnclient=new VrpnClient("vrpn", uav->GetDefaultVrpnAddress(),10000, 80);
     56        uavVrpn = new MetaVrpnObject(uav->ObjectName());
     57        getFrameworkManager()->AddDeviceToLog(uavVrpn);
     58        uav->GetAhrs()->YawPlot()->AddCurve(uavVrpn->State()->Element(2),DataPlot::Green);
     59        vrpnclient->Start();
    5960
    6061    circle=new TrajectoryGenerator2DCircle(vrpnclient->GetLayout()->NewRow(),"circle");
  • trunk/lib/FlairMeta/src/UavStateMachine.cpp

    r122 r129  
    666666
    667667void UavStateMachine::EnterFailSafeMode(void) {
    668   SetAltitudeMode(AltitudeMode_t::Manual);
     668  if(altitudeState!=AltitudeState_t::StartLanding) SetAltitudeMode(AltitudeMode_t::Manual);//
    669669  SetOrientationMode(OrientationMode_t::Manual);
    670670  SetThrustMode(ThrustMode_t::Default);
Note: See TracChangeset for help on using the changeset viewer.