diff --git a/.metadata/.log b/.metadata/.log index b797167..99bb383 100644 --- a/.metadata/.log +++ b/.metadata/.log @@ -2319,3 +2319,38 @@ java.io.IOException: Cannot run program "arm-frc-linux-gnueabi-g++": Launching f at org.eclipse.ui.actions.BuildAction$1.runInWorkspace(BuildAction.java:287) at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:39) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) + +!ENTRY org.eclipse.cdt.core 4 0 2016-01-28 11:35:21.182 +!MESSAGE Error: Cannot run program "arm-frc-linux-gnueabi-g++": Launching failed +!STACK 0 +java.io.IOException: Cannot run program "arm-frc-linux-gnueabi-g++": Launching failed + at org.eclipse.cdt.utils.spawner.Spawner.exec(Spawner.java:349) + at org.eclipse.cdt.utils.spawner.Spawner.(Spawner.java:91) + at org.eclipse.cdt.utils.spawner.ProcessFactory.exec(ProcessFactory.java:91) + at org.eclipse.cdt.core.CommandLauncher.execute(CommandLauncher.java:194) + at org.eclipse.cdt.managedbuilder.internal.buildmodel.CommandBuilder.build(CommandBuilder.java:105) + at org.eclipse.cdt.managedbuilder.internal.buildmodel.StepBuilder.build(StepBuilder.java:94) + at org.eclipse.cdt.managedbuilder.internal.buildmodel.DescriptionBuilder$BuildStepVisitor.visit(DescriptionBuilder.java:92) + at org.eclipse.cdt.managedbuilder.buildmodel.BuildDescriptionManager.doAccept(BuildDescriptionManager.java:151) + at org.eclipse.cdt.managedbuilder.buildmodel.BuildDescriptionManager.doAccept(BuildDescriptionManager.java:159) + at org.eclipse.cdt.managedbuilder.buildmodel.BuildDescriptionManager.doAccept(BuildDescriptionManager.java:133) + at org.eclipse.cdt.managedbuilder.buildmodel.BuildDescriptionManager.accept(BuildDescriptionManager.java:127) + at org.eclipse.cdt.managedbuilder.internal.buildmodel.DescriptionBuilder.build(DescriptionBuilder.java:160) + at org.eclipse.cdt.managedbuilder.core.InternalBuildRunner.invokeBuild(InternalBuildRunner.java:128) + at org.eclipse.cdt.managedbuilder.internal.core.CommonBuilder.build(CommonBuilder.java:753) + at org.eclipse.cdt.managedbuilder.internal.core.CommonBuilder.build(CommonBuilder.java:510) + at org.eclipse.cdt.managedbuilder.internal.core.CommonBuilder.build(CommonBuilder.java:459) + at org.eclipse.core.internal.events.BuildManager$2.run(BuildManager.java:734) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:205) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:245) + at org.eclipse.core.internal.events.BuildManager$1.run(BuildManager.java:300) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:303) + at org.eclipse.core.internal.events.BuildManager.basicBuildLoop(BuildManager.java:359) + at org.eclipse.core.internal.events.BuildManager.build(BuildManager.java:382) + at org.eclipse.core.internal.resources.Workspace.buildInternal(Workspace.java:486) + at org.eclipse.core.internal.resources.Workspace.build(Workspace.java:405) + at org.eclipse.ui.actions.BuildAction$1.runInWorkspace(BuildAction.java:287) + at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:39) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55) diff --git a/.metadata/.plugins/org.eclipse.cdt.core/DriveBase.1453994194026.pdom b/.metadata/.plugins/org.eclipse.cdt.core/DriveBase.1453994194026.pdom index 4069268..7cf89d9 100644 Binary files a/.metadata/.plugins/org.eclipse.cdt.core/DriveBase.1453994194026.pdom and b/.metadata/.plugins/org.eclipse.cdt.core/DriveBase.1453994194026.pdom differ diff --git a/.metadata/.plugins/org.eclipse.cdt.managedbuilder.core/buildState/DriveBase/2043693231 b/.metadata/.plugins/org.eclipse.cdt.managedbuilder.core/buildState/DriveBase/2043693231 index 0ec7f10..9738e35 100644 --- a/.metadata/.plugins/org.eclipse.cdt.managedbuilder.core/buildState/DriveBase/2043693231 +++ b/.metadata/.plugins/org.eclipse.cdt.managedbuilder.core/buildState/DriveBase/2043693231 @@ -1,5 +1,5 @@ # -#Thu Jan 28 11:32:02 EST 2016 +#Thu Jan 28 11:35:21 EST 2016 Debug/FRCUserProgram=1 Debug/src/Robot.o=1 src/TankDrive.h=1 diff --git a/.metadata/.plugins/org.eclipse.cdt.ui/DriveBase.build.log b/.metadata/.plugins/org.eclipse.cdt.ui/DriveBase.build.log index 6a1bcaa..c1d1202 100644 --- a/.metadata/.plugins/org.eclipse.cdt.ui/DriveBase.build.log +++ b/.metadata/.plugins/org.eclipse.cdt.ui/DriveBase.build.log @@ -1,4 +1,4 @@ -11:32:02 **** Incremental Build of configuration Debug for project DriveBase **** +11:35:21 **** Incremental Build of configuration Debug for project DriveBase **** Info: Internal Builder is used for build arm-frc-linux-gnueabi-g++ -std=c++1y "-IC:\\Users\\Jason/wpilib/cpp/current/include" "-ID:\\Dropbox\\Public\\FRC\\2016\\FRC2016\\DriveBase\\src" -O0 -g3 -Wall -c -fmessage-length=0 -o "src\\Robot.o" "..\\src\\Robot.cpp" Cannot run program "arm-frc-linux-gnueabi-g++": Launching failed @@ -7,5 +7,5 @@ Error: Program "arm-frc-linux-gnueabi-g++" not found in PATH PATH=[\usr\local\bin;C:/Program Files (x86)/Java/jre1.8.0_66/bin/client;C:/Program Files (x86)/Java/jre1.8.0_66/bin;C:/Program Files (x86)/Java/jre1.8.0_66/lib/i386;C:\Python27\;C:\Python34\;C:\Python34\Scripts;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\ProgramData\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\GtkSharp\2.12\bin;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit\;C:\Program Files (x86)\Windows Live\Shared;C:\WINDOWS\system32] -11:32:02 Build Finished (took 36ms) +11:35:21 Build Finished (took 38ms) diff --git a/.metadata/.plugins/org.eclipse.cdt.ui/global-build.log b/.metadata/.plugins/org.eclipse.cdt.ui/global-build.log index fac501f..58c585b 100644 --- a/.metadata/.plugins/org.eclipse.cdt.ui/global-build.log +++ b/.metadata/.plugins/org.eclipse.cdt.ui/global-build.log @@ -1,4 +1,4 @@ -11:32:02 **** Incremental Build of configuration Debug for project DriveBase **** +11:35:21 **** Incremental Build of configuration Debug for project DriveBase **** Info: Internal Builder is used for build arm-frc-linux-gnueabi-g++ -std=c++1y "-IC:\\Users\\Jason/wpilib/cpp/current/include" "-ID:\\Dropbox\\Public\\FRC\\2016\\FRC2016\\DriveBase\\src" -O0 -g3 -Wall -c -fmessage-length=0 -o "src\\Robot.o" "..\\src\\Robot.cpp" Cannot run program "arm-frc-linux-gnueabi-g++": Launching failed diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/DriveBase/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/DriveBase/.markers.snap index 1d2e660..2f80227 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/DriveBase/.markers.snap and b/.metadata/.plugins/org.eclipse.core.resources/.projects/DriveBase/.markers.snap differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/DriveBase/.syncinfo.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/DriveBase/.syncinfo.snap index 91d6c54..1253ec8 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/DriveBase/.syncinfo.snap and b/.metadata/.plugins/org.eclipse.core.resources/.projects/DriveBase/.syncinfo.snap differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap index 91d6c54..1253ec8 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap and b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.markers.snap differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap index 91d6c54..1253ec8 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap and b/.metadata/.plugins/org.eclipse.core.resources/.projects/RemoteSystemsTempFiles/.syncinfo.snap differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap b/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap index a42220a..0987fc8 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap and b/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources index a014d10..9f60082 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/2.snap b/.metadata/.plugins/org.eclipse.core.resources/2.snap index da2d3ba..8cee7d0 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/2.snap and b/.metadata/.plugins/org.eclipse.core.resources/2.snap differ diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 070770f..26f8bfc 100644 --- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,9 +1,9 @@ - + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration ModelMigrationProcessor.001 - + @@ -12,9 +12,9 @@ topLevel shellMaximized - - - + + + persp.actionSet:org.eclipse.mylyn.doc.actionSet persp.actionSet:org.eclipse.mylyn.tasks.ui.navigation @@ -71,2499 +71,2499 @@ persp.viewSC:org.eclipse.mylyn.tasks.ui.views.tasks persp.newWizSC:org.eclipse.mylyn.tasks.ui.wizards.new.repository.task persp.actionSet:edu.wpi.first.wpilib.plugins.core.actionSet - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + + + - + View categoryTag:Help - + View categoryTag:General activeOnClose - + ViewMenu menuContribution:menu - + - + View categoryTag:Help - - + + org.eclipse.e4.primaryDataStack EditorStack active noFocus - - + + Editor org.eclipse.cdt.ui.editor.CEditor removeOnHide - + menuContribution:popup popup:#CEditorContext popup:org.eclipse.cdt.ui.editor.CEditor.EditorContext popup:#AbstractTextEditorContext - + menuContribution:popup popup:#CEditorRulerContext popup:org.eclipse.cdt.ui.editor.CEditor.RulerContext popup:#AbstractTextEditorRulerContext - + menuContribution:popup popup:#OverviewRulerContext - - + + Editor org.eclipse.cdt.ui.editor.CEditor removeOnHide active - + menuContribution:popup popup:#CEditorContext popup:org.eclipse.cdt.ui.editor.CEditor.EditorContext popup:#AbstractTextEditorContext - + menuContribution:popup popup:#CEditorRulerContext popup:org.eclipse.cdt.ui.editor.CEditor.RulerContext popup:#AbstractTextEditorRulerContext - + menuContribution:popup popup:#OverviewRulerContext - + View categoryTag:General - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu - + - + View categoryTag:C/C++ - + View categoryTag:General - + View categoryTag:General - - + + View categoryTag:General - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.ui.views.ProblemView popup:org.eclipse.ui.ide.MarkersView - + - + View categoryTag:General - + View categoryTag:General highlighted - + ViewMenu menuContribution:menu - + menuContribution:popup popup:org.eclipse.cdt.ui.CDTGlobalBuildConsole - + menuContribution:popup popup:org.eclipse.cdt.ui.CDTBuildConsole - + - + View categoryTag:General - + View categoryTag:General - + ViewMenu menuContribution:menu - + menuContribution:popup popup:#TranslationUnitOutlinerContext - + menuContribution:popup popup:#TranslationUnitOutlinerContext - + - + View categoryTag:Make - + View categoryTag:Mylyn - - + + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - - + + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + Opaque - + Opaque - + Opaque - - + + Opaque - + Opaque - + Opaque - + Draggable - + toolbarSeparator - + - + toolbarSeparator - + - + Draggable - + Opaque - + Opaque - + stretch SHOW_RESTORE_MENU - + Draggable HIDEABLE SHOW_RESTORE_MENU - - + + stretch - + Draggable - + Draggable - - + + TrimStack - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - + + - + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - + + + - - + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - + + platform:win32 - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - - - - + + + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Editor - + View categoryTag:C/C++ - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Make - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:C/C++ - + View categoryTag:General - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Debug - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Git - + View categoryTag:Help - + View categoryTag:Charts - + View categoryTag:Profiling - + View categoryTag:Profiling - + View categoryTag:Profiling - + View categoryTag:Mylyn - + View categoryTag:Mylyn - + View categoryTag:Mylyn - + View categoryTag:Oomph - + View categoryTag:Connections - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:Remote Systems - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Team - + View categoryTag:Team - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:LTTng - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:Tracing - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Help - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:General - + View categoryTag:Ant - + View categoryTag:Debug - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:Java Browsing - + View categoryTag:Java Browsing - + View categoryTag:Java Browsing - + View categoryTag:Java Browsing - + View categoryTag:Java - + View categoryTag:Java - + View categoryTag:Java - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DriveBase/src/TankDrive.h b/DriveBase/src/TankDrive.h index 6640358..aed55a5 100644 --- a/DriveBase/src/TankDrive.h +++ b/DriveBase/src/TankDrive.h @@ -8,16 +8,60 @@ #ifndef SRC_TANKDRIVE_H_ #define SRC_TANKDRIVE_H_ +#ifndef DEADZONE_RADIUS +#define DEADZONE_RADIUS 0.05 +#endif // DEADZONE_RADIUS + #include "WPILib.h" class TankDrive { + public: - TankDrive(CANTalon *left, CANTalon *right) { Left = left; Right = right; } + TankDrive(CANTalon *left[], CANTalon *right[]) + { + Left = new CANTalon[] {left[0], left[1]}; + Right = new CANTalon[] {right[0], right[1]}; + } virtual ~TankDrive() { delete Left[0]; delete Left[1]; delete Right[0]; delete Right[1]; } + void Drive(Joystick *js) + { + float x = js->GetX(), + y = js->GetY(), + th = js->GetThrottle(); + + // set deadzone + if(x > -DEADZONE_RADIUS && x < DEADZONE_RADIUS) + { + x = 0f; + } + if(y > -DEADZONE_RADIUS && y < DEADZONE_RADIUS) + { + y = 0f; + } + + float left=0f, right=0f; + + if(x == 0) + { + left = th * y; + right = left; + } + else + { + + } + + Left[0]->Set(left); + Left[1]->Set(left); + Right[0]->Set(right); + Right[1]->Set(right); + } + private: - CANTalon *Left; - CANTalon *Right; + + CANTalon* Left[]; + CANTalon* Right[]; }; #endif /* SRC_TANKDRIVE_H_ */