Changeset 171 in flair-src for trunk/demos/CircleFollower/uav
- Timestamp:
- Apr 24, 2017, 3:26:56 PM (7 years ago)
- Location:
- trunk/demos/CircleFollower/uav/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/demos/CircleFollower/uav/src/CircleFollower.cpp
r168 r171 49 49 startCircle=new PushButton(GetButtonsLayout()->NewRow(),"start_circle"); 50 50 stopCircle=new PushButton(GetButtonsLayout()->LastRowLastCol(),"stop_circle"); 51 positionHold=new PushButton(GetButtonsLayout()->LastRowLastCol(),"position hold"); 51 52 52 53 if(vrpnclient->UseXbee()==true) { … … 216 217 StopCircle(); 217 218 } 219 if(positionHold->Clicked() && (behaviourMode==BehaviourMode_t::Default)) { 220 VrpnPositionHold(); 221 } 218 222 } 219 223 … … 227 231 if(GetJoystick()->IsButtonPressed(9) && GetJoystick()->IsButtonPressed(5) && (behaviourMode==BehaviourMode_t::Circle)) { 228 232 StopCircle(); 233 } 234 235 //R1 and Square 236 if(GetJoystick()->IsButtonPressed(9) && GetJoystick()->IsButtonPressed(2) && (behaviourMode==BehaviourMode_t::Default)) { 237 VrpnPositionHold(); 229 238 } 230 239 } -
trunk/demos/CircleFollower/uav/src/CircleFollower.h
r167 r171 64 64 float yawHold; 65 65 66 flair::gui::PushButton *startCircle,*stopCircle ;66 flair::gui::PushButton *startCircle,*stopCircle,*positionHold; 67 67 flair::meta::MetaVrpnObject *targetVrpn,*uavVrpn; 68 68 flair::filter::TrajectoryGenerator2DCircle *circle;
Note:
See TracChangeset
for help on using the changeset viewer.