From 641f91b757de168bc54234aab94f883bc6959377 Mon Sep 17 00:00:00 2001 From: ary Date: Thu, 5 Oct 2023 19:36:53 -0400 Subject: [PATCH] ITS ALIVEEEEEEEEEEEEE --- RELENTLESS/src/globals.cpp | 20 ++++++++++---------- RELENTLESS/src/superstructure.cpp | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/RELENTLESS/src/globals.cpp b/RELENTLESS/src/globals.cpp index 9e6b839..e25b142 100644 --- a/RELENTLESS/src/globals.cpp +++ b/RELENTLESS/src/globals.cpp @@ -5,14 +5,14 @@ namespace globals { // Chassis pros::Controller master(CONTROLLER_MASTER); - pros::Motor motor_tlf(4, MOTOR_GEARSET_06, true); - pros::Motor motor_tlb(4, MOTOR_GEARSET_06, true); - pros::Motor motor_blf(4, MOTOR_GEARSET_06, true); - pros::Motor motor_blb(5, MOTOR_GEARSET_06, true); - pros::Motor motor_trf(4, MOTOR_GEARSET_06, true); - pros::Motor motor_trb(3, MOTOR_GEARSET_06, true); - pros::Motor motor_brf(4, MOTOR_GEARSET_06, true); - pros::Motor motor_brb(4, MOTOR_GEARSET_06, true); + pros::Motor motor_tlf(12, MOTOR_GEARSET_06, false); + pros::Motor motor_blb(6, MOTOR_GEARSET_06, true); + pros::Motor motor_blf(2, MOTOR_GEARSET_06, true); + pros::Motor motor_tlb(5, MOTOR_GEARSET_06, false); + pros::Motor motor_trf(16, MOTOR_GEARSET_06, true); + pros::Motor motor_trb(3, MOTOR_GEARSET_06, true);// + pros::Motor motor_brf(1, MOTOR_GEARSET_06, false); + pros::Motor motor_brb(4, MOTOR_GEARSET_06, false); pros::Motor_Group left_drive({ motor_tlf, motor_tlb, motor_blf, motor_blb }); pros::Motor_Group right_drive({ motor_trf, motor_trb, motor_brf, motor_brb }); @@ -41,8 +41,8 @@ namespace globals { lemlib::TrackingWheel hroiz_tracking_wheel(&rot_horiz, WHEEL_SIZE, PLACEHOLDER_TC_OFFSET, 1); Drive chassis( - {-4,-4,-4,-5}, - {1,1,1,3}, + {-2, -6, 12, 5}, + {-16, 1, 4, -3}, 16, WHEEL_SIZE, 600, diff --git a/RELENTLESS/src/superstructure.cpp b/RELENTLESS/src/superstructure.cpp index 60f4451..e0afc48 100644 --- a/RELENTLESS/src/superstructure.cpp +++ b/RELENTLESS/src/superstructure.cpp @@ -152,7 +152,7 @@ namespace superstruct { } if (globals::master.get_digital(DIGITAL_R1)) { - runCata(12000); + runCata(-12000); } else { runCata(0); }