Changeset 314 in flair-src for trunk/demos/CircleFollower/uav

Timestamp:

Mar 21, 2019, 2:04:45 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

maj joystick

Location:

trunk/demos/CircleFollower/uav/src

Files:

• CircleFollower.cpp (modified) (2 diffs)
• main.cpp (modified) (1 diff)

trunk/demos/CircleFollower/uav/src/CircleFollower.cpp

@@ -19 +19 @@
 #include <DataPlot1D.h>
 #include <DataPlot2D.h>
-#include <MetaDualShock3.h>
 #include <FrameworkManager.h>
 #include <VrpnClient.h>
@@ -230 +229 @@
 void CircleFollower::ExtraCheckJoystick(void) {
     //R1 and Circle
-    if(GetJoystick()->IsButtonPressed(9) && GetJoystick()->IsButtonPressed(4) && (behaviourMode!=BehaviourMode_t::Circle)) {
+    if(GetTargetController()->IsButtonPressed(9) && GetTargetController()->IsButtonPressed(4) && (behaviourMode!=BehaviourMode_t::Circle)) {
         StartCircle();
     }
 
     //R1 and Cross
-    if(GetJoystick()->IsButtonPressed(9) && GetJoystick()->IsButtonPressed(5) && (behaviourMode==BehaviourMode_t::Circle)) {
+    if(GetTargetController()->IsButtonPressed(9) && GetTargetController()->IsButtonPressed(5) && (behaviourMode==BehaviourMode_t::Circle)) {
         StopCircle();
     }
     
     //R1 and Square
-    if(GetJoystick()->IsButtonPressed(9) && GetJoystick()->IsButtonPressed(2) && (behaviourMode==BehaviourMode_t::Default)) {
+    if(GetTargetController()->IsButtonPressed(9) && GetTargetController()->IsButtonPressed(2) && (behaviourMode==BehaviourMode_t::Default)) {
         VrpnPositionHold();
     }

trunk/demos/CircleFollower/uav/src/main.cpp

@@ -18 +18 @@
 #include <tclap/CmdLine.h>
 #include <TargetEthController.h>
-//#include <VisionFilter.h>
 
 using namespace TCLAP;