diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 041c9531..15f8f746 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -1,6 +1,9 @@ name: Clang Format on: + push: + branches: + - 'master' pull_request: types: [review_requested, ready_for_review] diff --git a/include/VOSS/chassis/ChassisCommand.hpp b/include/VOSS/chassis/ChassisCommand.hpp index a6943507..05c24e9e 100644 --- a/include/VOSS/chassis/ChassisCommand.hpp +++ b/include/VOSS/chassis/ChassisCommand.hpp @@ -34,9 +34,7 @@ using DiffChassisCommand = diff_commands::Swing>; using HoloChassisCommand = std::variant; -template struct overload : Ts... { - using Ts::operator()...; -}; +template struct overload : Ts... { using Ts::operator()...; }; template overload(Ts...) -> overload; } // namespace voss::chassis \ No newline at end of file diff --git a/src/VOSS/controller/BoomerangController.cpp b/src/VOSS/controller/BoomerangController.cpp index 04798f16..79c96676 100644 --- a/src/VOSS/controller/BoomerangController.cpp +++ b/src/VOSS/controller/BoomerangController.cpp @@ -19,10 +19,10 @@ chassis::DiffChassisCommand BoomerangController::get_command(bool reverse, double dx, dy, distance_error, at; int dir = reverse ? -1 : 1; Pose trueTarget; - if(thru) { + if (thru) { dx = virtualTarget.x - current_pos.x; dy = virtualTarget.y - current_pos.y; - trueTarget = {virtualTarget.x, virtualTarget.y , target.theta}; + trueTarget = {virtualTarget.x, virtualTarget.y, target.theta}; } else { dx = target.x - current_pos.x; dy = target.y - current_pos.y; @@ -36,7 +36,8 @@ chassis::DiffChassisCommand BoomerangController::get_command(bool reverse, target.theta}; counter += 10; - double current_angle = this->l->get_orientation_rad() + (reverse ? M_PI : 0); + double current_angle = + this->l->get_orientation_rad() + (reverse ? M_PI : 0); bool chainedExecutable = false; bool noPose = this->target.theta == 361; double angle_error; @@ -128,16 +129,17 @@ chassis::DiffChassisCommand BoomerangController::get_command(bool reverse, } if (chainedExecutable) { - return chassis::DiffChassisCommand{ - chassis::diff_commands::Chained{lin_speed + ang_speed, lin_speed - ang_speed}}; + return chassis::DiffChassisCommand{chassis::diff_commands::Chained{ + lin_speed + ang_speed, lin_speed - ang_speed}}; } - return chassis::DiffChassisCommand{ - chassis::diff_commands::Voltages{lin_speed - ang_speed, lin_speed + ang_speed}}; + return chassis::DiffChassisCommand{chassis::diff_commands::Voltages{ + lin_speed - ang_speed, lin_speed + ang_speed}}; } -chassis::DiffChassisCommand BoomerangController::get_angular_command(bool reverse, - bool thru, voss::AngularDirection direction) { +chassis::DiffChassisCommand +BoomerangController::get_angular_command(bool reverse, bool thru, + voss::AngularDirection direction) { return chassis::DiffChassisCommand{chassis::Stop{}}; } diff --git a/src/main.cpp b/src/main.cpp index abbd31d6..e76c4121 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -110,17 +110,21 @@ void opcontrol() { if (master.get_digital_new_press(DIGITAL_Y)) { odom->set_pose(voss::Pose{0.0, 0.0, 180}); -// chassis.move(voss::Pose{24, 24, 90}, &boomerang, 100.0, voss::Flags::THRU); -// master.rumble("."); -// chassis.move(voss::Pose{48, 5, 290}, &boomerang, 70.0, voss::Flags::THRU); -// master.rumble("."); -// chassis.move(voss::Pose{64, 24, 90}, &boomerang, 70.0); -// master.rumble("."); - chassis.move(voss::Pose{48, 25, 10}, boomerang, 70.0, voss::Flags::REVERSE | voss::Flags::THRU); -// chassis.move(voss::Pose{48, 25, 10}, &boomerang, 70.0, voss::Flags::THRU); + // chassis.move(voss::Pose{24, 24, 90}, &boomerang, + // 100.0, voss::Flags::THRU); master.rumble("."); + // chassis.move(voss::Pose{48, 5, 290}, &boomerang, 70.0, + // voss::Flags::THRU); master.rumble("."); + // chassis.move(voss::Pose{64, 24, 90}, + // &boomerang, 70.0); master.rumble("."); + chassis.move(voss::Pose{48, 25, 10}, boomerang, 70.0, + voss::Flags::REVERSE | voss::Flags::THRU); + // chassis.move(voss::Pose{48, 25, 10}, &boomerang, 70.0, + // voss::Flags::THRU); master.rumble("."); - chassis.move(voss::Pose{60, -5, 270}, boomerang, 100.0, voss::Flags::REVERSE); -// chassis.move(voss::Pose{60, 0, 270}, &boomerang, 70.0); + chassis.move(voss::Pose{60, -5, 270}, boomerang, 100.0, + voss::Flags::REVERSE); + // chassis.move(voss::Pose{60, 0, 270}, + // &boomerang, 70.0); } pros::lcd::clear_line(1);