That-One-Nerd/ary-over-under
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update auton and driver controls

Browse Source
This commit is contained in:
ary 2023-09-16 12:35:18 -04:00
parent 40242eba20
commit fa481b9601
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
RELENTLESS-Lite/src/autons.cpp
View File

@ -16,8 +16,8 @@ void default_constants() {
chassis.set_slew_min_power(80, 80); chassis.set_slew_min_power(80, 80);
chassis.set_slew_distance(7, 7); chassis.set_slew_distance(7, 7);
chassis.set_pid_constants(&chassis.headingPID, 11, 0, 20, 0); chassis.set_pid_constants(&chassis.headingPID, 11, 0, 20, 0);
chassis.set_pid_constants(&chassis.forward_drivePID, 0.45, 0, 5, 0); chassis.set_pid_constants(&chassis.forward_drivePID, 2, 0, 5, 0);
chassis.set_pid_constants(&chassis.backward_drivePID, 0.45, 0, 5, 0); chassis.set_pid_constants(&chassis.backward_drivePID, 2, 0, 5, 0);
chassis.set_pid_constants(&chassis.turnPID, 4, 0.003, 35, 15); chassis.set_pid_constants(&chassis.turnPID, 4, 0.003, 35, 15);
chassis.set_pid_constants(&chassis.swingPID, 6, 0, 40, 0); chassis.set_pid_constants(&chassis.swingPID, 6, 0, 40, 0);
} }
@ -33,14 +33,13 @@ void exit_condition_defaults() {
// ** AUTONS ** // // ** AUTONS ** //
void test_auton() { void test_auton() {
chassis.set_drive_pid(5, DRIVE_SPEED, false, true); chassis.set_drive_pid(48, DRIVE_SPEED, true, true);
chassis.set_swing_pid(e_swing::LEFT_SWING, 50, TURN_SPEED); chassis.wait_drive();
chassis.set_drive_pid(36, DRIVE_SPEED, true, true); chassis.set_turn_pid(-45, TURN_SPEED);
chassis.wait_until(24); chassis.wait_drive();
/* RUN THE INTAKE */ chassis.set_drive_pid(48, DRIVE_SPEED, true, true);
pros::delay(500); chassis.wait_drive();
chassis.set_drive_pid(-2, DRIVE_SPEED, false, false); chassis.set_drive_pid(-10, DRIVE_SPEED, false, true);
chassis.set_turn_pid(130, TURN_SPEED); chassis.wait_drive();
chassis.set_turn_pid(90, TURN_SPEED);
//pros::task_t intakeTask(run_intake_for, (void*) malloc(sizeof(double)), TASK_PRIORITY_DEFAULT, TASK_STACK_DEPTH_DEFAULT, "runIntakeFor");
} }

17
RELENTLESS-Lite/src/globals.cpp
View File

@ -5,16 +5,19 @@ namespace globals {
// Chassis // Chassis
pros::Controller master(CONTROLLER_MASTER); pros::Controller master(CONTROLLER_MASTER);
pros::Motor motor_fl(4, MOTOR_GEARSET_6, true); pros::Motor motor_fl(8, MOTOR_GEARSET_6, true);
pros::Motor motor_ml(4, MOTOR_GEARSET_6, true); pros::Motor motor_ml(17, MOTOR_GEARSET_6, true);
pros::Motor motor_bl(4, MOTOR_GEARSET_6, true); pros::Motor motor_bl(7, MOTOR_GEARSET_6, false);
pros::Motor motor_fr(4, MOTOR_GEARSET_6, true); pros::Motor motor_fr(11, MOTOR_GEARSET_6, false);
pros::Motor motor_mr(4, MOTOR_GEARSET_6, true); pros::Motor motor_mr(20, MOTOR_GEARSET_6, false);
pros::Motor motor_br(4, MOTOR_GEARSET_6, true); pros::Motor motor_br(4, MOTOR_GEARSET_6, true);
pros::Motor_Group left_drive({ motor_fl, motor_ml, motor_bl }); pros::Motor_Group left_drive({ motor_fl, motor_ml, motor_bl });
pros::Motor_Group right_drive({ motor_fr, motor_mr, motor_br }); pros::Motor_Group right_drive({ motor_fr, motor_mr, motor_br });
/*
Two seperate drivetrains, chassis
*/
lemlib::Drivetrain_t chassis_odom { lemlib::Drivetrain_t chassis_odom {
&left_drive, &left_drive,
&right_drive, &right_drive,
@ -30,7 +33,7 @@ namespace globals {
3.25, 3.25,
600, 600,
0.6 0.6
); );
// Electronics / Pneumatics / Sensors // Electronics / Pneumatics / Sensors

10
RELENTLESS-Lite/src/main.cpp
View File

@ -51,7 +51,8 @@ void autonomous() {
chassis.reset_pid_targets(); chassis.reset_pid_targets();
chassis.reset_gyro(); chassis.reset_gyro();
chassis.reset_drive_sensor(); chassis.reset_drive_sensor();
chassis.set_drive_brake(MOTOR_BRAKE_HOLD); chassis.set_drive_brake(MOTOR_BRAKE_COAST);
default_constants();
ary::autonselector::auton_selector.call_selected_auton(); ary::autonselector::auton_selector.call_selected_auton();
} }
@ -60,11 +61,8 @@ void opcontrol() {
chassis.set_drive_brake(MOTOR_BRAKE_COAST); chassis.set_drive_brake(MOTOR_BRAKE_COAST);
while (true) { while (true) {
chassis.arcade_standard(ary::SINGLE, ary::DEFAULT); //chassis.arcade_standard(ary::SdPLIT, ary::DEFAULT);
//chassis.tank(); chassis.tank();
pros::delay(ary::util::DELAY_TIME); pros::delay(ary::util::DELAY_TIME);
} }
} }