From 065d78d7d88e2ba2c252650228b2aa2fb0d578a2 Mon Sep 17 00:00:00 2001 From: BobSaidHi <1019928@student.salinasuhsd.org> Date: Thu, 17 Sep 2020 15:47:49 +0000 Subject: [PATCH 1/2] test --- .gitignore | 138 +++++++++++++++ {WilsonTor/.vscode => .vscode}/launch.json | 0 {WilsonTor/.vscode => .vscode}/settings.json | 0 .../wpilib_preferences.json | 0 WilsonTor/.gitignore | 161 ------------------ WilsonTor/build.gradle => build.gradle | 0 .../wrapper/gradle-wrapper.jar | Bin .../wrapper/gradle-wrapper.properties | 0 WilsonTor/gradlew => gradlew | 0 WilsonTor/gradlew.bat => gradlew.bat | 0 WilsonTor/settings.gradle => settings.gradle | 0 .../src => src}/main/deploy/example.txt | 0 .../src => src}/main/java/frc/robot/Main.java | 0 .../src => src}/main/java/frc/robot/OI.java | 0 .../main/java/frc/robot/Robot.java | 0 .../main/java/frc/robot/RobotMap.java | 0 .../main/java/frc/robot/commands/ArmSet.java | 0 .../main/java/frc/robot/commands/Drive.java | 0 .../java/frc/robot/commands/MailboxSet.java | 0 .../frc/robot/commands/RotateToAngle.java | 0 .../java/frc/robot/commands/WinchUnwind.java | 0 .../java/frc/robot/commands/WinchWind.java | 0 .../main/java/frc/robot/subsystems/Arm.java | 0 .../main/java/frc/robot/subsystems/Climb.java | 0 .../java/frc/robot/subsystems/Drivetrain.java | 0 .../java/frc/robot/subsystems/Mailbox.java | 0 .../main/java/frc/robot/utils/Limelight.java | 0 .../vendordeps => vendordeps}/Phoenix.json | 0 .../REVRobotics.json | 0 .../WPILibOldCommands.json | 0 .../vendordeps => vendordeps}/navx_frc.json | 0 31 files changed, 138 insertions(+), 161 deletions(-) rename {WilsonTor/.vscode => .vscode}/launch.json (100%) rename {WilsonTor/.vscode => .vscode}/settings.json (100%) rename {WilsonTor/.wpilib => .wpilib}/wpilib_preferences.json (100%) delete mode 100644 WilsonTor/.gitignore rename WilsonTor/build.gradle => build.gradle (100%) rename {WilsonTor/gradle => gradle}/wrapper/gradle-wrapper.jar (100%) rename {WilsonTor/gradle => gradle}/wrapper/gradle-wrapper.properties (100%) rename WilsonTor/gradlew => gradlew (100%) rename WilsonTor/gradlew.bat => gradlew.bat (100%) mode change 100644 => 100755 rename WilsonTor/settings.gradle => settings.gradle (100%) rename {WilsonTor/src => src}/main/deploy/example.txt (100%) rename {WilsonTor/src => src}/main/java/frc/robot/Main.java (100%) rename {WilsonTor/src => src}/main/java/frc/robot/OI.java (100%) rename {WilsonTor/src => src}/main/java/frc/robot/Robot.java (100%) rename {WilsonTor/src => src}/main/java/frc/robot/RobotMap.java (100%) rename {WilsonTor/src => src}/main/java/frc/robot/commands/ArmSet.java (100%) rename {WilsonTor/src => src}/main/java/frc/robot/commands/Drive.java (100%) rename {WilsonTor/src => src}/main/java/frc/robot/commands/MailboxSet.java (100%) rename {WilsonTor/src => src}/main/java/frc/robot/commands/RotateToAngle.java (100%) rename {WilsonTor/src => src}/main/java/frc/robot/commands/WinchUnwind.java (100%) rename {WilsonTor/src => src}/main/java/frc/robot/commands/WinchWind.java (100%) rename {WilsonTor/src => src}/main/java/frc/robot/subsystems/Arm.java (100%) rename {WilsonTor/src => src}/main/java/frc/robot/subsystems/Climb.java (100%) rename {WilsonTor/src => src}/main/java/frc/robot/subsystems/Drivetrain.java (100%) rename {WilsonTor/src => src}/main/java/frc/robot/subsystems/Mailbox.java (100%) rename {WilsonTor/src => src}/main/java/frc/robot/utils/Limelight.java (100%) rename {WilsonTor/vendordeps => vendordeps}/Phoenix.json (100%) rename {WilsonTor/vendordeps => vendordeps}/REVRobotics.json (100%) rename {WilsonTor/vendordeps => vendordeps}/WPILibOldCommands.json (100%) rename {WilsonTor/vendordeps => vendordeps}/navx_frc.json (100%) diff --git a/.gitignore b/.gitignore index a1c2a23..983678a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,40 @@ +# Created by https://www.gitignore.io/api/c++,java,linux,macos,gradle,windows,visualstudiocode + +### C++ ### +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + +### Java ### # Compiled class file *.class @@ -21,3 +58,104 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* + +### Linux ### +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### macOS ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### VisualStudioCode ### +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +### Gradle ### +.gradle +/build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +# # VS Code Specific Java Settings +.classpath +.project +.settings/ +bin/ +imgui.ini + + +# End of https://www.gitignore.io/api/c++,java,linux,macos,gradle,windows,visualstudiocode diff --git a/WilsonTor/.vscode/launch.json b/.vscode/launch.json similarity index 100% rename from WilsonTor/.vscode/launch.json rename to .vscode/launch.json diff --git a/WilsonTor/.vscode/settings.json b/.vscode/settings.json similarity index 100% rename from WilsonTor/.vscode/settings.json rename to .vscode/settings.json diff --git a/WilsonTor/.wpilib/wpilib_preferences.json b/.wpilib/wpilib_preferences.json similarity index 100% rename from WilsonTor/.wpilib/wpilib_preferences.json rename to .wpilib/wpilib_preferences.json diff --git a/WilsonTor/.gitignore b/WilsonTor/.gitignore deleted file mode 100644 index 983678a..0000000 --- a/WilsonTor/.gitignore +++ /dev/null @@ -1,161 +0,0 @@ -# Created by https://www.gitignore.io/api/c++,java,linux,macos,gradle,windows,visualstudiocode - -### C++ ### -# Prerequisites -*.d - -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Precompiled Headers -*.gch -*.pch - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Fortran module files -*.mod -*.smod - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app - -### Java ### -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -### Linux ### -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - -### macOS ### -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -### VisualStudioCode ### -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json - -### Windows ### -# Windows thumbnail cache files -Thumbs.db -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -### Gradle ### -.gradle -/build/ - -# Ignore Gradle GUI config -gradle-app.setting - -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar - -# Cache of project -.gradletasknamecache - -# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 -# gradle/wrapper/gradle-wrapper.properties - -# # VS Code Specific Java Settings -.classpath -.project -.settings/ -bin/ -imgui.ini - - -# End of https://www.gitignore.io/api/c++,java,linux,macos,gradle,windows,visualstudiocode diff --git a/WilsonTor/build.gradle b/build.gradle similarity index 100% rename from WilsonTor/build.gradle rename to build.gradle diff --git a/WilsonTor/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from WilsonTor/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar diff --git a/WilsonTor/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from WilsonTor/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/WilsonTor/gradlew b/gradlew similarity index 100% rename from WilsonTor/gradlew rename to gradlew diff --git a/WilsonTor/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 similarity index 100% rename from WilsonTor/gradlew.bat rename to gradlew.bat diff --git a/WilsonTor/settings.gradle b/settings.gradle similarity index 100% rename from WilsonTor/settings.gradle rename to settings.gradle diff --git a/WilsonTor/src/main/deploy/example.txt b/src/main/deploy/example.txt similarity index 100% rename from WilsonTor/src/main/deploy/example.txt rename to src/main/deploy/example.txt diff --git a/WilsonTor/src/main/java/frc/robot/Main.java b/src/main/java/frc/robot/Main.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/Main.java rename to src/main/java/frc/robot/Main.java diff --git a/WilsonTor/src/main/java/frc/robot/OI.java b/src/main/java/frc/robot/OI.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/OI.java rename to src/main/java/frc/robot/OI.java diff --git a/WilsonTor/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/Robot.java rename to src/main/java/frc/robot/Robot.java diff --git a/WilsonTor/src/main/java/frc/robot/RobotMap.java b/src/main/java/frc/robot/RobotMap.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/RobotMap.java rename to src/main/java/frc/robot/RobotMap.java diff --git a/WilsonTor/src/main/java/frc/robot/commands/ArmSet.java b/src/main/java/frc/robot/commands/ArmSet.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/commands/ArmSet.java rename to src/main/java/frc/robot/commands/ArmSet.java diff --git a/WilsonTor/src/main/java/frc/robot/commands/Drive.java b/src/main/java/frc/robot/commands/Drive.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/commands/Drive.java rename to src/main/java/frc/robot/commands/Drive.java diff --git a/WilsonTor/src/main/java/frc/robot/commands/MailboxSet.java b/src/main/java/frc/robot/commands/MailboxSet.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/commands/MailboxSet.java rename to src/main/java/frc/robot/commands/MailboxSet.java diff --git a/WilsonTor/src/main/java/frc/robot/commands/RotateToAngle.java b/src/main/java/frc/robot/commands/RotateToAngle.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/commands/RotateToAngle.java rename to src/main/java/frc/robot/commands/RotateToAngle.java diff --git a/WilsonTor/src/main/java/frc/robot/commands/WinchUnwind.java b/src/main/java/frc/robot/commands/WinchUnwind.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/commands/WinchUnwind.java rename to src/main/java/frc/robot/commands/WinchUnwind.java diff --git a/WilsonTor/src/main/java/frc/robot/commands/WinchWind.java b/src/main/java/frc/robot/commands/WinchWind.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/commands/WinchWind.java rename to src/main/java/frc/robot/commands/WinchWind.java diff --git a/WilsonTor/src/main/java/frc/robot/subsystems/Arm.java b/src/main/java/frc/robot/subsystems/Arm.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/subsystems/Arm.java rename to src/main/java/frc/robot/subsystems/Arm.java diff --git a/WilsonTor/src/main/java/frc/robot/subsystems/Climb.java b/src/main/java/frc/robot/subsystems/Climb.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/subsystems/Climb.java rename to src/main/java/frc/robot/subsystems/Climb.java diff --git a/WilsonTor/src/main/java/frc/robot/subsystems/Drivetrain.java b/src/main/java/frc/robot/subsystems/Drivetrain.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/subsystems/Drivetrain.java rename to src/main/java/frc/robot/subsystems/Drivetrain.java diff --git a/WilsonTor/src/main/java/frc/robot/subsystems/Mailbox.java b/src/main/java/frc/robot/subsystems/Mailbox.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/subsystems/Mailbox.java rename to src/main/java/frc/robot/subsystems/Mailbox.java diff --git a/WilsonTor/src/main/java/frc/robot/utils/Limelight.java b/src/main/java/frc/robot/utils/Limelight.java similarity index 100% rename from WilsonTor/src/main/java/frc/robot/utils/Limelight.java rename to src/main/java/frc/robot/utils/Limelight.java diff --git a/WilsonTor/vendordeps/Phoenix.json b/vendordeps/Phoenix.json similarity index 100% rename from WilsonTor/vendordeps/Phoenix.json rename to vendordeps/Phoenix.json diff --git a/WilsonTor/vendordeps/REVRobotics.json b/vendordeps/REVRobotics.json similarity index 100% rename from WilsonTor/vendordeps/REVRobotics.json rename to vendordeps/REVRobotics.json diff --git a/WilsonTor/vendordeps/WPILibOldCommands.json b/vendordeps/WPILibOldCommands.json similarity index 100% rename from WilsonTor/vendordeps/WPILibOldCommands.json rename to vendordeps/WPILibOldCommands.json diff --git a/WilsonTor/vendordeps/navx_frc.json b/vendordeps/navx_frc.json similarity index 100% rename from WilsonTor/vendordeps/navx_frc.json rename to vendordeps/navx_frc.json From 5f77d07976cc5a981fa2fc35864ca6bb9130dc1c Mon Sep 17 00:00:00 2001 From: BobSaidHi <1019928@student.salinasuhsd.org> Date: Thu, 17 Sep 2020 08:52:26 -0700 Subject: [PATCH 2/2] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 2bae08a..99ceb78 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,7 @@ # WilsonTor CommandBased but fro Sketlor + limglihgt + +About codepsaces test- this is a test to see how well the VS Code broser/ virutal maching version works. It seems prety good, except: +Issue: + - Had to resturcture directory so project was in git root + - TODO: Replace gradlew build scripts with the linux equivlent- proably haveing to create teh project udner both linux and windows? or portingthe files manually I guess