Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Commit

Permalink
Update Annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
Ish-08 committed Feb 22, 2024
2 parents 98eb98b + e478e3c commit c0e4b68
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 43 deletions.
1 change: 0 additions & 1 deletion include/global.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ extern pros::Motor IntakeMotor;

extern pros::ADIDigitalOut HorizontalWingPistons;
extern pros::ADIDigitalOut VerticalWingPistons;
extern pros::ADIDigitalOut HangingMech;

extern pros::IMU Inertial;
extern pros::Optical Optical;
Expand Down
4 changes: 1 addition & 3 deletions include/subsystemHeaders/wings.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
extern bool horizontalWingsActivated;
extern bool verticalWingsActivated;
extern bool hangingMechActivated;
extern void ToggleHorizontalPneumaticWings();
extern void ToggleVerticalPneumaticWings();
extern void ToggleHangingMech();
extern void ToggleVerticalPneumaticWings();
17 changes: 11 additions & 6 deletions src/global.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,32 @@ pros::Controller controller(pros::E_CONTROLLER_MASTER);
Best Battery: 13
*/

// Left Drivetrain Motors
// --- Left Drivetrain Motors
// Initializes the back left motor to port 8, reversed, with a blue gearset
pros::Motor BLMotor(-8, pros::E_MOTOR_GEAR_BLUE);
// Initializes the middle left motor to port 9, reversed, with a blue gearset
pros::Motor MLMotor(-9, pros::E_MOTOR_GEAR_BLUE);
// Initializes the front left motor to port 3, reversed, with a blue gearset
pros::Motor FLMotor(-3, pros::E_MOTOR_GEAR_BLUE);

// Right Drivetrain Motors
// --- Right Drivetrain Motors
// Initializes the back right motor to port 18 with a blue gearset
pros::Motor BRMotor(18, pros::E_MOTOR_GEAR_BLUE);
// Initializes the middle right motor to port 19 with a blue gearset
pros::Motor MRMotor(19, pros::E_MOTOR_GEAR_BLUE);
// Initializes the front right motor to port 20 with a blue gearset
pros::Motor FRMotor(20, pros::E_MOTOR_GEAR_BLUE);

// Drivetrain Motor Groups
pros::Motor_Group LMotors({BLMotor, MLMotor, FLMotor});
pros::Motor_Group RMotors({BRMotor, MRMotor, FRMotor});

pros::Motor KickerMotor(12, pros::E_MOTOR_GEAR_RED, pros::E_MOTOR_ENCODER_DEGREES);
pros::Motor KickerMotor(-12, pros::E_MOTOR_GEAR_RED, pros::E_MOTOR_ENCODER_DEGREES);
pros::Motor IntakeMotor(7, pros::E_MOTOR_GEAR_BLUE);

// Initializes DigitalOut objects to control the pneumatic wings.
pros::ADIDigitalOut HorizontalWingPistons('a');
pros::ADIDigitalOut VerticalWingPistons('c');
pros::ADIDigitalOut HangingMech('b');
pros::ADIDigitalOut HorizontalWingPistons('b');
pros::ADIDigitalOut VerticalWingPistons('a');

// Inertial Sensor
pros::IMU Inertial(4);
Expand Down
1 change: 0 additions & 1 deletion src/subsystemFiles/wings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ void ToggleVerticalPneumaticWings() {
verticalWingsActivated = false;
}
}
//if then sentence to activate the hanging mechanism
void ToggleHangingMech(){
if(!hangingMechActivated){
HangingMech.set_value(1);
Expand Down
32 changes: 0 additions & 32 deletions static/example.txt

This file was deleted.

0 comments on commit c0e4b68

Please sign in to comment.