Changeset 314 in flair-src for trunk/demos/CircleFollower/uav/src/CircleFollower.cpp
- Timestamp:
- Mar 21, 2019, 2:04:45 PM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/demos/CircleFollower/uav/src/CircleFollower.cpp
r311 r314 19 19 #include <DataPlot1D.h> 20 20 #include <DataPlot2D.h> 21 #include <MetaDualShock3.h>22 21 #include <FrameworkManager.h> 23 22 #include <VrpnClient.h> … … 230 229 void CircleFollower::ExtraCheckJoystick(void) { 231 230 //R1 and Circle 232 if(Get Joystick()->IsButtonPressed(9) && GetJoystick()->IsButtonPressed(4) && (behaviourMode!=BehaviourMode_t::Circle)) {231 if(GetTargetController()->IsButtonPressed(9) && GetTargetController()->IsButtonPressed(4) && (behaviourMode!=BehaviourMode_t::Circle)) { 233 232 StartCircle(); 234 233 } 235 234 236 235 //R1 and Cross 237 if(Get Joystick()->IsButtonPressed(9) && GetJoystick()->IsButtonPressed(5) && (behaviourMode==BehaviourMode_t::Circle)) {236 if(GetTargetController()->IsButtonPressed(9) && GetTargetController()->IsButtonPressed(5) && (behaviourMode==BehaviourMode_t::Circle)) { 238 237 StopCircle(); 239 238 } 240 239 241 240 //R1 and Square 242 if(Get Joystick()->IsButtonPressed(9) && GetJoystick()->IsButtonPressed(2) && (behaviourMode==BehaviourMode_t::Default)) {241 if(GetTargetController()->IsButtonPressed(9) && GetTargetController()->IsButtonPressed(2) && (behaviourMode==BehaviourMode_t::Default)) { 243 242 VrpnPositionHold(); 244 243 }
Note:
See TracChangeset
for help on using the changeset viewer.