From ed00616eed05d2fe06340f0a9aa62e63008402cc Mon Sep 17 00:00:00 2001 From: ary Date: Mon, 4 Sep 2023 13:37:03 -0400 Subject: [PATCH] use okapi controller --- RELENTLESS/include/globals.hpp | 2 +- RELENTLESS/include/main.h | 2 +- RELENTLESS/src/globals.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RELENTLESS/include/globals.hpp b/RELENTLESS/include/globals.hpp index 68bdc76..53f0ddf 100644 --- a/RELENTLESS/include/globals.hpp +++ b/RELENTLESS/include/globals.hpp @@ -3,5 +3,5 @@ #include "lemlib/api.hpp" namespace globals { - extern pros::Controller controller; + extern Controller controller; } \ No newline at end of file diff --git a/RELENTLESS/include/main.h b/RELENTLESS/include/main.h index ec8d377..e9cf6f3 100644 --- a/RELENTLESS/include/main.h +++ b/RELENTLESS/include/main.h @@ -53,7 +53,7 @@ */ // using namespace pros; // using namespace pros::literals; -// using namespace okapi; +using namespace okapi; /** * Prototypes for the competition control tasks are redefined here to ensure diff --git a/RELENTLESS/src/globals.cpp b/RELENTLESS/src/globals.cpp index 24e9d83..7d88e9a 100644 --- a/RELENTLESS/src/globals.cpp +++ b/RELENTLESS/src/globals.cpp @@ -1,7 +1,7 @@ #include "globals.hpp" namespace globals { - pros::Controller controller(pros::E_CONTROLLER_MASTER); + Controller controller(ControllerId::master); // Chassis