Merge branch 'main' of https://github.com/calhighrobotics/Over-Under-…

…2023-24-teamB
calhighrobotics · Sep 9, 2023 · 49696b5 · 49696b5
2 parents a3e4ac2 + dea6d9a
commit 49696b5
Show file tree

Hide file tree

Showing 11 changed files with 3,545 additions and 2 deletions.
diff --git a/VEX_2023-24.v5code b/VEX_2023-24.v5code
@@ -1 +1 @@
-{"title":"VEX_2023-24","description":"Empty V5 C++ Project","icon":"USER921x.bmp","version":"22.03.0110","sdk":"20220215_18_00_00","language":"cpp","competition":false,"files":[{"name":"include/robot-config.h","type":"File","specialType":"device_config"},{"name":"include/vex.h","type":"File","specialType":""},{"name":"makefile","type":"File","specialType":""},{"name":"src/main.cpp","type":"File","specialType":""},{"name":"src/robot-config.cpp","type":"File","specialType":"device_config"},{"name":"vex/mkenv.mk","type":"File","specialType":""},{"name":"vex/mkrules.mk","type":"File","specialType":""},{"name":"include","type":"Directory"},{"name":"src","type":"Directory"},{"name":"vex","type":"Directory"}],"device":{"slot":1,"uid":"276-4810","options":{}},"isExpertMode":false,"isExpertModeRC":false,"isVexFileImport":false,"robotconfig":[{"port":[1],"name":"LeftFront","customName":true,"deviceType":"Motor","setting":{"reversed":"false","fwd":"forward","rev":"reverse","gear":"ratio18_1"}},{"port":[2],"name":"RightFront","customName":true,"deviceType":"Motor","setting":{"reversed":"true","fwd":"forward","rev":"reverse","gear":"ratio18_1"}},{"port":[3],"name":"LeftBack","customName":true,"deviceType":"Motor","setting":{"reversed":"false","fwd":"forward","rev":"reverse","gear":"ratio18_1"}},{"port":[4],"name":"RightBack","customName":true,"deviceType":"Motor","setting":{"reversed":"true","fwd":"forward","rev":"reverse","gear":"ratio18_1"}},{"port":[],"name":"Controller1","customName":false,"deviceType":"Controller","setting":{"left":"","leftDir":"false","right":"","rightDir":"false","upDown":"","upDownDir":"false","xB":"","xBDir":"false","drive":"none","id":"primary"}}]}
+{"title":"VEX_2023-24","description":"Empty V5 C++ Project","icon":"USER921x.bmp","version":"22.03.0110","sdk":"20220215_18_00_00","language":"cpp","competition":false,"files":[{"name":"include/robot-config.h","type":"File","specialType":"device_config"},{"name":"include/vex.h","type":"File","specialType":""},{"name":"makefile","type":"File","specialType":""},{"name":"src/main.cpp","type":"File","specialType":""},{"name":"src/robot-config.cpp","type":"File","specialType":"device_config"},{"name":"vex/mkenv.mk","type":"File","specialType":""},{"name":"vex/mkrules.mk","type":"File","specialType":""},{"name":"include","type":"Directory"},{"name":"src","type":"Directory"},{"name":"vex","type":"Directory"}],"device":{"slot":1,"uid":"276-4810","options":{}},"isExpertMode":true,"isExpertModeRC":true,"isVexFileImport":false,"robotconfig":[],"neverUpdate":null}
diff --git a/build/VEX202324.bin b/build/VEX202324.bin
diff --git a/build/VEX202324.elf b/build/VEX202324.elf
diff --git a/build/VEX202324.map b/build/VEX202324.map
diff --git a/build/src/auton.o b/build/src/auton.o
diff --git a/build/src/main.o b/build/src/main.o
diff --git a/build/src/robot-config.o b/build/src/robot-config.o
diff --git a/include/robot-config.h b/include/robot-config.h
@@ -11,6 +11,7 @@ extern controller Controller1;
 extern motor LeftMid;
 extern motor RightMid;
 extern motor Catapult;
+extern motor Elevation;
 extern motor IntakeLeft;
 extern motor IntakeRight;
 

diff --git a/src/auton.cpp b/src/auton.cpp
diff --git a/src/main.cpp b/src/main.cpp
@@ -212,6 +212,13 @@ void usercontrol(void) {
       cat = 0;
     }
 
+    //Elevation
+    if (Controller1.ButtonX.pressing()) {
+      Elevation.spin(vex::directionType::fwd, 140, vex::velocityUnits::pct);
+    } else {
+      Elevation.spin(vex::directionType::fwd, 0, vex::velocityUnits::pct);
+    }
+
     //Intake
     int intake;
     if (Controller1.ButtonB.pressing()) {

diff --git a/src/robot-config.cpp b/src/robot-config.cpp
@@ -13,7 +13,8 @@ motor RightFront = motor(PORT2, ratio18_1, true);
 motor LeftBack = motor(PORT3, ratio18_1, false);
 motor RightBack = motor(PORT4, ratio18_1, true);
 controller Controller1 = controller(primary);
-motor LeftMid = motor(PORT5, ratio18_1, false);
+motor LeftMid = motor(PORT10, ratio18_1, false);
+motor Elevation = motor(PORT20, ratio18_1, true);
 motor RightMid = motor(PORT6, ratio18_1, true);
 motor Catapult = motor(PORT7, ratio18_1, false);
 motor IntakeLeft = motor(PORT8, ratio18_1, false);