States

include/autons.hpp

@@ -16,13 +16,22 @@
 
 void default_constants();
 void empty();
-void skills();
-void skills_without_odom();
+void norcal_skills();
+void safe_skills();
 
+void left_4_3_push();
+void top_middle_bottom();
+void left_elims_quick_ml();
 void left_elims();
 void red_top_elims();
 void blue_top_quals();
 
+void left_7_mid();
+void push_solo();
+void left_elims_7ball();
+
+void intake_test();
+
 void blue_bottom_elims();
 void red_bottom_elims();
 void blue_bottom_quals();
@@ -32,6 +41,8 @@ void new_elim_auton();
 
 void solo_left();
 
+void pid_test();
+
 /* Odom TESTING Functions */
 
 void odom_pure_pursuit_wait_until_example();
@@ -40,6 +51,7 @@ void square_odom_test();
 void auton_setup_left();
 void auton_setup_right();
 void solo_right();
+void elims_mid_control();
 
 /* Wall Tracking TEST */
 
@@ -48,15 +60,15 @@ void wall_alignment_test();
 void pid_tune();
 
 /* safe routes */
-void left_safe();
-void right_safe();
+void left_middle_top();
+void right_4_3_push();
 
 /* old */
 void right_safe1();
 void right_auton_new();
 
 void left_elims_quick();
-void right_elims_quick();
+void right_elims_7ball();
 
 /* Color Sort tests */
 void color_sort_test();

include/main.h

@@ -37,6 +37,7 @@ extern std::string color;
 void autonomous(void);
 //void color_sort_task(void);
 void color_sort_S(void);
+void color_sort_bottom(void);
 void initialize(void);
 void disabled(void);
 void competition_initialize(void);

include/subsystems.hpp

@@ -15,37 +15,44 @@ inline pros::Controller master(pros::E_CONTROLLER_MASTER);
 
 extern Drive chassis;
 
-inline pros::Motor L1(10);
-inline pros::Motor L2(-7);
-inline pros::Motor L3(-4);
+inline pros::Motor L1(-6);
+inline pros::Motor L2(-5);
+inline pros::Motor L3(-8);
 
-inline pros::Motor R1(-3);
-inline pros::Motor R2(6);
-inline pros::Motor R3(1);
+inline pros::Motor R1(14);
+inline pros::Motor R2(19);
+inline pros::Motor R3(18);
 
-inline pros::Imu inertial(2);
+inline pros::Imu inertial(15);
 
-inline pros::Distance distance_back_l(13);
-inline pros::Distance distance_front_l(19);
-inline pros::Distance distance_back_r(17);
-inline pros::Distance distance_front_r(18);
-inline pros::Distance distance_front(14);
+inline pros::Distance distance_back_l(13); // removed sensor
+inline pros::Distance distance_front_l(9);
+inline pros::Distance distance_back(3);
+inline pros::Distance distance_match_loader(21);
+inline pros::Distance distance_back_r(99); // removed sensor
+inline pros::Distance distance_front_r(99); // removed sensor
+inline pros::Distance distance_front(99); // removed sensor
 
-inline pros::Optical color_sort(15);
+inline pros::Optical color_sort(16);
 
-inline pros::Motor intake_bottom(20);
-inline pros::Motor intake_top(11);
+inline pros::Motor intake_bottom(17);
+inline pros::Motor intake_top(-2);
+inline pros::Motor intake_top_score(-10);
+inline pros::Motor vertical_tracker('Z');
 
-inline ez::Piston trapdoor('G');
-inline ez::Piston middle_stage('C');
-inline ez::Piston Little_Mech_Mac('B');
-inline ez::Piston color_sort_piston('H');
+inline ez::Piston trapdoor('B');
+inline ez::Piston middle_stage('C'); // removed mech
+inline ez::Piston Little_Mech_Mac('H'); 
+inline ez::Piston color_sort_piston('D'); // removed mech
+inline ez::Piston intake_piston('C');
 
-inline ez::Piston right_rush_mech('F');
-inline ez::Piston left_rush_mech('F');
+inline ez::Piston mid_descore('G');
+
+inline ez::Piston right_rush_mech('F'); // removed mech
+inline ez::Piston left_rush_mech('B'); // removed mech
 
 inline ez::Piston discore_mech('A');
 
 inline pros::Distance intake_distance(16);
 
-inline pros::Rotation vertical_tracker(12);
+//inline pros::Rotation vertical_tracker(12);

include/wall_tracking.hpp

@@ -19,4 +19,7 @@ void wall_tracking(float target_distance, float DRIVE_SPEED, float drive_distanc
 void wall_riding(float target_distance, float DRIVE_SPEED, float drive_distance);
 void wall_tracking_with_alignment(float target_distance, float DRIVE_SPEED, float drive_distance);
 void wall_tracking_with_alignment_B(float target_distance, float DRIVE_SPEED, float drive_distance);
-void drive_wall(float distance);
+void drive_wall(float distance, float DRIVE_SPEED);
+void chassis_drive_wall(float distance, float DRIVE_SPEED, bool chain, bool back_sensor);
+void chassis_brake();
+void drive_wall_task();

project.pros

@@ -1,7 +1,7 @@
 {
   "py/object": "pros.conductor.project.Project",
   "py/state": {
-    "project_name": "BeSt PrOG evEr",
+    "project_name": "2550R TMB",
     "target": "v5",
     "templates": {
       "EZ-Template": {
@@ -424,8 +424,8 @@
       }
     },
     "upload_options": {
-      "description": "roboticsisez.com",
-      "icon": "X",
+      "description": "2550R",
+      "icon": "power",
       "slot": 1
     },
     "use_early_access": false