From 9cadf951d1f8af73f0f08e4b6440ffa34b22bb9b Mon Sep 17 00:00:00 2001 From: ary Date: Tue, 17 Oct 2023 23:49:29 -0400 Subject: [PATCH] update --- RELENTLESS/include/globals.hpp | 3 ++- RELENTLESS/src/main.cpp | 23 ++++------------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/RELENTLESS/include/globals.hpp b/RELENTLESS/include/globals.hpp index 1dea796..6abe932 100644 --- a/RELENTLESS/include/globals.hpp +++ b/RELENTLESS/include/globals.hpp @@ -53,6 +53,7 @@ namespace globals { enum e_controlsch { RENU, - RIA + RIA, + CHRIS }; } \ No newline at end of file diff --git a/RELENTLESS/src/main.cpp b/RELENTLESS/src/main.cpp index 20f8958..f591bd9 100644 --- a/RELENTLESS/src/main.cpp +++ b/RELENTLESS/src/main.cpp @@ -6,22 +6,6 @@ using namespace superstruct; e_controlsch currentuser = RENU; -/** - * A callback function for LLEMU's center button. - * - * When this callback is fired, it will toggle line 2 of the LCD text between - * "I was pressed!" and nothing. - */ -void on_center_button() { - static bool pressed = false; - pressed = !pressed; - if (pressed) { - pros::lcd::set_text(2, "I was pressed!"); - } else { - pros::lcd::clear_line(2); - } -} - /** * Runs initialization code. This occurs as soon as the program is started. * @@ -98,13 +82,14 @@ void opcontrol() { opControlInit(); while (true) { - chassis.tank_control(); - if (currentuser == RENU) { + chassis.tank_control(); renu_control(); } else if (currentuser = RIA) { + chassis.tank_control(); ria_control(); - } else { + } else if (currentuser == CHRIS) { + chassis.arcade_standard(ary::SPLIT, ary::DEFAULT); renu_control(); }