Skip to content

Commit

Permalink
grr
Browse files Browse the repository at this point in the history
  • Loading branch information
NoozAbooz committed May 22, 2024
1 parent 5eba3df commit 1d36c2c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
11 changes: 8 additions & 3 deletions src/init/declaration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,20 @@ pros::ADIPotentiometer potentiometer('G');

pros::Imu inertial(2);
pros::Imu inertial2(3);
// pros::Rotation verticalEnc(15, true);
// lemlib::TrackingWheel vertical(&verticalEnc, lemlib::Omniwheel::NEW_275, -3.7);

pros::Rotation verticalEncoder(15, true);
pros::Rotation horizontalEncoder(16, true);
// horizontal tracking wheel
lemlib::TrackingWheel vertical_tracking_wheel(&verticalEncoder, lemlib::Omniwheel::NEW_275, -5.75);
// vertical tracking wheel
lemlib::TrackingWheel horizontal_tracking_wheel(&horizontalEncoder, lemlib::Omniwheel::NEW_275, -2.5);

// drivetrain settings
lemlib::Drivetrain drivetrain(&leftDrive, // left motor group
&rightDrive, // right motor group
10.5, // 25 hole track width
lemlib::Omniwheel::NEW_325,
450, // drivetrain rpm
360, // drivetrain rpm
2 // chase power is 2. If we had traction wheels, it would have been 8
);
// lateral motion controller
Expand Down
3 changes: 1 addition & 2 deletions src/init/initialize.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
void initialize() {
pros::delay(10);

static Gif gif("/usd/logo2.gif", lv_scr_act());
strait::selector::init();

pros::Task bruh(strait::calibrateIMU);
pros::Task straitOdomTask(strait::calibrateIMU);
chassis.calibrate();
pros::Task odomTask(strait::odomThread);

Expand Down
1 change: 1 addition & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* the task from where it left off.
*/
void opcontrol() {
static Gif gif("/usd/logo2.gif", lv_scr_act());
while (true) { // Main continuous loop
/* Drive */
strait::arcadeDrive(12, 0, 0.5);
Expand Down

0 comments on commit 1d36c2c

Please sign in to comment.