Changeset 129 in flair-src
- Timestamp:
- Jan 19, 2017, 9:31:41 AM (8 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/demos/CircleFollower/uav/src/CircleFollower.cpp
r122 r129 41 41 CircleFollower::CircleFollower(TargetController *controller): UavStateMachine(controller), behaviourMode(BehaviourMode_t::Default), vrpnLost(false) { 42 42 Uav* uav=GetUav(); 43 43 44 44 VrpnClient* vrpnclient=new VrpnClient("vrpn", uav->GetDefaultVrpnAddress(),10000, 80); 45 45 uavVrpn = new MetaVrpnObject(uav->ObjectName()); 46 46 getFrameworkManager()->AddDeviceToLog(uavVrpn); 47 47 uav->GetAhrs()->YawPlot()->AddCurve(uavVrpn->State()->Element(2),DataPlot::Green); 48 vrpnclient->Start(); 48 49 49 50 startCircle=new PushButton(GetButtonsLayout()->NewRow(),"start_circle"); -
trunk/demos/SimpleFleet/uav/src/SimpleFleet.cpp
r122 r129 53 53 Uav* uav=GetUav(); 54 54 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(); 59 60 60 61 circle=new TrajectoryGenerator2DCircle(vrpnclient->GetLayout()->NewRow(),"circle"); -
trunk/lib/FlairMeta/src/UavStateMachine.cpp
r122 r129 666 666 667 667 void UavStateMachine::EnterFailSafeMode(void) { 668 SetAltitudeMode(AltitudeMode_t::Manual);668 if(altitudeState!=AltitudeState_t::StartLanding) SetAltitudeMode(AltitudeMode_t::Manual);// 669 669 SetOrientationMode(OrientationMode_t::Manual); 670 670 SetThrustMode(ThrustMode_t::Default);
Note:
See TracChangeset
for help on using the changeset viewer.