diff --git a/RELENTLESS/include/globals.hpp b/RELENTLESS/include/globals.hpp index 1fdb856..41920a4 100644 --- a/RELENTLESS/include/globals.hpp +++ b/RELENTLESS/include/globals.hpp @@ -3,17 +3,17 @@ #include "lemlib/api.hpp" namespace globals { - extern std::shared_ptr controller; + extern pros::Controller master; - extern okapi::Motor motor_fl; - extern okapi::Motor motor_ml; - extern okapi::Motor motor_bl; - extern okapi::Motor motor_fr; - extern okapi::Motor motor_mr; - extern okapi::Motor motor_br; + extern pros::Motor motor_fl; + extern pros::Motor motor_ml; + extern pros::Motor motor_bl; + extern pros::Motor motor_fr; + extern pros::Motor motor_mr; + extern pros::Motor motor_br; - extern std::shared_ptr leftDrive; - extern std::shared_ptr rightDrive; + extern pros::Motor_Group left_drive; + extern pros::Motor_Group right_drive; - extern std::shared_ptr chassis; + extern lemlib::Drivetrain_t drivetrain; } \ No newline at end of file diff --git a/RELENTLESS/src/main.cpp b/RELENTLESS/src/main.cpp index 685f2c9..c84bc3a 100644 --- a/RELENTLESS/src/main.cpp +++ b/RELENTLESS/src/main.cpp @@ -80,8 +80,7 @@ void autonomous() {} void opcontrol() { while (true) { - double leftX = globals::controller->getAnalog(ControllerAnalog::leftX); - double leftY = globals::controller->getAnalog(ControllerAnalog::leftY); + pros::delay(20); }