Auton changes for worlds

EdgarProCompetition.v5code

@@ -1 +1 @@
-{"title":"EdgarProCompetition","description":"E.D.G.A.R. (Ergonomicaly Decent Goal-Grabbing Automated Robot)","icon":"USER921x.bmp","version":"21.10.0712","sdk":"20210708_10_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":"CODE_OF_CONDUCT.md","type":"File","specialType":""},{"name":"index.md","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}
+{"title":"EdgarProCompetition","description":"E.D.G.A.R. (Ergonomicaly Decent Goal-Grabbing Automated Robot)","icon":"USER921x.bmp","version":"21.10.0712","sdk":"20210708_10_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":"CODE_OF_CONDUCT.md","type":"File","specialType":""},{"name":"index.md","type":"File","specialType":""},{"name":"CONTRIBUTING.md","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":false,"isVexFileImport":false,"robotconfig":[{"port":[],"name":"Controller1","customName":false,"deviceType":"Controller","setting":{"left":"","leftDir":"false","right":"","rightDir":"false","upDown":"","upDownDir":"false","xB":"","xBDir":"false","drive":"none","id":"primary"},"triportSourcePort":22},{"port":[10],"name":"inertialSensor","customName":true,"deviceType":"Inertial","setting":{"id":"partner"},"triportSourcePort":22},{"port":[8],"name":"frontHook","customName":true,"deviceType":"DigitalOut","setting":{"id":"partner"},"triportSourcePort":22},{"port":[20],"name":"frontMogo","customName":true,"deviceType":"Motor","setting":{"reversed":"true","fwd":"forward","rev":"reverse","gear":"ratio36_1"},"triportSourcePort":22},{"port":[11],"name":"ringLift","customName":true,"deviceType":"Motor","setting":{"reversed":"false","fwd":"forward","rev":"reverse","gear":"ratio6_1"},"triportSourcePort":22},{"port":[1],"name":"LeftDriveSmartA","customName":true,"deviceType":"Motor","setting":{"reversed":"true","fwd":"forward","rev":"reverse","gear":"ratio6_1"},"triportSourcePort":22},{"port":[3],"name":"LeftDriveSmartB","customName":true,"deviceType":"Motor","setting":{"reversed":"false","fwd":"forward","rev":"reverse","gear":"ratio6_1"},"triportSourcePort":22},{"port":[9],"name":"LeftDriveSmartC","customName":true,"deviceType":"Motor","setting":{"reversed":"false","fwd":"forward","rev":"reverse","gear":"ratio6_1"},"triportSourcePort":22},{"port":[2],"name":"RightDriveSmartA","customName":true,"deviceType":"Motor","setting":{"reversed":"false","fwd":"forward","rev":"reverse","gear":"ratio6_1"},"triportSourcePort":22},{"port":[4],"name":"RightDriveSmartB","customName":true,"deviceType":"Motor","setting":{"reversed":"true","fwd":"forward","rev":"reverse","gear":"ratio6_1"},"triportSourcePort":22},{"port":[6],"name":"RightDriveSmartC","customName":true,"deviceType":"Motor","setting":{"reversed":"true","fwd":"forward","rev":"reverse","gear":"ratio6_1"},"triportSourcePort":22},{"port":[7],"name":"rearHook","customName":true,"deviceType":"DigitalOut","setting":{"id":"partner"},"triportSourcePort":22},{"port":[1],"name":"autonHook","customName":true,"deviceType":"DigitalOut","setting":{"id":"partner"},"triportSourcePort":22}],"neverUpdate":null}

compile_commands.json

@@ -1 +1 @@
-[{"directory":"/Users/anthonyhalliday/Documents/vexcode-projects/Vex64040Edgar","file":"include/robot-config.h","arguments":["clang","-xc++","include/robot-config.h","-include","v5_vcs.h","--target=thumbv7-none-eabi","-U","__INT32_TYPE__","-U","__UINT32_TYPE__","-D","__INT32_TYPE__=long","-D","__UINT32_TYPE__=unsigned long","-std=gnu++11","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/include","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/clang/8.0.0/include","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/gcc/include","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/gcc/include/c++/4.9.3","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/gcc/include/c++/4.9.3/arm-none-eabi/armv7-ar/thumb"]},{"directory":"/Users/anthonyhalliday/Documents/vexcode-projects/Vex64040Edgar","file":"include/vex.h","arguments":["clang","-xc++","include/vex.h","-include","v5_vcs.h","--target=thumbv7-none-eabi","-U","__INT32_TYPE__","-U","__UINT32_TYPE__","-D","__INT32_TYPE__=long","-D","__UINT32_TYPE__=unsigned long","-std=gnu++11","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/include","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/clang/8.0.0/include","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/gcc/include","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/gcc/include/c++/4.9.3","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/gcc/include/c++/4.9.3/arm-none-eabi/armv7-ar/thumb"]},{"directory":"/Users/anthonyhalliday/Documents/vexcode-projects/Vex64040Edgar","file":"src/main.cpp","output":"build/src/main.o","arguments":["clang","-xc++","src/main.cpp","--target=thumbv7-none-eabi","-fshort-enums","-Wno-unknown-attributes","-U","__INT32_TYPE__","-U","__UINT32_TYPE__","-D","__INT32_TYPE__=long","-D","__UINT32_TYPE__=unsigned long","-march=armv7-a","-mfpu=neon","-mfloat-abi=softfp","-Os","-Wall","-Werror=return-type","-fno-rtti","-fno-threadsafe-statics","-fno-exceptions","-std=gnu++11","-ffunction-sections","-fdata-sections","-D","VexV5","-I","/Users/anthonyhalliday/Documents/vexcode-projects/Vex64040Edgar","-I","/Users/anthonyhalliday/Documents/vexcode-projects/Vex64040Edgar/include","-I","/Users/anthonyhalliday/Documents/vexcode-projects/Vex64040Edgar/src","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/include","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/clang/8.0.0/include","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/gcc/include","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/gcc/include/c++/4.9.3","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/gcc/include/c++/4.9.3/arm-none-eabi/armv7-ar/thumb","-c","-o","build/src/main.o","-mlinker-version=409.12","--target=armv7-none--eabi"]},{"directory":"/Users/anthonyhalliday/Documents/vexcode-projects/Vex64040Edgar","file":"src/robot-config.cpp","output":"build/src/robot-config.o","arguments":["clang","-xc++","src/robot-config.cpp","--target=thumbv7-none-eabi","-fshort-enums","-Wno-unknown-attributes","-U","__INT32_TYPE__","-U","__UINT32_TYPE__","-D","__INT32_TYPE__=long","-D","__UINT32_TYPE__=unsigned long","-march=armv7-a","-mfpu=neon","-mfloat-abi=softfp","-Os","-Wall","-Werror=return-type","-fno-rtti","-fno-threadsafe-statics","-fno-exceptions","-std=gnu++11","-ffunction-sections","-fdata-sections","-D","VexV5","-I","/Users/anthonyhalliday/Documents/vexcode-projects/Vex64040Edgar","-I","/Users/anthonyhalliday/Documents/vexcode-projects/Vex64040Edgar/include","-I","/Users/anthonyhalliday/Documents/vexcode-projects/Vex64040Edgar/src","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/include","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/clang/8.0.0/include","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/gcc/include","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/gcc/include/c++/4.9.3","-I","/Applications/VEXcode Pro V5.app/Contents/Resources/sdk/vexv5/gcc/include/c++/4.9.3/arm-none-eabi/armv7-ar/thumb","-c","-o","build/src/robot-config.o","-mlinker-version=409.12","--target=armv7-none--eabi"]}]
+[{"directory":"C:/Users/stroebell/Documents/GitHub/Edgar-Pro","file":"include/robot-config.h","arguments":["clang","-xc++","include/robot-config.h","-include","v5_vcs.h","--target=thumbv7-none-eabi","-U","__INT32_TYPE__","-U","__UINT32_TYPE__","-D","__INT32_TYPE__=long","-D","__UINT32_TYPE__=unsigned long","-std=gnu++11","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/include","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/clang/8.0.0/include","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/gcc/include","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/gcc/include/c++/4.9.3","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/gcc/include/c++/4.9.3/arm-none-eabi/armv7-ar/thumb"]},{"directory":"C:/Users/stroebell/Documents/GitHub/Edgar-Pro","file":"include/vex.h","arguments":["clang","-xc++","include/vex.h","-include","v5_vcs.h","--target=thumbv7-none-eabi","-U","__INT32_TYPE__","-U","__UINT32_TYPE__","-D","__INT32_TYPE__=long","-D","__UINT32_TYPE__=unsigned long","-std=gnu++11","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/include","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/clang/8.0.0/include","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/gcc/include","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/gcc/include/c++/4.9.3","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/gcc/include/c++/4.9.3/arm-none-eabi/armv7-ar/thumb"]},{"directory":"C:/Users/stroebell/Documents/GitHub/Edgar-Pro","file":"src/main.cpp","output":"build/src/main.o","arguments":["clang","-xc++","src/main.cpp","--target=thumbv7-none-eabi","-fshort-enums","-Wno-unknown-attributes","-U","__INT32_TYPE__","-U","__UINT32_TYPE__","-D","__INT32_TYPE__=long","-D","__UINT32_TYPE__=unsigned long","-march=armv7-a","-mfpu=neon","-mfloat-abi=softfp","-Os","-Wall","-Werror=return-type","-fno-rtti","-fno-threadsafe-statics","-fno-exceptions","-std=gnu++11","-ffunction-sections","-fdata-sections","-D","VexV5","-I","C:/Users/stroebell/Documents/GitHub/Edgar-Pro","-I","C:/Users/stroebell/Documents/GitHub/Edgar-Pro/include","-I","C:/Users/stroebell/Documents/GitHub/Edgar-Pro/src","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/include","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/clang/8.0.0/include","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/gcc/include","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/gcc/include/c++/4.9.3","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/gcc/include/c++/4.9.3/arm-none-eabi/armv7-ar/thumb","-c","-o","build/src/main.o","-mlinker-version=409.12","--target=armv7-none--eabi"]},{"directory":"C:/Users/stroebell/Documents/GitHub/Edgar-Pro","file":"src/robot-config.cpp","output":"build/src/robot-config.o","arguments":["clang","-xc++","src/robot-config.cpp","--target=thumbv7-none-eabi","-fshort-enums","-Wno-unknown-attributes","-U","__INT32_TYPE__","-U","__UINT32_TYPE__","-D","__INT32_TYPE__=long","-D","__UINT32_TYPE__=unsigned long","-march=armv7-a","-mfpu=neon","-mfloat-abi=softfp","-Os","-Wall","-Werror=return-type","-fno-rtti","-fno-threadsafe-statics","-fno-exceptions","-std=gnu++11","-ffunction-sections","-fdata-sections","-D","VexV5","-I","C:/Users/stroebell/Documents/GitHub/Edgar-Pro","-I","C:/Users/stroebell/Documents/GitHub/Edgar-Pro/include","-I","C:/Users/stroebell/Documents/GitHub/Edgar-Pro/src","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/include","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/clang/8.0.0/include","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/gcc/include","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/gcc/include/c++/4.9.3","-I","C:/Program Files (x86)/VEX Robotics/VEXcode Pro V5/sdk/vexv5/gcc/include/c++/4.9.3/arm-none-eabi/armv7-ar/thumb","-c","-o","build/src/robot-config.o","-mlinker-version=409.12","--target=armv7-none--eabi"]}]

include/robot-config.h

@@ -3,13 +3,17 @@ using namespace vex;
 extern brain Brain;
 
 // VEXcode devices
-extern digital_out frontHook;
+extern controller Controller1;
 extern inertial inertialSensor;
+extern digital_out frontHook;
 extern motor frontMogo;
 extern motor ringLift;
-extern motor_group LeftDriveSmart;
-extern motor_group RightDriveSmart;
-extern controller Controller1;
+extern motor LeftDriveSmartA;
+extern motor LeftDriveSmartB;
+extern motor LeftDriveSmartC;
+extern motor RightDriveSmartA;
+extern motor RightDriveSmartB;
+extern motor RightDriveSmartC;
 extern digital_out rearHook;
 extern digital_out autonHook;