Adding SFX to tools zip

Change-Id: I09a04506682a5d0ccbe8e556285de587915f7383

.gitignore

@@ -10,6 +10,11 @@ bin/
 .project
 .classpath
 **/dependency-reduced-pom.xml
+wpilibj/wpilibJavaJNI/nivision/*.c
+wpilibj/wpilibJavaJNI/nivision/*.cpp
+wpilibj/wpilibJavaJNI/nivision/*.s
+wpilibj/wpilibJavaJNI/nivision/*_arm.ini
+wpilibj/wpilibJavaJNI/nivision/*.java
 
 # Created by the jenkins test script
 test-reports
@@ -17,8 +22,9 @@ test-reports
 # Added by the users of vagrant
 jdk-7u45-linux-arm-vfp-sflt.gz
 
-
-
+# IntelliJ
+*.iml
+.idea/
 
 # Created by http://www.gitignore.io
 
@@ -154,6 +160,10 @@ local.properties
 .settings/
 .loadpath
 
+### Python ###
+*.pyc
+__pycache__
+
 # External tool builders
 .externalToolBuilders/
 

CMakeLists.txt

@@ -1,13 +1,16 @@
 cmake_minimum_required(VERSION 2.8)
 project(All-WPILib)
 set(CMAKE_BUILD_TYPE Debug)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=2 -Wall -Wextra -Wno-unused-parameter -fPIC")
-SET(CMAKE_SKIP_BUILD_RPATH TRUE)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter -fPIC")
 
 file(GLOB_RECURSE NI_LIBS ni-libraries/*.so*)
+list(REMOVE_ITEM NI_LIBS ${CMAKE_CURRENT_SOURCE_DIR}/ni-libraries/libwpi.so ${CMAKE_CURRENT_SOURCE_DIR}/ni-libraries/libwpi_2015.so)
+SET(WPI_LD_LIBS ${CMAKE_CURRENT_SOURCE_DIR}/ni-libraries/libwpi.so ${CMAKE_CURRENT_SOURCE_DIR}/ni-libraries/libwpi_2015.so)
 get_filename_component(WPILIB_INCLUDES wpilibc/wpilibC++/include REALPATH)
 get_filename_component(HAL_API_INCLUDES hal/include REALPATH)
 get_filename_component(NWT_API_INCLUDES networktables/cpp/include REALPATH)
+file(GLOB_RECURSE COM_SRC_FILES wpilibc/wpilibC++/src/*.cpp)
+
 add_subdirectory(hal)
 add_subdirectory(networktables/cpp)
 add_subdirectory(wpilibc)

arm-toolchain.cmake

@@ -1,10 +1,9 @@
 cmake_minimum_required(VERSION 2.8)
 INCLUDE(CMakeForceCompiler)
-set(ARM_PREFIX arm-none-linux-gnueabi)
+set(ARM_PREFIX arm-frc-linux-gnueabi)
 set(CMAKE_SYSTEM_NAME Linux)
 CMAKE_FORCE_CXX_COMPILER(${ARM_PREFIX}-g++ GNU)
 CMAKE_FORCE_C_COMPILER(${ARM_PREFIX}-gcc GNU)
-set(CMAKE_CXX_FLAGS "-march=armv7-a -mcpu=cortex-a9 -mfloat-abi=softfp -Wall -Wno-psabi" CACHE STRING "" FORCE)
+set(CMAKE_CXX_FLAGS "-std=c++1y -Wformat=2 -Wall -Wextra -Werror -pedantic -Wno-psabi" CACHE STRING "" FORCE)
 set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3" CACHE STRING "" FORCE)
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g" CACHE STRING "" FORCE) # still want debugging for release?
-SET(CMAKE_FIND_ROOT_PATH $ENV{USER_HOME}/wpilib/toolchains/arm-none-linux-gnueabi-4.4.1/arm-none-linux-gnueabi/libc)

bootstrap.sh

@@ -1,48 +1,18 @@
 #!/usr/bin/env bash
 
 # Update the apt-get repository list
+apt --yes --force-yes install software-properties-common
+apt-add-repository --yes ppa:byteit101/frc-toolchain
 apt-get update
 
 
 # Download and install Java
-apt-get --yes --force-yes install default-jre
-apt-get --yes --force-yes install default-jdk
+apt-get --yes --force-yes install default-jre default-jdk maven python-pip python-setuptools g++-arm-frc-linux-gnueabi sshpass libc6-i386
 
-
-# Install Maven
-apt-get --yes --force-yes install maven
-
-
-# Install git-review
-apt-get --yes --force-yes install python-pip
-apt-get --yes --force-yes install python-setuptools
 easy_install pip
 yes | pip install git-review
 
 
-# Download and install the gcc linux arm-toolchains
-# Get the 32 bit c library
-apt-get --yes --force-yes install libc6-i386
-# Download the tool to unzip .zip files
-apt-get --yes --force-yes install unzip
-# The variables associated with the toolchains
-TOOL_VER="1.0.1"
-TOOL_DIR=~/../home/vagrant/wpilib/toolchains
-# Create the toolchains directory
-mkdir -p $TOOL_DIR
-# Download the toolchains to this directory
-wget -P ${TOOL_DIR}/ http://first.wpi.edu/FRC/c/maven/edu/wpi/first/wpilib/plugins/cpp/toolchains/linux/${TOOL_VER}/linux-${TOOL_VER}.zip
-# Unzip the file
-unzip -q ${TOOL_DIR}/linux-${TOOL_VER}.zip -d ${TOOL_DIR}/
-# Remove the unneeded zip file
-rm ${TOOL_DIR}/linux-${TOOL_VER}.zip
-# Change the name of the directory
-mv -f $TOOL_DIR/linux-${TOOL_VER} ${TOOL_DIR}/arm-none-linux-gnueabi-4.4.1
-chown -R vagrant $TOOL_DIR/arm-none-linux-gnueabi-4.4.1
-# Add the arm toolchains to the path variable
-echo 'PATH=$PATH:/home/vagrant/wpilib/toolchains/arm-none-linux-gnueabi-4.4.1/bin/' >> /home/vagrant/.bashrc
-
-
 # Install the jdk-linux-arm-vfp-sflt
 # Create the target directory for the jdk
 mkdir -p /home/vagrant/jdk-linux-arm-vfp-sflt/
@@ -50,9 +20,6 @@ mkdir -p /home/vagrant/jdk-linux-arm-vfp-sflt/
 tar -xzf /vagrant/jdk-7u45-linux-arm-vfp-sflt.gz -C /home/vagrant/jdk-linux-arm-vfp-sflt/
 
 
-# Install sshpass for the test system
-apt-get --yes --force-yes install sshpass
-
 # Keep this at the end of this file
 printf "\n\n"
 printf "Your virtual enviroment is now nearly set-up.\n"

eclipse-plugins/edu.wpi.first.wpilib.plugins.core.feature/feature.xml

@@ -6,12 +6,12 @@
       provider-name="Worcester Polytechnic Institute">
 
    <copyright>
-      * Copyright (c) 2013 FIRST and WPI
+      * Copyright (c) 2015 FIRST and WPI
 * All rights reserved.
    </copyright>
 
    <license>
-      * Copyright (c) 2013 FIRST and WPI
+      * Copyright (c) 2015 FIRST and WPI
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or
@@ -52,4 +52,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="edu.wpi.first.wpilib.plugins.riolog"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/META-INF/MANIFEST.MF

@@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.navigator.resources;bundle-version="3.4.400",
  org.eclipse.ui.intro,
  org.eclipse.ui.intro.universal,
- org.eclipse.core.expressions;bundle-version="3.4.400"
+ org.eclipse.core.expressions;bundle-version="3.4.400",
+ org.eclipse.core.variables
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: edu.wpi.first.wpilib.plugins.core,

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/plugin.xml

@@ -33,6 +33,14 @@
                toolbarPath="WPILib"
                tooltip="Launch the SmartDashboard to get feedback from the robot.">
          </action>
+         <action
+               class="edu.wpi.first.wpilib.plugins.core.actions.RunSimulationSmartDashboardAction"
+               icon="icons/smartdashboard16x16.png"
+               id="edu.wpi.first.wpilib.plugins.core.actions.RunSimulationSmartDashboardAction"
+               label="Run S&amp;imulation SmartDashboard"
+               menubarPath="edu.wpi.first.wpilib.plugins.core.menu/edu.wpi.first.wpilib.plugins.core.actions"
+               tooltip="Launch the SmartDashboard to get feedback from a simulated robot.">
+         </action>
          <action
                class="edu.wpi.first.wpilib.plugins.core.actions.RunRobotBuilderAction"
                icon="icons/robotbuilder16x16.png"
@@ -83,5 +91,14 @@
             content="WPILib Intro/sample.xml">
       </configExtension>
    </extension>
+   <extension
+         point="org.eclipse.core.variables.valueVariables">
+          <variable
+    name="WPILIB"
+    initialValue="${HOME}/wpilib"
+    description="WPILib Path"
+    >
+   </variable>
+   </extension>
 
 </plugin>

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>edu.wpi.first.wpilib.plugins.core</artifactId>
   <packaging>eclipse-plugin</packaging>
@@ -11,4 +11,222 @@
     <version>0.1.0.qualifier</version>
     <relativePath>..</relativePath>
   </parent>
+  
+  <properties>
+	<build-number>DEVELOPMENT</build-number>
+	<tools-zip>${project.build.directory}/tools-zip</tools-zip>
+  </properties>
+
+  <repositories>
+    <repository>
+      <id>WPILib Maven Repository</id>
+      <url>http://first.wpi.edu/FRC/roborio/maven/</url>
+    </repository>
+  </repositories>
+
+  <build>
+	<resources>
+	  <resource>
+		<directory>.</directory>
+        <includes>
+          <include>resources/configuration.properties</include>
+        </includes>
+		<filtering>true</filtering>
+      </resource>
+	</resources>
+	<plugins>
+	  <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <id>copy-ant-resources-to-tools-zip</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${tools-zip}</outputDirectory>
+              <resources>          
+                <resource>
+                  <directory>src/main/resources/tools-zip</directory>
+                </resource>
+              </resources>              
+            </configuration>            
+          </execution>
+        </executions>
+      </plugin>
+	  <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.8</version>
+        <executions>
+		  
+		  <!-- Fetch the dependencies needed to build the jar.zip file. -->
+          <execution>
+            <id>fetch-jar-zip-dependencies</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+	            <artifactItem>
+	              <groupId>edu.wpi.first.wpilib</groupId>
+	              <artifactId>RobotBuilder</artifactId>
+	              <version>2.0.0-SNAPSHOT</version>
+				  <outputDirectory>${tools-zip}</outputDirectory>
+				  <destFileName>RobotBuilder.jar</destFileName>
+	            </artifactItem>
+	            <artifactItem>
+	              <groupId>edu.wpi.first.wpilib</groupId>
+	              <artifactId>SmartDashboard</artifactId>
+	              <version>1.0.0-SNAPSHOT</version>
+				  <outputDirectory>${tools-zip}</outputDirectory>
+				  <destFileName>SmartDashboard.jar</destFileName>
+	            </artifactItem>
+	            <artifactItem>
+	              <groupId>edu.wpi.first.wpilib</groupId>
+	              <artifactId>sfx</artifactId>
+	              <type>zip</type>
+	              <classifier>zip</classifier>
+				  <outputDirectory>${tools-zip}/../</outputDirectory>
+				  <destFileName>sfx.zip</destFileName>
+	            </artifactItem>
+	            <artifactItem>
+	              <groupId>edu.wpi.first.wpilib.networktables</groupId>
+	              <artifactId>OutlineViewer</artifactId>
+	              <version>1.0.0-SNAPSHOT</version>
+				  <outputDirectory>${tools-zip}</outputDirectory>
+				  <destFileName>OutlineViewer.jar</destFileName>
+	            </artifactItem>
+		    <artifactItem>
+		      <groupId>edu.wpi.first.wpilib</groupId>
+		      <artifactId>java-installer</artifactId>
+		      <version>1.0-SNAPSHOT</version>
+		      <outputDirectory>${tools-zip}</outputDirectory>
+		      <destFileName>java-installer.jar</destFileName>
+		    </artifactItem>
+              </artifactItems>
+                
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+	  <plugin>
+	    <groupId>org.apache.maven.plugins</groupId>
+	    <artifactId>maven-antrun-plugin</artifactId>
+	    <version>1.7</version>
+	    <executions>
+		  
+		  <!-- Set time stamp and version properties. -->
+		  <execution>
+		    <id>set-version-info</id>
+		    <goals>
+			  <goal>run</goal>
+		    </goals>
+		    <phase>process-sources</phase>
+		    <configuration>
+			  <target>
+			    <tstamp>
+				  <format property="timestamp" pattern="yyyy/MM/dd HH:mm:ss z"/>
+			    </tstamp>
+			    <tstamp>
+				  <format property="version-info" pattern="yyyy.MM.dd.HH.mm.ss"/>
+			    </tstamp>
+			    <property name="version" value="${version-info}.${build-number}"/>
+			  </target>
+			  <exportAntProperties>true</exportAntProperties>
+		    </configuration>
+		  </execution>
+
+		  <!-- Generate zip file to unzip for the user. -->
+		  <execution>
+		    <id>generate-jar-zip</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+		    <configuration>
+			  <target>
+				<unzip src="${tools-zip}/../sfx.zip" dest="${tools-zip}"/>
+			    <zip destfile="${project.build.directory}/classes/resources/tools.zip"
+				     basedir="${tools-zip}"
+				     update="true" />
+			  </target>
+		    </configuration>
+		  </execution>
+	    </executions>
+	  </plugin>
+    </plugins>
+    <pluginManagement>
+	  <plugins>
+	    <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+	    <plugin>
+		  <groupId>org.eclipse.m2e</groupId>
+		  <artifactId>lifecycle-mapping</artifactId>
+		  <version>1.0.0</version>
+		  <configuration>
+		    <lifecycleMappingMetadata>
+			  <pluginExecutions>
+			    <pluginExecution>
+				  <pluginExecutionFilter>
+				    <groupId>
+					  org.apache.maven.plugins
+				    </groupId>
+				    <artifactId>
+					  maven-dependency-plugin
+				    </artifactId>
+				    <versionRange>[2.8,)</versionRange>
+				    <goals>
+					  <goal>copy</goal>
+				    </goals>
+				  </pluginExecutionFilter>
+				  <action>
+				    <ignore/>
+				  </action>
+			    </pluginExecution>
+			  </pluginExecutions>
+		    </lifecycleMappingMetadata>
+		  </configuration>
+	    </plugin>
+	  </plugins>
+    </pluginManagement>
+  </build>
+
+  <dependencies>
+    <!-- Add fake dependencies to inform Maven of the correct
+         order it should build projects in during a multi-module build.
+         
+         This list should match the list in the invocation of
+         maven-dependency-plugin:copy above.
+         
+         It may be possible to avoid this duplication by using the 
+         maven-assembly-plugin instead.-->
+    
+    <!-- Library sources for debugging WPILib on the Athena -->
+    <dependency>
+	  <groupId>edu.wpi.first.wpilib</groupId>
+	  <artifactId>RobotBuilder</artifactId>
+	  <version>2.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+	  <groupId>edu.wpi.first.wpilib</groupId>
+	  <artifactId>SmartDashboard</artifactId>
+	  <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+	  <groupId>edu.wpi.first.wpilib</groupId>
+	  <artifactId>sfx</artifactId>
+	              <type>zip</type>
+	  <version>LATEST</version>
+    </dependency>
+    <dependency>
+	  <groupId>edu.wpi.first.wpilib.networktables</groupId>
+	  <artifactId>OutlineViewer</artifactId>
+	  <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
 </project>

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/resources/configuration.properties

@@ -0,0 +1,2 @@
+timestamp=${timestamp}
+version=${version}

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/WPILibCore.java

@@ -105,6 +105,7 @@ public class WPILibCore extends AbstractUIPlugin {
 
 	public void saveGlobalProperties(Properties props) {
 		try {
+			props.setProperty("version", "current");
 			props.store(new FileOutputStream(new File(WPILibCore.getDefault()
 					.getWPILibBaseDir() + "/wpilib.properties")),
 					"Don't add new properties, they will be deleted by the eclipse plugin.");
@@ -133,7 +134,17 @@ public class WPILibCore extends AbstractUIPlugin {
 	}
 
 	public String getDefaultVersion() {
-		return "2013-test-0.4";
+		try {
+			Properties props = new AntPropertiesParser(WPILibCore.class.getResourceAsStream("/resources/configuration.properties")).getProperties();
+			if (props.getProperty("version").startsWith("$")) {
+				return "DEVELOPMENT";
+			} else {
+				return props.getProperty("version");
+			}
+		} catch (CoreException e) {
+            WPILibCore.logError("Error getting properties.", e);
+			return "DEVELOPMENT";
+		}
 	}
 
 	public String getCurrentVersion() {

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/actions/RunOutlineViewerAction.java

@@ -1,6 +1,7 @@
 package edu.wpi.first.wpilib.plugins.core.actions;
 
 import java.io.File;
+import java.io.FilenameFilter;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.DebugPlugin;
@@ -33,13 +34,18 @@ public class RunOutlineViewerAction implements IWorkbenchWindowActionDelegate {
 	 * @see IWorkbenchWindowActionDelegate#run
 	 */
 	public void run(IAction action) {
-		String jarFile = WPILibCore.getDefault().getWPILibBaseDir()+File.separator+"tools"+File.separator
-				+WPILibCore.getDefault().getCurrentVersion()+File.separator+"OutlineViewer-with-dependencies.jar";
-		String[] cmd = {"java", "-jar", jarFile};
+		File dir = new File(WPILibCore.getDefault().getWPILibBaseDir()+File.separator+"tools");
+		File[] files = dir.listFiles(new FilenameFilter() {
+			@Override public boolean accept(File dir, String name) {
+				return name.startsWith("OutlineViewer") && name.endsWith(".jar");
+			}
+		});
+		if (files == null || files.length < 1) return;
+		String[] cmd = {"java", "-jar", files[0].getAbsolutePath()};
 		try {
 			DebugPlugin.exec(cmd, new File(System.getProperty("user.home")));
 		} catch (CoreException e) {
-            WPILibCore.logError("Error running outline viewer.", e);
+            WPILibCore.logError("Error running OutlineViewer.", e);
 		}
 	}
 

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/actions/RunRobotBuilderAction.java

@@ -34,14 +34,13 @@ public class RunRobotBuilderAction implements IWorkbenchWindowActionDelegate {
 	 * @see IWorkbenchWindowActionDelegate#run
 	 */
 	public void run(IAction action) {
-		File dir = new File(WPILibCore.getDefault().getWPILibBaseDir()+File.separator+"tools"+File.separator
-				+WPILibCore.getDefault().getCurrentVersion());
+		File dir = new File(WPILibCore.getDefault().getWPILibBaseDir()+File.separator+"tools");
 		File[] files = dir.listFiles(new FilenameFilter() {
 			@Override public boolean accept(File dir, String name) {
 				return name.startsWith("RobotBuilder") && name.endsWith(".jar");
 			}
 		});
-		if (files.length < 1) return;
+		if (files == null || files.length < 1) return;
 		String[] cmd = {"java", "-jar", files[0].getAbsolutePath()};
 		try {
 			DebugPlugin.exec(cmd, new File(System.getProperty("user.home")));

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/actions/RunSFXDashboardAction.java

@@ -1,6 +1,7 @@
 package edu.wpi.first.wpilib.plugins.core.actions;
 
 import java.io.File;
+import java.io.FilenameFilter;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.DebugPlugin;
@@ -33,13 +34,18 @@ public class RunSFXDashboardAction implements IWorkbenchWindowActionDelegate {
 	 * @see IWorkbenchWindowActionDelegate#run
 	 */
 	public void run(IAction action) {
-		String jarFile = WPILibCore.getDefault().getWPILibBaseDir()+File.separator+"tools"+File.separator
-				+WPILibCore.getDefault().getCurrentVersion()+File.separator+"sfx.jar";
-		String[] cmd = {"java", "-jar", jarFile};
+		File dir = new File(WPILibCore.getDefault().getWPILibBaseDir()+File.separator+"tools");
+		File[] files = dir.listFiles(new FilenameFilter() {
+			@Override public boolean accept(File dir, String name) {
+				return name.startsWith("sfx") && name.endsWith(".jar");
+			}
+		});
+		if (files == null || files.length < 1) return;
+		String[] cmd = {"java", "-jar", files[0].getAbsolutePath()};
 		try {
 			DebugPlugin.exec(cmd, new File(System.getProperty("user.home")));
 		} catch (CoreException e) {
-            WPILibCore.logError("Error running SFXDashboard.", e);
+            WPILibCore.logError("Error running SFX Dashboard.", e);
 		}
 	}
 

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/actions/RunSimulationSmartDashboardAction.java

@@ -0,0 +1,77 @@
+package edu.wpi.first.wpilib.plugins.core.actions;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+
+import edu.wpi.first.wpilib.plugins.core.WPILibCore;
+
+/**
+ * Our sample action implements workbench action delegate.
+ * The action proxy will be created by the workbench and
+ * shown in the UI. When the user tries to use the action,
+ * this delegate will be created and execution will be 
+ * delegated to it.
+ * @see IWorkbenchWindowActionDelegate
+ */
+public class RunSimulationSmartDashboardAction implements IWorkbenchWindowActionDelegate {
+	/**
+	 * The constructor.
+	 */
+	public RunSimulationSmartDashboardAction() {
+	}
+
+	/**
+	 * The action has been activated. The argument of the
+	 * method represents the 'real' action sitting
+	 * in the workbench UI.
+	 * @see IWorkbenchWindowActionDelegate#run
+	 */
+	public void run(IAction action) {
+		File dir = new File(WPILibCore.getDefault().getWPILibBaseDir()+File.separator+"tools");
+		File[] files = dir.listFiles(new FilenameFilter() {
+			@Override public boolean accept(File dir, String name) {
+				return name.startsWith("SmartDashboard") && name.endsWith(".jar");
+			}
+		});
+		if (files == null || files.length < 1) return;
+		String[] cmd = {"java", "-jar", files[0].getAbsolutePath(), "-ip", "localhost"};
+		try {
+			DebugPlugin.exec(cmd, new File(System.getProperty("user.home")));
+		} catch (CoreException e) {
+            WPILibCore.logError("Error running SmartDashboard.", e);
+		}
+	}
+
+	/**
+	 * Selection in the workbench has been changed. We 
+	 * can change the state of the 'real' action here
+	 * if we want, but this can only happen after 
+	 * the delegate has been created.
+	 * @see IWorkbenchWindowActionDelegate#selectionChanged
+	 */
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+
+	/**
+	 * We can use this method to dispose of any system
+	 * resources we previously allocated.
+	 * @see IWorkbenchWindowActionDelegate#dispose
+	 */
+	public void dispose() {
+	}
+
+	/**
+	 * We will cache window object in order to
+	 * be able to provide parent shell for the message dialog.
+	 * @see IWorkbenchWindowActionDelegate#init
+	 */
+	public void init(IWorkbenchWindow window) {
+	}
+}

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/actions/RunSmartDashboardAction.java

@@ -1,6 +1,7 @@
 package edu.wpi.first.wpilib.plugins.core.actions;
 
 import java.io.File;
+import java.io.FilenameFilter;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.DebugPlugin;
@@ -33,9 +34,14 @@ public class RunSmartDashboardAction implements IWorkbenchWindowActionDelegate {
 	 * @see IWorkbenchWindowActionDelegate#run
 	 */
 	public void run(IAction action) {
-		String jarFile = WPILibCore.getDefault().getWPILibBaseDir()+File.separator+"tools"+File.separator
-				+WPILibCore.getDefault().getCurrentVersion()+File.separator+"SmartDashboard.jar";
-		String[] cmd = {"java", "-jar", jarFile};
+		File dir = new File(WPILibCore.getDefault().getWPILibBaseDir()+File.separator+"tools");
+		File[] files = dir.listFiles(new FilenameFilter() {
+			@Override public boolean accept(File dir, String name) {
+				return name.startsWith("SmartDashboard") && name.endsWith(".jar");
+			}
+		});
+		if (files == null || files.length < 1) return;
+		String[] cmd = {"java", "-jar", files[0].getAbsolutePath()};
 		try {
 			DebugPlugin.exec(cmd, new File(System.getProperty("user.home")));
 		} catch (CoreException e) {

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/installer/AbstractInstaller.java

@@ -8,8 +8,6 @@ import java.io.OutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import javax.swing.JOptionPane;
-
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -17,17 +15,18 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.jface.dialogs.MessageDialog;
 
 import edu.wpi.first.wpilib.plugins.core.WPILibCore;
 
 public abstract class AbstractInstaller {
 	protected File installLocation;
-	protected String version;
+	protected String version, installedVersion;
 
-	public AbstractInstaller(String version) {
-		this.installLocation = new File(WPILibCore.getDefault().getWPILibBaseDir()
-				+ File.separator + getFeatureName() + File.separator + version);
+	public AbstractInstaller(String version, String installedVersion, String path) {
+		this.installLocation = new File(path);
 		this.version = version;
+		this.installedVersion = installedVersion;
 	}
 
 	/**
@@ -55,7 +54,7 @@ public abstract class AbstractInstaller {
 				WPILibCore.logInfo("Installing "+getFeatureName()+" if necessary");
 
 				if (!isInstalled()) {
-					WPILibCore.logInfo("Install necessary");
+					WPILibCore.logInfo("Install necessary for " + getFeatureName());
 					try {
 						install();
 					} catch (InstallException e) {
@@ -64,9 +63,9 @@ public abstract class AbstractInstaller {
 								getErrorMessage(e));
 					}
 				}
-
+				
 				updateInstalledVersion(version);
-				WPILibCore.logInfo("Installed");
+				WPILibCore.logInfo("Installed" + getFeatureName());
 
 				return Status.OK_STATUS;
 			}
@@ -105,7 +104,7 @@ public abstract class AbstractInstaller {
 	 * @return True for is there and newer, false otherwise.
 	 */
 	protected boolean isInstalled() {
-		return installLocation.exists(); 
+		return installLocation.exists() && !version.contains("DEVELOPMENT") && version.equals(installedVersion);
 	}
 
 	/**
@@ -117,7 +116,7 @@ public abstract class AbstractInstaller {
 	protected void install() throws InstallException {
 		if(installLocation.exists()) {
 			if(!removeFileHandler(installLocation, true)) {
-				JOptionPane.showMessageDialog(null,
+				MessageDialog.openError(null, "Error",
 					String.format("Could not update the old wpilib folder.%n"
 							+ "Please close any WPILib tools and restart Eclipse."));
 			}
@@ -138,7 +137,7 @@ public abstract class AbstractInstaller {
 					}
 
 					// Call 'unzip'
-					final String[] cmd = {"unzip", tmpFile.getAbsolutePath(), "-d", installLocation.getAbsolutePath()};
+					final String[] cmd = {"unzip" , "-o", tmpFile.getAbsolutePath(), "-d", installLocation.getAbsolutePath()};
 					WPILibCore.logInfo("unzip "+tmpFile.getAbsolutePath()+" -d "+installLocation.getAbsolutePath());
 					final Process unzipProcess = DebugPlugin.exec(cmd, installLocation);
 					try (final InputStream is = unzipProcess.getInputStream()) {

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/installer/ToolsInstaller.java

@@ -1,8 +1,6 @@
 package edu.wpi.first.wpilib.plugins.core.installer;
 
 import java.io.InputStream;
-import java.util.Properties;
-
 import org.eclipse.jface.preference.IPreferenceStore;
 
 import edu.wpi.first.wpilib.plugins.core.WPILibCore;
@@ -11,7 +9,7 @@ import edu.wpi.first.wpilib.plugins.core.preferences.PreferenceConstants;
 public class ToolsInstaller extends AbstractInstaller {
 
 	public ToolsInstaller(String version) {
-		super(version);
+		super(version, WPILibCore.getDefault().getPreferenceStore().getString(PreferenceConstants.TOOLS_VERSION), WPILibCore.getDefault().getWPILibBaseDir() + "/tools");
 	}
 
 	@Override
@@ -22,13 +20,8 @@ public class ToolsInstaller extends AbstractInstaller {
 	@Override
 	protected void updateInstalledVersion(String version) {
 		IPreferenceStore prefs = WPILibCore.getDefault().getPreferenceStore();
-		if (prefs.getBoolean(PreferenceConstants.UPDATE_TOOLS_VERSION)) {
-			WPILibCore.logInfo("Forcing library version to "+version);
-	    	Properties props = WPILibCore.getDefault().getProjectProperties(null);
-	    	props.setProperty("version", version);
-	    	WPILibCore.getDefault().saveGlobalProperties(props);
-			prefs.setValue(PreferenceConstants.TOOLS_VERSION, version);
-		}
+		prefs.setValue(PreferenceConstants.TOOLS_VERSION, version);
+		
 	}
 
 	@Override

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/launching/SimulationNotification.java

@@ -0,0 +1,43 @@
+package edu.wpi.first.wpilib.plugins.core.launching;
+
+import java.awt.Desktop;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.debug.core.DebugPlugin;
+import org.eclipse.jface.dialogs.MessageDialog;
+
+import edu.wpi.first.wpilib.plugins.core.WPILibCore;
+
+public class SimulationNotification {
+	private static final String URL = "https://wpilib.screenstepslive.com/s/4485/m/23353";
+	private static final String SIMULATION_UNSUPPORTED_MSG =
+			"Simulation is unsupported on your current setup.\n" +
+			"For more information see: " + URL;
+	
+	public static void showUnsupported() {
+		String title = "Simulation Unsupported";
+		String message = SIMULATION_UNSUPPORTED_MSG;
+		MessageDialog.openError(null, title, message);
+		try {
+			Desktop.getDesktop().browse(new URI(URL));
+		} catch (IOException e) {
+			WPILibCore.logError("Can't open "+URL, e);
+		} catch (URISyntaxException e) {
+			WPILibCore.logError("Can't open "+URL, e);
+		}
+	}
+	
+	public static boolean supportsSimulation() {
+		String[] cmd = {"frcsim", "--version"};
+		try {
+			DebugPlugin.exec(cmd, new File(System.getProperty("user.home")));
+			return true;
+		} catch (CoreException e) {
+			return false;
+		}
+	}
+}

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/preferences/PreferenceInitializer.java

@@ -19,7 +19,8 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
 		IPreferenceStore store = WPILibCore.getDefault().getPreferenceStore();
 		store.setDefault(PreferenceConstants.TEAM_NUMBER,
 				WPILibCore.getDefault().getProjectProperties(null).getProperty("team-number", "0"));
-		store.setDefault(PreferenceConstants.TOOLS_VERSION, WPILibCore.getDefault().getDefaultVersion());
-		store.setDefault(PreferenceConstants.UPDATE_TOOLS_VERSION, true);
+		String val = store.getString(PreferenceConstants.TOOLS_VERSION);
+		if (!store.contains(PreferenceConstants.TOOLS_VERSION) && val != null)
+			store.setValue(PreferenceConstants.TOOLS_VERSION, "none");
 	}
 }

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/wizards/ExampleWizard.java

@@ -36,10 +36,10 @@ public abstract class ExampleWizard extends Wizard implements INewWizard {
 	 */
 	protected abstract void doFinish(IExampleProject ex, String teamNumber) throws CoreException;
 
-	protected abstract IWizardPage getDetailsPage();
+	protected abstract IWizardPage getDetailsPage(INewProjectInfo info);
 	
 	public abstract IExampleProject makeExampleProject(String name, String description,
-			List<String> tags, List<String> folders, List<IExampleProject.ExportFile> files);
+			List<String> tags, String world, List<String> folders, List<IExampleProject.ExportFile> files);
 	
 	public abstract URL getResourceURL();
 	
@@ -60,7 +60,7 @@ public abstract class ExampleWizard extends Wizard implements INewWizard {
 		}
 		page1 = new ExampleWizardChoicePage(this, selection);
 		addPage(page1);
-		page2 = getDetailsPage();
+		page2 = getDetailsPage(page1);
 		addPage(page2);
 	}
 

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/wizards/ExampleWizardChoicePage.java

@@ -6,6 +6,7 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.swing.event.ChangeListener;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -36,11 +37,12 @@ import edu.wpi.first.wpilib.plugins.core.WPILibCore;
  * OR with the extension that matches the expected one (mpe).
  */
 
-public class ExampleWizardChoicePage extends WizardPage {
+public class ExampleWizardChoicePage extends WizardPage implements INewProjectInfo {
 	private Tree exampleTree;
 	private Browser descriptionText;
 	private IExampleProject selectedExample;
 	private ExampleWizard parent;
+	private ChangeListener listener;
 
 	/**
 	 * Constructor for SampleNewWizardPage.
@@ -89,6 +91,20 @@ public class ExampleWizardChoicePage extends WizardPage {
 		dialogChanged();
 		setControl(container);
 	}
+	
+	public String getName() {
+		if (selectedExample != null) {
+			return selectedExample.getName();
+		}
+		return "";
+	}
+	
+	public String getWorld() {
+		if (selectedExample != null) {
+			return selectedExample.getWorld();
+		}
+		return "";
+	}
 
 	/**
 	 * Tests if the current workbench selection is a suitable container to use.
@@ -137,7 +153,6 @@ public class ExampleWizardChoicePage extends WizardPage {
 	/**
 	 * Ensures that both text fields are set.
 	 */
-
 	private void dialogChanged() {
 		if (exampleTree.getSelection().length > 0) {
 			Object selectedData = exampleTree.getSelection()[0].getData();
@@ -157,6 +172,7 @@ public class ExampleWizardChoicePage extends WizardPage {
 			return;
 		}
 		
+		listener.stateChanged(null);
 		updateStatus(null);
 	}
 
@@ -211,6 +227,11 @@ public class ExampleWizardChoicePage extends WizardPage {
 				tags.add(tagElementList.item(i).getTextContent());
 			}
 		}
+		String world = "";
+		if (element.getElementsByTagName("world") != null &&
+			element.getElementsByTagName("world").item(0) != null) {
+			world = element.getElementsByTagName("world").item(0).getTextContent();
+		}
 		List<String> packages = new ArrayList<String>();
 		tagsElement = element.getElementsByTagName("packages").item(0);
 		if (tagsElement.getNodeType() == Node.ELEMENT_NODE) {
@@ -231,10 +252,15 @@ public class ExampleWizardChoicePage extends WizardPage {
 				}
 			}
 		}
-		return parent.makeExampleProject(name, description, tags, packages, files);
+		return parent.makeExampleProject(name, description, tags, world, packages, files);
 	}
 
 	public IExampleProject getExampleProject() {
 		return selectedExample;
 	}
+
+	@Override
+	public void registerChangeListener(ChangeListener listener) {
+		this.listener = listener;
+	}
 }

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/wizards/IExampleProject.java

@@ -14,4 +14,10 @@ public interface IExampleProject extends ProjectType {
 			this.destination = destination;
 		}
 	}
+
+	/**
+	 * @return The world file to use for simulation, if empty
+	 *         the default is used.
+	 */
+	String getWorld();
 }

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/wizards/INewProjectInfo.java

@@ -0,0 +1,24 @@
+package edu.wpi.first.wpilib.plugins.core.wizards;
+
+import javax.swing.event.ChangeListener;
+
+public interface INewProjectInfo {
+	String getName();
+	String getWorld();
+	void registerChangeListener(ChangeListener changeListener);
+	
+	public static INewProjectInfo Null = new INewProjectInfo() {
+		@Override
+		public String getWorld() {
+			return "";
+		}
+		
+		@Override
+		public String getName() {
+			return "";
+		}
+
+		@Override
+		public void registerChangeListener(ChangeListener changeListener) {}
+	};
+}

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/wizards/NewProjectMainPage.java

@@ -39,6 +39,7 @@ public class NewProjectMainPage extends WizardPage {
 	private boolean showPackage;
 	private boolean showProjectTypes;
 	private TeamNumberPage teamNumberPage;
+	private INewProjectInfo info;
 
 	/**
 	 * Constructor for SampleNewWizardPage.
@@ -46,17 +47,20 @@ public class NewProjectMainPage extends WizardPage {
 	 *
 	 * @param pageName
 	 */
-	public NewProjectMainPage(ISelection selection, TeamNumberPage teamNumberPage) {
+	public NewProjectMainPage(ISelection selection, TeamNumberPage teamNumberPage, INewProjectInfo info) {
 		super("wizardPage");
 		this.teamNumberPage = teamNumberPage;
 		showPackage = true;
 		showProjectTypes = false;
+		this.info = info;
 	}
 
 	/**
 	 * @see IDialogPage#createControl(Composite)
 	 */
 	public void createControl(Composite parent) {
+		System.out.println(info.getName() +" -- "+ info.getWorld());
+		
 		Composite container = new Composite(parent, SWT.NULL);
 		GridLayout layout = new GridLayout();
 		container.setLayout(layout);
@@ -98,18 +102,19 @@ public class NewProjectMainPage extends WizardPage {
 			groupLayout.numColumns = 1;
 			projectTypeGroup.setLayout(groupLayout);
 
+			commandRobot = new Button(projectTypeGroup, SWT.RADIO | SWT.WRAP);
+			commandRobot.setText("Command-Based Robot: A robot project that allows robots to be implemented using the command based model to allow complex functionality to be developed from simpler functionality.");
+			gd = new GridData(GridData.FILL_HORIZONTAL);
+			gd.widthHint = 300;
+			commandRobot.setLayoutData(gd);
+			commandRobot.setSelection(true);
+
 			iterativeRobot = new Button(projectTypeGroup, SWT.RADIO | SWT.WRAP);
 			iterativeRobot.setText("Iterative Robot: A robot project that allows robots to be implemented in an iterative manner.");
 			gd = new GridData(GridData.FILL_HORIZONTAL);
 			gd.widthHint = 300;
 			iterativeRobot.setLayoutData(gd);
 
-			commandRobot = new Button(projectTypeGroup, SWT.RADIO | SWT.WRAP);
-			commandRobot.setText("Command-Based Robot: A robot project that allows robots to be implemented using the command based model to allow complex functionality to be developed from simpler functionality.");
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.widthHint = 300;
-			commandRobot.setLayoutData(gd);
-			
 			sampleRobot = new Button(projectTypeGroup, SWT.RADIO | SWT.WRAP);
 			sampleRobot.setText("Sample Robot: A robot project used for small sample programs or for highly advanced programs with more complete control over program flow");
 			gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -129,7 +134,7 @@ public class NewProjectMainPage extends WizardPage {
 		comp.setLayout(groupLayout);
 		worldText = new Text(comp, SWT.BORDER | SWT.SINGLE);
 		worldText.setLayoutData(gd);
- 		worldText.setText("/usr/share/frcsim/worlds/GearsBotDemo.world");
+		worldText.setText("/usr/share/frcsim/worlds/GearsBotDemo.world");
 		worldText.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				dialogChanged();
@@ -160,11 +165,18 @@ public class NewProjectMainPage extends WizardPage {
 					@Override public void stateChanged(ChangeEvent e) {
 						String teamNumber = TeamNumberPage.getTeamNumberFromPage(teamNumberPage);
 						packageText.setText("org.usfirst.frc.team"+teamNumber+".robot");
-
 					}
 				});
 			}
 		}
+		info.registerChangeListener(new ChangeListener() {
+			@Override public void stateChanged(ChangeEvent e) {
+				projectNameText.setText(info.getName());
+				if (!"".equals(info.getWorld())) {
+					worldText.setText(info.getWorld());
+				}
+			}
+		});
 	}
 
 	/**

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/wizards/ProjectComboField.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
@@ -48,4 +49,8 @@ public class ProjectComboField {
 		combo.addModifyListener(modifyListener);
 	}
 	
+	public void addSelectionListener(SelectionListener selectionListener) {
+		combo.addSelectionListener(selectionListener);
+	}
+
 }

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/wizards/ProjectCreationUtils.java

@@ -21,6 +21,8 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Display;
 
 import edu.wpi.first.wpilib.plugins.core.WPILibCore;
 
@@ -78,9 +80,21 @@ public class ProjectCreationUtils {
 				}
 			} catch (CoreException e) {
                 WPILibCore.logError("Can't create new project.", e);
+				Display.getDefault().syncExec(new Runnable() {
+				@Override
+				public void run() {
+					MessageDialog.openError(Display.getDefault().getActiveShell(), "Error", "Error creating project! This may occur if a project of the same name with different case exists in the Workspace");
+				}
+			});
 			}
+		}else {
+			Display.getDefault().syncExec(new Runnable() {
+				@Override
+				public void run() {
+					MessageDialog.openError(Display.getDefault().getActiveShell(), "Error", "Error! A project of the same name already exists in the Workspace");
+				}
+			});
 		}
-		
 		return newProject;
 	}
 

eclipse-plugins/edu.wpi.first.wpilib.plugins.core/src/main/java/edu/wpi/first/wpilib/plugins/core/wizards/TeamNumberPage.java

@@ -77,8 +77,8 @@ public class TeamNumberPage extends WizardPage {
 	private void dialogChanged() {
 		String teamNumber = getTeamNumber();
 		if (listener != null) listener.stateChanged(null); 
-		if (!teamNumber.matches("^([0-9]+)$")) {
-			updateStatus("Team number must be a valid integer.");
+		if (!teamNumber.matches("^([1-9][0-9]*)$")) {
+			updateStatus("Team number must be a valid integer without leading zeroes.");
 			return;
 		}
 		updateStatus(null);

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.feature/feature.xml

@@ -10,12 +10,12 @@
    </description>
 
    <copyright>
-      * Copyright (c) 2013 FIRST and WPI
+      * Copyright (c) 2015 FIRST and WPI
 * All rights reserved.
    </copyright>
 
    <license>
-      * Copyright (c) 2013 FIRST and WPI
+      * Copyright (c) 2015 FIRST and WPI
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/build.properties

@@ -1 +0,0 @@
-bin.includes = feature.xml

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/feature.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature"
-      label="Linux Toolchain for Robot C++ Development"
-      version="0.2.0"
-      provider-name="Worcester Polytechnic Institute"
-      os="linux">
-
-   <description>
-      The C++ toolchain to build Athena programs on Linux.
-   </description>
-
-   <copyright>
-      * Copyright (c) 2013 FIRST and WPI
-* All rights reserved.
-   </copyright>
-
-   <license>
-      * Copyright (c) 2013 FIRST and WPI
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or
-* without modification, are permitted provided that the following
-* conditions are met:
-* Redistributions of source code must retain the above
-* copyright notice, this list of conditions and the following
-* disclaimer. Redistributions in binary form must reproduce the
-* above copyright notice, this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided
-* with the distribution. Neither the name of the FIRST nor the
-* names of its contributors may be used to endorse or promote
-* products derived from this software without specific prior
-* written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY FIRST AND CONTRIBUTORS``AS IS&apos;&apos;
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY NONINFRINGEMENT
-* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-* EVENT SHALL FIRST OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   </license>
-
-   <requires>
-      <import feature="edu.wpi.first.wpilib.plugins.cpp.feature" version="0.1.0.qualifier"/>
-   </requires>
-
-   <plugin
-         id="edu.wpi.first.wpilib.plugins.cpp.toolchains.linux"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature/pom.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.feature</artifactId>
-  <version>0.2.0</version>
-  <packaging>eclipse-feature</packaging>
-
-  <parent>
-    <groupId>edu.wpi.first.wpilib.plugins</groupId>
-    <artifactId>edu.wpi.first.wpilib.plugins</artifactId>
-    <version>0.1.0.qualifier</version>
-    <relativePath>..</relativePath>
-  </parent>
-
-</project>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/META-INF/MANIFEST.MF

@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Linux
-Bundle-SymbolicName: edu.wpi.first.wpilib.plugins.cpp.toolchains.linux;singleton:=true
-Bundle-Version: 0.2.0
-Bundle-Activator: edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- edu.wpi.first.wpilib.plugins.core;bundle-version="0.1.0",
- edu.wpi.first.wpilib.plugins.cpp;bundle-version="0.1.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/README

@@ -1,8 +0,0 @@
-Making This Plugin Work
-=======================
-
-This plugin needs a very big zip that contains the toolchain. This is
-currently hosted by Jenkins in the "Windows Toolchain Provider"
-project. This can also be created from the download from mentor
-embedded. The file should be resources/toolchain.zip and contains the
-5 main directories.

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/build.properties

@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               resources/,\
-               plugin.xml
-src.includes = resources/

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/plugin.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.startup">
-      <startup
-            class="edu.wpi.first.wpilib.plugins.cpp.toolchains.linux.Activator">
-      </startup>
-   </extension>
-
-</plugin>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/pom.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>edu.wpi.first.wpilib.plugins.cpp.toolchains.linux</artifactId>
-  <version>0.2.0</version>
-  <packaging>eclipse-plugin</packaging>
-
-  <parent>
-    <groupId>edu.wpi.first.wpilib.plugins</groupId>
-    <artifactId>edu.wpi.first.wpilib.plugins</artifactId>
-    <version>0.1.0.qualifier</version>
-    <relativePath>..</relativePath>
-  </parent>
-    
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.8</version>
-        <executions>
-          <execution>
-            <id>copy</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>edu.wpi.first.wpilib.plugins.cpp.toolchains</groupId>
-                  <artifactId>linux</artifactId>
-                  <version>1.0.0</version>
-                  <type>zip</type>
-                  <destFileName>toolchain.zip</destFileName>
-                </artifactItem>
-              </artifactItems>
-              <overWriteIfNewer>true</overWriteIfNewer>
-              <outputDirectory>${project.build.outputDirectory}/resources</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/linux/Activator.java

@@ -1,62 +0,0 @@
-package edu.wpi.first.wpilib.plugins.cpp.toolchains.linux;
-
-import org.eclipse.ui.IStartup;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin implements IStartup {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "edu.wpi.first.wpilib.plugins.cpp.toolchains.windows"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	private String getCurrentVersion() {
-		return WPILibCPPPlugin.getDefault().getDefaultToolchainVersion();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	@Override
-	public void earlyStartup() {
-		new ToolchainInstaller(getCurrentVersion()).installIfNecessary();
-	}
-
-}

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.linux/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/linux/ToolchainInstaller.java

@@ -1,36 +0,0 @@
-package edu.wpi.first.wpilib.plugins.cpp.toolchains.linux;
-
-import java.io.InputStream;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import edu.wpi.first.wpilib.plugins.core.installer.AbstractInstaller;
-import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin;
-import edu.wpi.first.wpilib.plugins.cpp.preferences.PreferenceConstants;
-
-public class ToolchainInstaller extends AbstractInstaller {
-
-	public ToolchainInstaller(String version) {
-		super(version);
-	}
-
-	@Override
-	protected String getFeatureName() {
-		return "toolchains";
-	}
-
-	@Override
-	protected void updateInstalledVersion(String version) {
-		IPreferenceStore prefs = WPILibCPPPlugin.getDefault().getPreferenceStore();
-		if (prefs.getBoolean(PreferenceConstants.UPDATE_TOOLCHAIN_VERSION)) {
-			System.out.println("Forcing library version to "+version);
-			prefs.setValue(PreferenceConstants.TOOLCHAIN_VERSION, version);
-		}
-	}
-
-	@Override
-	protected InputStream getInstallResourceStream() {
-		return ToolchainInstaller.class.getResourceAsStream("/resources/toolchain.zip");
-	}
-
-}

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/build.properties

@@ -1 +0,0 @@
-bin.includes = feature.xml

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature/feature.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.feature"
-      label="Mac Toolchain for Robot C++ Development"
-      version="0.2.0"
-      provider-name="Worcester Polytechnic Institute"
-      os="macosx">
-
-   <description>
-      The C++ toolchain to build Athena programs on a Mac.
-   </description>
-
-   <copyright>
-      * Copyright (c) 2013 FIRST and WPI
-* All rights reserved.
-   </copyright>
-
-   <license>
-      * Copyright (c) 2013 FIRST and WPI
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or
-* without modification, are permitted provided that the following
-* conditions are met:
-* Redistributions of source code must retain the above
-* copyright notice, this list of conditions and the following
-* disclaimer. Redistributions in binary form must reproduce the
-* above copyright notice, this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided
-* with the distribution. Neither the name of the FIRST nor the
-* names of its contributors may be used to endorse or promote
-* products derived from this software without specific prior
-* written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY FIRST AND CONTRIBUTORS``AS IS&apos;&apos;
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY NONINFRINGEMENT
-* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-* EVENT SHALL FIRST OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   </license>
-
-   <requires>
-      <import feature="edu.wpi.first.wpilib.plugins.cpp.feature" version="0.1.0.qualifier"/>
-   </requires>
-
-   <plugin
-         id="edu.wpi.first.wpilib.plugins.cpp.toolchains.mac"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/META-INF/MANIFEST.MF

@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Windows
-Bundle-SymbolicName: edu.wpi.first.wpilib.plugins.cpp.toolchains.mac;singleton:=true
-Bundle-Version: 0.2.0
-Bundle-Activator: edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- edu.wpi.first.wpilib.plugins.core;bundle-version="0.1.0",
- edu.wpi.first.wpilib.plugins.cpp;bundle-version="0.1.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/README

@@ -1,8 +0,0 @@
-Making This Plugin Work
-=======================
-
-This plugin needs a very big zip that contains the toolchain. This is
-currently hosted by Jenkins in the "Windows Toolchain Provider"
-project. This can also be created from the download from mentor
-embedded. The file should be resources/toolchain.zip and contains the
-5 main directories.

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/build.properties

@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               resources/,\
-               plugin.xml
-src.includes = resources/

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/plugin.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.startup">
-      <startup
-            class="edu.wpi.first.wpilib.plugins.cpp.toolchains.mac.Activator">
-      </startup>
-   </extension>
-
-</plugin>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/pom.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>edu.wpi.first.wpilib.plugins.cpp.toolchains.mac</artifactId>
-  <version>0.2.0</version>
-  <packaging>eclipse-plugin</packaging>
-
-  <parent>
-    <groupId>edu.wpi.first.wpilib.plugins</groupId>
-    <artifactId>edu.wpi.first.wpilib.plugins</artifactId>
-    <version>0.1.0.qualifier</version>
-    <relativePath>..</relativePath>
-  </parent>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.8</version>
-        <executions>
-          <execution>
-            <id>copy</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>edu.wpi.first.wpilib.plugins.cpp.toolchains</groupId>
-                  <artifactId>mac</artifactId>
-                  <version>1.0.0</version>
-                  <type>zip</type>
-                  <destFileName>toolchain.zip</destFileName>
-                </artifactItem>
-              </artifactItems>
-              <overWriteIfNewer>true</overWriteIfNewer>
-              <outputDirectory>${project.build.outputDirectory}/resources</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.mac/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/mac/ToolchainInstaller.java

@@ -1,36 +0,0 @@
-package edu.wpi.first.wpilib.plugins.cpp.toolchains.mac;
-
-import java.io.InputStream;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import edu.wpi.first.wpilib.plugins.core.installer.AbstractInstaller;
-import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin;
-import edu.wpi.first.wpilib.plugins.cpp.preferences.PreferenceConstants;
-
-public class ToolchainInstaller extends AbstractInstaller {
-
-	public ToolchainInstaller(String version) {
-		super(version);
-	}
-
-	@Override
-	protected String getFeatureName() {
-		return "toolchains";
-	}
-
-	@Override
-	protected void updateInstalledVersion(String version) {
-		IPreferenceStore prefs = WPILibCPPPlugin.getDefault().getPreferenceStore();
-		if (prefs.getBoolean(PreferenceConstants.UPDATE_TOOLCHAIN_VERSION)) {
-			System.out.println("Forcing library version to "+version);
-			prefs.setValue(PreferenceConstants.TOOLCHAIN_VERSION, version);
-		}
-	}
-
-	@Override
-	protected InputStream getInstallResourceStream() {
-		return ToolchainInstaller.class.getResourceAsStream("/resources/toolchain.zip");
-	}
-
-}

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/build.properties

@@ -1 +0,0 @@
-bin.includes = feature.xml

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/feature.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature"
-      label="Windows Toolchain for Robot C++ Development"
-      version="0.2.0"
-      provider-name="Worcester Polytechnic Institute"
-      os="win32">
-
-   <description>
-      The C++ toolchain to build Athena programs on Windows.
-   </description>
-
-   <copyright>
-      * Copyright (c) 2013 FIRST and WPI
-* All rights reserved.
-   </copyright>
-
-   <license>
-      * Copyright (c) 2013 FIRST and WPI
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or
-* without modification, are permitted provided that the following
-* conditions are met:
-* Redistributions of source code must retain the above
-* copyright notice, this list of conditions and the following
-* disclaimer. Redistributions in binary form must reproduce the
-* above copyright notice, this list of conditions and the following
-* disclaimer in the documentation and/or other materials provided
-* with the distribution. Neither the name of the FIRST nor the
-* names of its contributors may be used to endorse or promote
-* products derived from this software without specific prior
-* written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY FIRST AND CONTRIBUTORS``AS IS&apos;&apos;
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY NONINFRINGEMENT
-* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-* EVENT SHALL FIRST OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   </license>
-
-   <requires>
-      <import feature="edu.wpi.first.wpilib.plugins.cpp.feature" version="0.1.0.qualifier"/>
-   </requires>
-
-   <plugin
-         id="edu.wpi.first.wpilib.plugins.cpp.toolchains.windows"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature/pom.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.feature</artifactId>
-  <version>0.2.0</version>
-  <packaging>eclipse-feature</packaging>
-
-  <parent>
-    <groupId>edu.wpi.first.wpilib.plugins</groupId>
-    <artifactId>edu.wpi.first.wpilib.plugins</artifactId>
-    <version>0.1.0.qualifier</version>
-    <relativePath>..</relativePath>
-  </parent>
-
-</project>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/META-INF/MANIFEST.MF

@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Windows
-Bundle-SymbolicName: edu.wpi.first.wpilib.plugins.cpp.toolchains.windows;singleton:=true
-Bundle-Version: 0.2.0
-Bundle-Activator: edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- edu.wpi.first.wpilib.plugins.core;bundle-version="0.1.0",
- edu.wpi.first.wpilib.plugins.cpp;bundle-version="0.1.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/README

@@ -1,8 +0,0 @@
-Making This Plugin Work
-=======================
-
-This plugin needs a very big zip that contains the toolchain. This is
-currently hosted by Jenkins in the "Windows Toolchain Provider"
-project. This can also be created from the download from mentor
-embedded. The file should be resources/toolchain.zip and contains the
-5 main directories.

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/build.properties

@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               resources/,\
-               plugin.xml
-src.includes = resources/

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/plugin.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.startup">
-      <startup
-            class="edu.wpi.first.wpilib.plugins.cpp.toolchains.windows.Activator">
-      </startup>
-   </extension>
-
-</plugin>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/pom.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>edu.wpi.first.wpilib.plugins.cpp.toolchains.windows</artifactId>
-  <version>0.2.0</version>
-  <packaging>eclipse-plugin</packaging>
-
-  <parent>
-    <groupId>edu.wpi.first.wpilib.plugins</groupId>
-    <artifactId>edu.wpi.first.wpilib.plugins</artifactId>
-    <version>0.1.0.qualifier</version>
-    <relativePath>..</relativePath>
-  </parent>
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.8</version>
-        <executions>
-          <execution>
-            <id>copy</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>edu.wpi.first.wpilib.plugins.cpp.toolchains</groupId>
-                  <artifactId>windows</artifactId>
-                  <version>1.0.0</version>
-                  <type>zip</type>
-                  <destFileName>toolchain.zip</destFileName>
-                </artifactItem>
-              </artifactItems>
-              <overWriteIfNewer>true</overWriteIfNewer>
-              <outputDirectory>${project.build.outputDirectory}/resources</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/windows/Activator.java

@@ -1,62 +0,0 @@
-package edu.wpi.first.wpilib.plugins.cpp.toolchains.windows;
-
-import org.eclipse.ui.IStartup;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin implements IStartup {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "edu.wpi.first.wpilib.plugins.cpp.toolchains.windows"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	private String getCurrentVersion() {
-		return WPILibCPPPlugin.getDefault().getDefaultToolchainVersion();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	@Override
-	public void earlyStartup() {
-		new ToolchainInstaller(getCurrentVersion()).installIfNecessary();
-	}
-
-}

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp.toolchains.windows/src/edu/wpi/first/wpilib/plugins/cpp/toolchains/windows/ToolchainInstaller.java

@@ -1,36 +0,0 @@
-package edu.wpi.first.wpilib.plugins.cpp.toolchains.windows;
-
-import java.io.InputStream;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import edu.wpi.first.wpilib.plugins.core.installer.AbstractInstaller;
-import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin;
-import edu.wpi.first.wpilib.plugins.cpp.preferences.PreferenceConstants;
-
-public class ToolchainInstaller extends AbstractInstaller {
-
-	public ToolchainInstaller(String version) {
-		super(version);
-	}
-
-	@Override
-	protected String getFeatureName() {
-		return "toolchains";
-	}
-
-	@Override
-	protected void updateInstalledVersion(String version) {
-		IPreferenceStore prefs = WPILibCPPPlugin.getDefault().getPreferenceStore();
-		if (prefs.getBoolean(PreferenceConstants.UPDATE_TOOLCHAIN_VERSION)) {
-			System.out.println("Forcing library version to "+version);
-			prefs.setValue(PreferenceConstants.TOOLCHAIN_VERSION, version);
-		}
-	}
-
-	@Override
-	protected InputStream getInstallResourceStream() {
-		return ToolchainInstaller.class.getResourceAsStream("/resources/toolchain.zip");
-	}
-
-}

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/META-INF/MANIFEST.MF

@@ -25,7 +25,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.cdt.debug.ui;bundle-version="7.2.0",
  org.eclipse.cdt.launch;bundle-version="7.1.0",
  org.eclipse.cdt.launch.remote;bundle-version="2.4.0",
- org.eclipse.cdt.debug.mi.core;bundle-version="7.2.0"
+ org.eclipse.cdt.debug.mi.core;bundle-version="7.2.0",
+ org.eclipse.core.variables
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: edu.wpi.first.wpilib.plugins.cpp,

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/plugin.xml

@@ -173,15 +173,6 @@
          </enablement>
       </commonWizard>
    </extension>
-   <extension
-       point="org.eclipse.ui.preferencePages">
-      <page
-            category="edu.wpi.first.wpilib.plugins.core.preferences.WPILibPreferencePage"
-            class="edu.wpi.first.wpilib.plugins.cpp.preferences.CPPPreferencePage"
-            id="edu.wpi.first.wpilib.plugins.cpp.preferences.CPPPreferencePage"
-            name="C++ Preferences">
-      </page>
-   </extension>
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/pom.xml

@@ -133,7 +133,7 @@
 									<format property="timestamp" pattern="yyyy/MM/dd HH:mm:ss z"/>
 								</tstamp>
 								<tstamp>
-									<format property="version-info" pattern="yyyy.MM"/>
+									<format property="version-info" pattern="yyyy.MM.dd.HH.mm.ss"/>
 								</tstamp>
 								<property name="version" value="${version-info}.${build-number}"/>
 							</target>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/.cproject

@@ -1,177 +1,102 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="cdt.managedbuild.config.gnu.cross.exe.debug.418253318">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.cross.exe.debug.418253318" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+		<cconfiguration id="cdt.managedbuild.config.gnu.cross.exe.debug.1104744751">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.cross.exe.debug.1104744751" moduleId="org.eclipse.cdt.core.settings" name="Debug">
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="FRCUserProgram" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="cdt.managedbuild.config.gnu.cross.exe.debug.418253318" name="Debug" parent="cdt.managedbuild.config.gnu.cross.exe.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="">
-					<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.debug.418253318." name="/" resourcePath="">
-						<toolChain errorParsers="" id="cdt.managedbuild.toolchain.gnu.cross.exe.debug.1222262887" name="Cross GCC" nonInternalBuilderId="cdt.managedbuild.builder.gnu.cross" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.debug">
-							<option id="cdt.managedbuild.option.gnu.cross.prefix.513278893" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix" value="arm-none-linux-gnueabi-" valueType="string"/>
-							<option id="cdt.managedbuild.option.gnu.cross.path.1104307" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path" value="$toolchain/bin" valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.801649698" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
-							<builder autoBuildTarget="all" buildPath="${workspace_loc:/$project}/Debug" cleanBuildTarget="clean" errorParsers="" id="org.eclipse.cdt.build.core.internal.builder.2128327489" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="org.eclipse.cdt.build.core.internal.builder"/>
-							<tool command="gcc" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.tool.gnu.cross.c.compiler.432788947" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
-								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.154663678" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
-								<option id="gnu.c.compiler.option.debugging.level.516596133" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
-								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1224398283" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+				<configuration artifactName="FRCUserProgram" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.debug.1104744751" name="Debug" parent="cdt.managedbuild.config.gnu.cross.exe.debug">
+					<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.debug.1104744751." name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.cross.exe.debug.379433867" name="Cross GCC" nonInternalBuilderId="cdt.managedbuild.builder.gnu.cross" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.debug">
+							<option id="cdt.managedbuild.option.gnu.cross.prefix.541714056" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix" value="arm-frc-linux-gnueabi-" valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.864368257" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
+							<builder autoBuildTarget="all" buildPath="${workspace_loc:/$project}/Debug" cleanBuildTarget="clean" id="org.eclipse.cdt.build.core.internal.builder.1308552451" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="org.eclipse.cdt.build.core.internal.builder"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.1261239456" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
+								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.680635682" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
+								<option id="gnu.c.compiler.option.debugging.level.143320011" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1793678673" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
-							<tool command="g++" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.442358515" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
-								<option id="gnu.cpp.compiler.option.optimization.level.549514425" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.debugging.level.1682909384" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
-							        <option id="gnu.cpp.compiler.option.include.paths.1597382905" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/src&quot;"/>
-								  <listOptionValue builtIn="false" value="&quot;$cpp-location/include&quot;"/>
-							        </option>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.963785380" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1505235107" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
+								<option id="gnu.cpp.compiler.option.optimization.level.1204256582" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.option.debugging.level.969129918" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
+								<option id="gnu.cpp.compiler.option.include.paths.394786621" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${WPILIB}/cpp/current/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
+								</option>
+								<option id="gnu.cpp.compiler.option.dialect.std.1060340803" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.c++1y" valueType="enumerated"/>
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1033680971" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.1367166630" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
-							<tool command="g++" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GLDErrorParser" id="cdt.managedbuild.tool.gnu.cross.cpp.linker.1568604896" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
-								<option id="gnu.cpp.link.option.paths.1928585110" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="&quot;$cpp-location/lib&quot;"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.362679811" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.1895838080" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
+								<option id="gnu.cpp.link.option.libs.1363675797" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
+									<listOptionValue builtIn="false" value="wpi"/>
 								</option>
-								<option id="gnu.cpp.link.option.libs.1072058280" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
-									<listOptionValue builtIn="false" value="WPILibAthena"/>
-									<listOptionValue builtIn="false" value="WPILib"/>
-									<listOptionValue builtIn="false" value="HALAthena"/>
-									<listOptionValue builtIn="false" value="NetworkTables"/>
-									<listOptionValue builtIn="false" value="FRC_NetworkCommunication"/>
-									<listOptionValue builtIn="false" value="i2c"/>
-									<listOptionValue builtIn="false" value="ni_emb"/>
-									<listOptionValue builtIn="false" value="NiFpgaLv"/>
-									<listOptionValue builtIn="false" value="NiFpga"/>
-									<listOptionValue builtIn="false" value="nirio_emb_can"/>
-									<listOptionValue builtIn="false" value="NiRioSrv"/>
-									<listOptionValue builtIn="false" value="ni_rtlog"/>
-									<listOptionValue builtIn="false" value="RoboRIO_FRC_ChipObject"/>
-									<listOptionValue builtIn="false" value="spi"/>
-									<listOptionValue builtIn="false" value="visa"/>
-									<listOptionValue builtIn="false" value="dl"/>
-									<listOptionValue builtIn="false" value="pthread"/>
+								<option id="gnu.cpp.link.option.paths.1566479969" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
+									<listOptionValue builtIn="false" value="&quot;${WPILIB}/cpp/current/lib&quot;"/>
 								</option>
-								<option id="gnu.cpp.link.option.flags.1747959472" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,-rpath-link,$cpp-location/lib" valueType="string"/>
-								<option id="gnu.cpp.link.option.other.1891020896" name="Other options (-Xlinker [option])" superClass="gnu.cpp.link.option.other" valueType="stringList">
-									<listOptionValue builtIn="false" value="-export-dynamic"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1757265359" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+								<option id="gnu.cpp.link.option.flags.675338432" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,-rpath,/opt/GenICam_v2_3/bin/Linux_armv7-a" valueType="string"/>
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.132949138" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.archiver.1584536431" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
-							<tool command="as" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GASErrorParser" id="cdt.managedbuild.tool.gnu.cross.assembler.184874228" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
-								<option id="gnu.both.asm.option.include.paths.1131856974" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths"/>
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1900042568" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.archiver.412234585" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
+							<tool id="cdt.managedbuild.tool.gnu.cross.assembler.1047448065" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1542016468" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
-					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
-					</sourceEntries>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
-		<cconfiguration id="cdt.managedbuild.config.gnu.cross.exe.release.1534660163">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.cross.exe.release.1534660163" moduleId="org.eclipse.cdt.core.settings" name="Release">
+		<cconfiguration id="cdt.managedbuild.config.gnu.cross.exe.debug.1104744751.2017904325">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.cross.exe.debug.1104744751.2017904325" moduleId="org.eclipse.cdt.core.settings" name="Simulate">
 				<externalSettings/>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="FRCUserProgram" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.release.1534660163" name="Release" parent="cdt.managedbuild.config.gnu.cross.exe.release">
-					<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.release.1534660163." name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.gnu.cross.exe.release.136041223" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.release">
-							<option id="cdt.managedbuild.option.gnu.cross.prefix.2033173825" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix" value="arm-none-linux-gnueabi-" valueType="string"/>
-							<option id="cdt.managedbuild.option.gnu.cross.path.1246856819" name="Path" superClass="cdt.managedbuild.option.gnu.cross.path" value="$toolchain/bin" valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.433467152" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
-							<builder buildPath="${workspace_loc:/$project}/Release" id="cdt.managedbuild.builder.gnu.cross.716436070" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
-							<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.2003820010" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
-								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.option.optimization.level.1889430616" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
-								<option id="gnu.c.compiler.option.debugging.level.1571598299" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
-								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1532409549" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.901599840" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
-								<option id="gnu.cpp.compiler.option.optimization.level.366961467" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.debugging.level.95433592" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.863062221" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.970059366" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker"/>
-							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.476884336" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker">
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.749590312" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.archiver.1104120173" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
-							<tool id="cdt.managedbuild.tool.gnu.cross.assembler.1966871489" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.304828125" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-        <cconfiguration id="cdt.managedbuild.config.gnu.cross.exe.debug.418253318.2017904325">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.cross.exe.debug.418253318.2017904325" moduleId="org.eclipse.cdt.core.settings" name="Simulate">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="FRCUserProgram" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GmakeErrorParser" id="cdt.managedbuild.config.gnu.cross.exe.debug.418253318.2017904325" name="Simulate" parent="cdt.managedbuild.config.gnu.cross.exe.debug" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="">
-					<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.debug.418253318.2017904325." name="/" resourcePath="">
+				<configuration artifactName="FRCUserProgram" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.debug.1104744751.2017904325" name="Simulate" parent="cdt.managedbuild.config.gnu.cross.exe.debug">
+					<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.debug.1104744751.2017904325." name="/" resourcePath="">
 						<toolChain errorParsers="" id="cdt.managedbuild.toolchain.gnu.base.1184188597" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.1621111203" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
 							<builder buildPath="${workspace_loc:/${ProjName}}/Simulate" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator" id="cdt.managedbuild.target.gnu.builder.base.840272037" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.158466008" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
-							<tool command="g++" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.tool.gnu.cpp.compiler.base.2105416021" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
+							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.2105416021" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
 								<option id="gnu.cpp.compiler.option.include.paths.1645322059" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/src&quot;"/>
-									<listOptionValue builtIn="false" value="$cpp-location/sim/include"/>
+									<listOptionValue builtIn="false" value="${WPILIB}/cpp/current/sim/include"/>
 									<listOptionValue builtIn="false" value="/usr/include"/>
 									<listOptionValue builtIn="false" value="/usr/include/gazebo-3.1"/>
-									<listOptionValue builtIn="false" value="/usr/include/sdformat-2.0"/>
+									<listOptionValue builtIn="false" value="/usr/include/sdformat-2.2"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.optimization.level.1648211502" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
 								<option id="gnu.cpp.compiler.option.debugging.level.937474733" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1758810658" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
 							</tool>
-							<tool command="gcc" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.tool.gnu.c.compiler.base.2039239712" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
+							<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.2039239712" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
 								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.2100353684" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.debugging.level.1900634657" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1197133064" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.c.linker.base.66697269" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
-							<tool command="g++" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GLDErrorParser" id="cdt.managedbuild.tool.gnu.cpp.linker.base.2094820582" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
+							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.2094820582" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
 								<option id="gnu.cpp.link.option.libs.1563598353" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
-									<listOptionValue builtIn="false" value="WPILib"/>
 									<listOptionValue builtIn="false" value="WPILibSim"/>
-									<listOptionValue builtIn="false" value="WPILib"/>
 									<listOptionValue builtIn="false" value="gazebo"/>
 									<listOptionValue builtIn="false" value="gazebo_transport"/>
 									<listOptionValue builtIn="false" value="gazebo_msgs"/>
@@ -190,82 +115,30 @@
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
-							<tool command="as" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GASErrorParser" id="cdt.managedbuild.tool.gnu.assembler.base.2105089872" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
+							<tool id="cdt.managedbuild.tool.gnu.assembler.base.2105089872" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.254601899" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
-					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
-					</sourceEntries>
 				</configuration>
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="$project.cdt.managedbuild.target.gnu.cross.exe.548740421" name="Executable" projectType="cdt.managedbuild.target.gnu.cross.exe"/>
+		<project id="$project.cdt.managedbuild.target.gnu.cross.exe.13534228" name="Executable" projectType="cdt.managedbuild.target.gnu.cross.exe"/>
 	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.debug.418253318;cdt.managedbuild.config.gnu.cross.exe.debug.418253318.;cdt.managedbuild.tool.gnu.cross.c.compiler.432788947;cdt.managedbuild.tool.gnu.c.compiler.input.1224398283">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-				<buildOutputProvider>
-					<openAction enabled="true" filePath=""/>
-					<parser enabled="true"/>
-				</buildOutputProvider>
-				<scannerInfoProvider id="specsFile">
-					<runAction arguments="-E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;" command="arm-none-linux-gnueabi-gcc" useDefault="true"/>
-					<parser enabled="true"/>
-				</scannerInfoProvider>
-			</profile>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.debug.1104744751;cdt.managedbuild.config.gnu.cross.exe.debug.1104744751.;cdt.managedbuild.tool.gnu.cross.c.compiler.1261239456;cdt.managedbuild.tool.gnu.c.compiler.input.1793678673">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.release.1534660163;cdt.managedbuild.config.gnu.cross.exe.release.1534660163.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.901599840;cdt.managedbuild.tool.gnu.cpp.compiler.input.863062221">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
-			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-				<buildOutputProvider>
-					<openAction enabled="true" filePath=""/>
-					<parser enabled="true"/>
-				</buildOutputProvider>
-				<scannerInfoProvider id="specsFile">
-					<runAction arguments="-E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;" command="arm-none-linux-gnueabi-g++" useDefault="true"/>
-					<parser enabled="true"/>
-				</scannerInfoProvider>
-			</profile>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.debug.418253318;cdt.managedbuild.config.gnu.cross.exe.debug.418253318.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.442358515;cdt.managedbuild.tool.gnu.cpp.compiler.input.963785380">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
-			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-				<buildOutputProvider>
-					<openAction enabled="true" filePath=""/>
-					<parser enabled="true"/>
-				</buildOutputProvider>
-				<scannerInfoProvider id="specsFile">
-					<runAction arguments="-E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;" command="arm-none-linux-gnueabi-g++" useDefault="true"/>
-					<parser enabled="true"/>
-				</scannerInfoProvider>
-			</profile>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.release.1534660163;cdt.managedbuild.config.gnu.cross.exe.release.1534660163.;cdt.managedbuild.tool.gnu.cross.c.compiler.2003820010;cdt.managedbuild.tool.gnu.c.compiler.input.1532409549">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-			<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-				<buildOutputProvider>
-					<openAction enabled="true" filePath=""/>
-					<parser enabled="true"/>
-				</buildOutputProvider>
-				<scannerInfoProvider id="specsFile">
-					<runAction arguments="-E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;" command="arm-none-linux-gnueabi-gcc" useDefault="true"/>
-					<parser enabled="true"/>
-				</scannerInfoProvider>
-			</profile>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.debug.1104744751;cdt.managedbuild.config.gnu.cross.exe.debug.1104744751.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1505235107;cdt.managedbuild.tool.gnu.cpp.compiler.input.1033680971">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Release">
-			<resource resourceType="PROJECT" workspacePath="/$project"/>
-		</configuration>
 		<configuration configurationName="Debug">
 			<resource resourceType="PROJECT" workspacePath="/$project"/>
 		</configuration>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/build.properties

@@ -1,20 +1,3 @@
-# Deployment information
-username=admin
-password=
-deploy.dir=/home/admin
-deploy.kill.command=/usr/local/frc/bin/frcKillRobot.sh -t -r
-deploy.log.file=/var/local/natinst/log/FRC_UserProgram.log
-command.dir=/home/lvuser/
-
-# Libraries to use
-wpilib=${user.home}/wpilib/cpp/${cpp-version}
-wpilib.lib=${wpilib}/lib
-
-# Ant support
-wpilib.ant.dir=${wpilib}/ant
-jsch.jar=${wpilib.ant.dir}/jsch-0.1.50.jar
-classloadertask.jar=${wpilib.ant.dir}/ant-classloadertask.jar
-
 # Build information
 out=FRCUserProgram
 src.dir=src
@@ -27,3 +10,6 @@ sim.exe=Simulate/${out}
 wpilib.sim=${wpilib}/sim
 sim.tools=${wpilib.sim}/tools
 sim.lib=${wpilib.sim}/lib
+
+# Use the current C++ library by default
+cpp-version=current

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/build.xml

@@ -21,6 +21,7 @@
   
   <property file="${user.home}/wpilib/wpilib.properties"/>
   <property file="build.properties"/>
+  <property file="${user.home}/wpilib/cpp/${version}/ant/build.properties"/>
   
   <import file="${wpilib.ant.dir}/build.xml"/>
 

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/command-based/Robot.cpp

@@ -15,10 +15,16 @@ private:
 		autonomousCommand = new ExampleCommand();
 		lw = LiveWindow::GetInstance();
 	}
+	
+	void DisabledPeriodic()
+	{
+		Scheduler::GetInstance()->Run();
+	}
 
 	void AutonomousInit()
 	{
-		autonomousCommand->Start();
+		if (autonomousCommand != NULL)
+			autonomousCommand->Start();
 	}
 
 	void AutonomousPeriodic()
@@ -32,7 +38,8 @@ private:
 		// teleop starts running. If you want the autonomous to 
 		// continue until interrupted by another command, remove
 		// this line or comment it out.
-		autonomousCommand->Cancel();
+		if (autonomousCommand != NULL)
+			autonomousCommand->Cancel();
 	}
 
 	void TeleopPeriodic()

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/ArcadeDrive/src/Robot.cpp

@@ -0,0 +1,40 @@
+#include "WPILib.h"
+
+/**
+ * This is a demo program showing the use of the RobotDrive class.
+ * The SampleRobot class is the base of a robot application that will automatically call your
+ * Autonomous and OperatorControl methods at the right time as controlled by the switches on
+ * the driver station or the field controls.
+ *
+ * WARNING: While it may look like a good choice to use for your code if you're inexperienced,
+ * don't. Unless you know what you are doing, complex code will be much more difficult under
+ * this system. Use IterativeRobot or Command-Based instead if you're new.
+ */
+class Robot: public SampleRobot
+{
+	RobotDrive myRobot; // robot drive system
+	Joystick stick; // only joystick
+
+public:
+	Robot() :
+			myRobot(0, 1),	// initialize the RobotDrive to use motor controllers on ports 0 and 1
+			stick(0)
+	{
+		myRobot.SetExpiration(0.1);
+	}
+
+	/**
+	 * Runs the motors with arcade steering.
+	 */
+	void OperatorControl()
+	{
+		while (IsOperatorControl() && IsEnabled())
+		{
+			myRobot.ArcadeDrive(stick); // drive with arcade style (use right stick)
+			Wait(0.005);				// wait for a motor update time
+		}
+	}
+
+};
+
+START_ROBOT_CLASS(Robot);

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/CANPDP/src/Robot.cpp

@@ -0,0 +1,47 @@
+#include "WPILib.h"
+
+/**
+ * This is a sample program showing how to retrieve information from
+ *   the Power Distribution Panel via CAN.
+ * The information will be displayed under variables through the SmartDashboard.
+ */
+class Robot: public SampleRobot
+{
+
+	// Object for dealing with the Power Distribution Panel (PDP).
+	PowerDistributionPanel m_pdp;
+
+	// Update every 5milliseconds/0.005 seconds.
+	const double kUpdatePeriod = 0.005;
+
+public:
+	Robot() {
+	}
+
+	/**
+	 * Retrieve information from the PDP over CAN and
+	 *   displays it on the SmartDashboard interface.
+	 * SmartDashboard::PutNumber takes a string (for a label) and a double;
+	 * GetCurrent takes a channel number and returns a double for current,
+	 *   in Amperes. Channel numbers are printed on the PDP and range from 0-15.
+	 */
+	void OperatorControl()
+	{
+		while (IsOperatorControl() && IsEnabled())
+		{
+			// Get the current going through channel 7, in Amperes.
+			// The PDP returns the current in increments of 0.125A.
+			// At low currents the current readings tend to be less accurate. 
+			SmartDashboard::PutNumber("Current Channel 7", m_pdp.GetCurrent(7));
+			// Get the voltage going into the PDP, in Volts.
+			// The PDP returns the voltage in increments of 0.05 Volts.
+			SmartDashboard::PutNumber("Voltage", m_pdp.GetVoltage());
+			// Retrieves the temperature of the PDP, in degrees Celsius.
+			SmartDashboard::PutNumber("Temperature", m_pdp.GetTemperature());
+			Wait(kUpdatePeriod);
+		}
+	}
+
+};
+
+START_ROBOT_CLASS(Robot);

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/CANTalon/src/Robot.cpp

@@ -0,0 +1,38 @@
+#include "WPILib.h"
+
+/**
+ * This sample shows how to use the new CANTalon to just run a motor in a basic
+ *   throttle mode, in the same manner as you might control a traditional PWM
+ *   controlled motor.
+ *
+ */
+class Robot : public SampleRobot {
+	CANTalon m_motor;
+
+  Joystick m_stick;
+
+	// update every 0.01 seconds/10 milliseconds.
+  // The talon only receives control packets every 10ms.
+	double kUpdatePeriod = 0.010;
+
+public:
+ Robot()
+     : m_motor(1),   // Initialize the Talon as device 1. Use the roboRIO web
+                    // interface to change the device number on the talons.
+       m_stick(0)
+ {}
+
+	/**
+	 * Runs the motor from the output of a Joystick.
+	 */
+	void OperatorControl() {
+		while (IsOperatorControl() && IsEnabled()) {
+      // Takes a number from -1.0 (full reverse) to +1.0 (full forwards).
+			m_motor.Set(m_stick.GetY());
+
+			Wait(kUpdatePeriod); // Wait a bit so that the loop doesn't lock everything up.
+		}
+	}
+};
+
+START_ROBOT_CLASS(Robot);

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/CANTalonPID/src/Robot.cpp

@@ -0,0 +1,63 @@
+#include "WPILib.h"
+
+/**
+ * This is a quick sample program to show how to use the new Talon SRX over CAN.
+ * This particular sample demonstrates running a basic PID control loop with an
+ *   analog potentiometer.
+ *
+ */
+class Robot : public SampleRobot {
+	CANTalon m_motor;
+
+public:
+ Robot()
+     : m_motor(1)   // Initialize the Talon as device 1. Use the roboRIO web
+                    // interface to change the device number on the m_motors.
+ {
+   // This sets the mode of the m_motor. The options are:
+   // kPercentVbus: basic throttle; no closed-loop.
+   // kCurrent: Runs the motor with the specified current if possible.
+   // kSpeed: Runs a PID control loop to keep the motor going at a constant
+   //   speed using the specified sensor.
+   // kPosition: Runs a PID control loop to move the motor to a specified move
+   //   the motor to a specified sensor position.
+   // kVoltage: Runs the m_motor at a constant voltage, if possible.
+   // kFollower: The m_motor will run at the same throttle as the specified other talon.
+   m_motor.SetControlMode(CANSpeedController::kPosition);
+   // This command allows you to specify which feedback device to use when doing
+   // closed-loop control. The options are:
+   // AnalogPot: Basic analog potentiometer
+   // QuadEncoder: Quadrature Encoder
+   // AnalogEncoder: Analog Encoder
+   // EncRising: Counts the rising edges of the QuadA pin (allows use of a
+   //   non-quadrature encoder)
+   // EncFalling: Same as EncRising, but counts on falling edges.
+   m_motor.SetFeedbackDevice(CANTalon::AnalogPot);
+   // This sets the basic P, I , and D values (F, Izone, and rampRate can also
+   //   be set, but are ignored here).
+   // These must all be positive floating point numbers (SetSensorDirection will
+   //   multiply the sensor values by negative one in case your sensor is flipped
+   //   relative to your motor).
+   // These values are in units of throttle / sensor_units where throttle ranges
+   //   from -1023 to +1023 and sensor units are from 0 - 1023 for analog
+   //   potentiometers, encoder ticks for encoders, and position / 10ms for
+   //   speeds.
+   m_motor.SetPID(1.0, 0.0, 0.0);
+ }
+
+	/**
+	 * Runs the motor from the output of a Joystick.
+	 */
+	void OperatorControl() {
+		while (IsOperatorControl() && IsEnabled()) {
+      // In closed loop mode, this sets the goal in the units mentioned above.
+      // Since we are using an analog potentiometer, this will try to go to
+      //   the middle of the potentiometer range.
+			m_motor.Set(512);
+
+			Wait(5.0);
+		}
+	}
+};
+
+START_ROBOT_CLASS(Robot);

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/Encoder/src/Robot.cpp

@@ -0,0 +1,82 @@
+#include "WPILib.h"
+
+/**
+ * Sample program displaying the value of a quadrature encoder on the SmartDashboard.
+ * Quadrature Encoders are digital sensors which can detect the amount the encoder
+ *   has rotated since starting as well as the direction in which the encoder
+ *   shaft is rotating. However, encoders can not tell you the absolute
+ *   position of the encoder shaft (ie, it considers where it starts to be the
+ *   zero position, no matter where it starts), and so can only tell you how
+ *   much the encoder has rotated since starting.
+ * Depending on the precision of an encoder, it will have fewer or greater
+ *   ticks per revolution; the number of ticks per revolution will affect the
+ *   conversion between ticks and distance, as specified by DistancePerPulse.
+ * One of the most common uses of encoders is in the drivetrain, so that the
+ *   distance that the robot drives can be precisely controlled during the
+ *   autonomous mode.
+ */
+class Robot: public SampleRobot
+{
+	Encoder m_encoder;
+
+	/**
+	 * Time to wait between updating SmartDashboard values.
+	 * It is generally a good idea to stick a short wait in these loops
+	 *   to avoid hogging CPU power, especially as there will be no
+	 *   perceivable difference in the SmartDashboard display.
+	 */
+	const double kUpdatePeriod = 0.005; // 5milliseconds / 0.005 seconds.
+
+public:
+	/**
+	 * The Encoder object is constructed with 4 parameters, the last two being optional.
+	 * The first two parameters (1, 2 in this case) refer to the ports on the
+	 *   roboRIO which the encoder uses. Because a quadrature encoder has
+	 *   two signal wires, the signal from two DIO ports on the roboRIO are used.
+	 * The third (optional) parameter is a boolean which defaults to false.
+	 *   If you set this parameter to true, the direction of the encoder will
+	 *   be reversed, in case it makes more sense mechanically.
+	 * The final (optional) parameter specifies encoding rate (k1X, k2X, or k4X)
+	 *   and defaults to k4X. Faster (k4X) encoding gives greater positional
+	 *   precision but more noise in the rate.
+	 */
+	Robot() : m_encoder(1, 2, false, Encoder::k4X)
+	{
+		// Defines the number of samples to average when determining the rate.
+		// On a quadrature encoder, values range from 1-255; larger values
+		//   result in smoother but potentially less accurate rates than lower values.
+		m_encoder.SetSamplesToAverage(5);
+
+		// Defines how far the mechanism attached to the encoder moves per pulse.
+		// In this case, we assume that a 360 count encoder is directly attached
+		//   to a 3 inch diameter (1.5inch radius) wheel, and that we want to
+		//   measure distance in inches.
+		m_encoder.SetDistancePerPulse(1.0 / 360.0 * 2.0 * 3.1415 * 1.5);
+
+		// Defines the lowest rate at which the encoder will not be considered
+		//   stopped, for the purposes of the GetStopped() method.
+		// Units are in distance / second, where distance refers to the units
+		//   of distance that you are using, in this case inches.
+		m_encoder.SetMinRate(1.0);
+	}
+
+	/**
+	 * Retrieve various information from the encoder and display it
+	 *   on the SmartDashboard.
+	 */
+	void OperatorControl()
+	{
+		while (IsOperatorControl() && IsEnabled())
+		{
+			// Retrieve the net displacement of the Encoder since the lsat Reset.
+			SmartDashboard::PutNumber("Encoder Distance", m_encoder.GetDistance());
+
+			// Retrieve the current rate of the encoder.
+			SmartDashboard::PutNumber("Encoder Rate", m_encoder.GetRate());
+
+			Wait(kUpdatePeriod); // Wait a short bit before updating again.
+		}
+	}
+};
+
+START_ROBOT_CLASS(Robot);

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/GearsBot/src/OI.cpp

@@ -19,7 +19,7 @@ OI::OI() {
 	SmartDashboard::PutData("Open Claw", new OpenClaw());
 	SmartDashboard::PutData("Close Claw", new CloseClaw());
 
-	joy= new Joystick(1);
+	joy= new Joystick(0);
 
 
     // Create some buttons

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/GearsBot/src/Subsystems/Elevator.h

@@ -13,7 +13,7 @@ private:
     SpeedController* motor;
     Potentiometer* pot;
 
-    static const double kP_real = 4, kI_real = 0.07,
+    static constexpr double kP_real = 4, kI_real = 0.07,
             			kP_simulation = 18, kI_simulation = 0.2;
 
 public:

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/GearsBot/src/Subsystems/Wrist.h

@@ -13,7 +13,7 @@ private:
 	SpeedController* motor;
     Potentiometer* pot; // TODO: Make Potentiometer
 
-    static const double kP_real = 1, kP_simulation = 0.05;
+    static constexpr double kP_real = 1, kP_simulation = 0.05;
 
 public:
     Wrist();

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/GettingStarted/src/Robot.cpp

@@ -11,7 +11,7 @@ class Robot: public IterativeRobot
 public:
 	Robot() :
 		myRobot(0, 1),	// these must be initialized in the same order
-		stick(1),		// as they are declared above.
+		stick(0),		// as they are declared above.
 		lw(NULL),
 		autoLoopCounter(0)
 	{

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/IntermediateVision/src/Robot.cpp

@@ -0,0 +1,49 @@
+#include "WPILib.h"
+
+/**
+ * Uses IMAQdx to manually acquire a new image each frame, and annotate the image by drawing
+ * a circle on it, and show it on the FRC Dashboard.
+ */
+class IntermediateVisionRobot : public SampleRobot
+{
+	IMAQdxSession session;
+	Image *frame;
+	IMAQdxError imaqError;
+
+public:
+	void RobotInit() override {
+	    // create an image
+		frame = imaqCreateImage(IMAQ_IMAGE_RGB, 0);
+		// open the camera
+		imaqError = IMAQdxOpenCamera("cam0", IMAQdxCameraControlModeController, &session);
+		if(imaqError != IMAQdxErrorSuccess) {
+			DriverStation::ReportError("IMAQdxOpenCamera error: " + std::to_string((long)imaqError) + "\n");
+		}
+		imaqError = IMAQdxConfigureGrab(session);
+		if(imaqError != IMAQdxErrorSuccess) {
+			DriverStation::ReportError("IMAQdxConfigureGrab error: " + std::to_string((long)imaqError) + "\n");
+		}
+	}
+
+	void OperatorControl() override {
+	    // acquire images
+		IMAQdxStartAcquisition(session);
+
+        // grab an image, draw the circle, and provide it for the camera server which will
+        // in turn send it to the dashboard.
+		while(IsOperatorControl() && IsEnabled()) {
+			IMAQdxGrab(session, frame, true, NULL);
+			if(imaqError != IMAQdxErrorSuccess) {
+				DriverStation::ReportError("IMAQdxGrab error: " + std::to_string((long)imaqError) + "\n");
+			} else {
+				imaqDrawShapeOnImage(frame, frame, { 10, 10, 100, 100 }, DrawMode::IMAQ_DRAW_VALUE, ShapeMode::IMAQ_SHAPE_OVAL, 0.0f);
+				CameraServer::GetInstance()->SetImage(frame);
+			}
+		}
+        // stop image acquisition
+		IMAQdxStopAcquisition(session);
+	}
+};
+
+START_ROBOT_CLASS(IntermediateVisionRobot);
+

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/MecanumDrive/src/Robot.cpp

@@ -0,0 +1,49 @@
+#include "WPILib.h"
+
+/**
+ * This is a demo program showing how to use Mecanum control with the RobotDrive class.
+ */
+class Robot: public SampleRobot
+{
+
+    // Channels for the wheels
+    const static int frontLeftChannel	= 2;
+    const static int rearLeftChannel	= 3;
+    const static int frontRightChannel	= 1;
+    const static int rearRightChannel	= 0;
+
+    const static int joystickChannel	= 0;
+
+	RobotDrive robotDrive;	// robot drive system
+	Joystick stick;			// only joystick
+
+public:
+	Robot() :
+			robotDrive(frontLeftChannel, rearLeftChannel,
+					   frontRightChannel, rearRightChannel),	// these must be initialized in the same order
+			stick(joystickChannel)								// as they are declared above.
+	{
+		robotDrive.SetExpiration(0.1);
+		robotDrive.SetInvertedMotor(RobotDrive::kFrontLeftMotor, true);	// invert the left side motors
+		robotDrive.SetInvertedMotor(RobotDrive::kRearLeftMotor, true);	// you may need to change or remove this to match your robot
+	}
+
+	/**
+	 * Runs the motors with Mecanum drive.
+	 */
+	void OperatorControl()
+	{
+		robotDrive.SetSafetyEnabled(false);
+		while (IsOperatorControl() && IsEnabled())
+		{
+        	// Use the joystick X axis for lateral movement, Y axis for forward movement, and Z axis for rotation.
+        	// This sample does not use field-oriented drive, so the gyro input is set to zero.
+			robotDrive.MecanumDrive_Cartesian(stick.GetX(), stick.GetY(), stick.GetZ());
+
+			Wait(0.005); // wait 5ms to avoid hogging CPU cycles
+		}
+	}
+
+};
+
+START_ROBOT_CLASS(Robot);

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/MotorControl/src/Robot.cpp

@@ -0,0 +1,44 @@
+#include "WPILib.h"
+
+/**
+ * This sample program shows how to control a motor using a joystick. In the operator
+ * control part of the program, the joystick is read and the value is written to the motor.
+ *
+ * Joystick analog values range from -1 to 1 and speed controller inputs as range from
+ * -1 to 1 making it easy to work together. The program also delays a short time in the loop
+ * to allow other threads to run. This is generally a good idea, especially since the joystick
+ * values are only transmitted from the Driver Station once every 20ms.
+ */
+class Robot : public SampleRobot {
+	Joystick m_stick;
+
+	// The motor to control with the Joystick.
+	// This uses a Talon speed controller; use the Victor or Jaguar classes for
+	//   other speed controllers.
+	Talon m_motor;
+
+	// update every 0.005 seconds/5 milliseconds.
+	double kUpdatePeriod = 0.005;
+
+public:
+	Robot() :
+			m_stick(0), // Initialize Joystick on port 0.
+			m_motor(0) // Initialize the Talon on channel 0.
+	{
+	}
+
+	/**
+	 * Runs the motor from the output of a Joystick.
+	 */
+	void OperatorControl() {
+		while (IsOperatorControl() && IsEnabled()) {
+			// Set the motor controller's output.
+			// This takes a number from -1 (100% speed in reverse) to +1 (100% speed forwards).
+			m_motor.Set(m_stick.GetY());
+
+			Wait(kUpdatePeriod); // Wait 5ms for the next update.
+		}
+	}
+};
+
+START_ROBOT_CLASS(Robot);

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/MotorControlEncoder/src/Robot.cpp

@@ -0,0 +1,55 @@
+#include "WPILib.h"
+
+/**
+ * This sample program shows how to control a motor using a joystick. In the operator
+ * control part of the program, the joystick is read and the value is written to the motor.
+ * An Encoder is then used to read the total distance that the motor has turned and
+ *   to display it on the SmartDashboard.
+ *
+ * Joystick analog values range from -1 to 1 and speed controller inputs as range from
+ * -1 to 1 making it easy to work together. The program also delays a short time in the loop
+ * to allow other threads to run. This is generally a good idea, especially since the joystick
+ * values are only transmitted from the Driver Station once every 20ms.
+ */
+class Robot : public SampleRobot {
+	Joystick m_stick;
+
+	// The motor to control with the Joystick.
+	// This uses a Talon speed controller; use the Victor or Jaguar classes for
+	//   other speed controllers.
+	Talon m_motor;
+
+	// update every 0.005 seconds/5 milliseconds.
+	double kUpdatePeriod = 0.005;
+
+	Encoder m_encoder;
+
+public:
+	Robot() :
+			m_stick(0), // Initialize Joystick on port 0.
+			m_motor(2), // Initialize the Talon on channel 0.
+			m_encoder(1, 2) // Iniitialize encoder connected on DIO ports 1 and 2.
+	{
+		// Distance will give total rotations of the motor, assuming a 360 count encoder.
+		m_encoder.SetDistancePerPulse(1.0 / 360.0);
+	}
+
+	/**
+	 * Runs the motor from the output of a Joystick.
+	 * Simultaneously displays encoder values on the SmartDashboard.
+	 */
+	void OperatorControl() {
+		while (IsOperatorControl() && IsEnabled()) {
+			// Set the motor controller's output.
+			// This takes a number from -1 (100% speed in reverse) to +1 (100% speed forwards).
+			m_motor.Set(m_stick.GetY());
+
+			// Display the total displacement of the encoder, in rotations.
+			SmartDashboard::PutNumber("Encoder Distance", m_encoder.GetDistance());
+
+			Wait(kUpdatePeriod); // Wait 5ms for the next update.
+		}
+	}
+};
+
+START_ROBOT_CLASS(Robot);

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/PacGoat/src/Commands/DriveForward.h

@@ -12,8 +12,8 @@ private:
 	double driveForwardSpeed;
 	double distance;
 	double error;
-	static const double TOLERANCE = .1;
-	static const double KP = -1.0 / 5.0;
+	static constexpr double TOLERANCE = .1;
+	static constexpr double KP = -1.0 / 5.0;
 	void init(double dist, double maxSpeed);
 public:
 	DriveForward();

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/PacGoat/src/OI.cpp

@@ -10,7 +10,7 @@
 #include "Commands/SetCollectionSpeed.h"
 
 OI::OI() {
-	joystick = new Joystick(1);
+	joystick = new Joystick(0);
 
 	R1 = new JoystickButton(joystick, 12);
 	R1->WhenPressed(new LowGoal());

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/PacGoat/src/Subsystems/Collector.h

@@ -13,9 +13,9 @@ class Collector: public Subsystem
 {
 public:
 	// Constants for some useful speeds
-	static const double FORWARD = 1;
-	static const double STOP = 0;
-	static const double REVERSE = -1;
+	static constexpr double FORWARD = 1;
+	static constexpr double STOP = 0;
+	static constexpr double REVERSE = -1;
 
 private:
 	// Subsystem devices

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/PacGoat/src/Subsystems/Pivot.h

@@ -12,10 +12,10 @@ class Pivot: public PIDSubsystem
 {
 public:
 	// Constants for some useful angles
-	static const double COLLECT = 105;
-	static const double LOW_GOAL = 90;
-	static const double SHOOT = 45;
-	static const double SHOOT_NEAR = 30;
+	static constexpr double COLLECT = 105;
+	static constexpr double LOW_GOAL = 90;
+	static constexpr double SHOOT = 45;
+	static constexpr double SHOOT_NEAR = 30;
 
 private:
 	// Subsystem devices

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/PacGoat/src/Subsystems/Pneumatics.h

@@ -17,7 +17,7 @@ private:
 		Compressor* compressor;
 	#endif
 
-	static const double MAX_PRESSURE = 2.55;
+	static constexpr double MAX_PRESSURE = 2.55;
 
 public:
 	Pneumatics();

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/QuickVision/src/Robot.cpp

@@ -0,0 +1,22 @@
+#include "WPILib.h"
+
+/**
+ * Uses the CameraServer class to automatically capture video from a USB webcam
+ * and send it to the FRC dashboard without doing any vision processing. This
+ * is the easiest way to get camera images to the dashboard. Just add this to the
+ * RobotInit() method in your program.
+ */
+class QuickVisionRobot : public SampleRobot
+{
+public:
+	void RobotInit() override {
+		CameraServer::GetInstance()->SetQuality(75);
+		CameraServer::GetInstance()->StartAutomaticCapture();
+	}
+
+	void OperatorControl() override {
+	}
+};
+
+START_ROBOT_CLASS(QuickVisionRobot);
+

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/Relay/src/Robot.cpp

@@ -0,0 +1,69 @@
+#include "WPILib.h"
+
+/**
+ * This is a sample program which uses joystick buttons to control a relay.
+ * A Relay (generally a spike) has two outputs, each of which can be at either
+ *   0V or 12V and so can be used for actions such as turning a motor off,
+ *   full forwards, or full reverse, and is generally used on the compressor.
+ * This program uses two buttons on a joystick and each button corresponds to
+ *   one output; pressing the button sets the output to 12V and releasing sets
+ *   it to 0V.
+ * During Operator Control, the loop waits for a brief time before continuing
+ *   in order to allow other threads to run. This is generally a good idea,
+ *   especially as joystick values are only received every 20ms.
+ */
+class Robot: public SampleRobot
+{
+	// Joystick with which to control the relay.
+	Joystick m_stick;
+
+	// Relay to use for the
+	Relay m_relay;
+
+	// Numbers of the buttons to be used for controlling the Relay.
+	const int kRelayForwardButton = 1;
+	const int kRelayReverseButton = 2;
+
+	// Update every 5milliseconds/0.005 seconds.
+	const double kUpdatePeriod = 0.005;
+
+public:
+	Robot() :
+			m_stick(0), // Use joystick on port 0.
+			m_relay(0)  // Relay on port 0.
+	{
+	}
+
+	/**
+	 * Control a Relay using Joystick buttons.
+	 */
+	void OperatorControl()
+	{
+		while (IsOperatorControl() && IsEnabled())
+		{
+			// Retrieve the button values. GetRawButton will return
+			//   true if the button is pressed and false if not.
+			bool forward = m_stick.GetRawButton(kRelayForwardButton);
+			bool reverse = m_stick.GetRawButton(kRelayReverseButton);
+
+			// Depending on the button values, we want to use one of
+			//   kOn, kOff, kForward, or kReverse.
+			// kOn sets both outputs to 12V, kOff sets both to 0V,
+			//   kForward sets forward to 12V and reverse to 0V, and
+			//   kReverse sets reverse to 12V and forward to 0V.
+			if (forward && reverse)
+				m_relay.Set(Relay::kOn);
+			else if (forward)
+				m_relay.Set(Relay::kForward);
+			else if (reverse)
+				m_relay.Set(Relay::kReverse);
+			else
+				m_relay.Set(Relay::kOff);
+
+			// Insert 5ms delay in loop.
+			Wait(kUpdatePeriod);
+		}
+	}
+};
+
+START_ROBOT_CLASS(Robot);

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/Solenoid/src/Robot.cpp

@@ -0,0 +1,77 @@
+#include "WPILib.h"
+
+/**
+ * This is a sample program showing the use of the solenoid classes during
+ *   operator control.
+ * Three buttons from a joystick will be used to control two solenoids:
+ *   One button to control the position of a single solenoid and the other
+ *   two buttons to control a double solenoid.
+ * Single solenoids can either be on or off, such that the air diverted through
+ *   them goes through either one channel or the other.
+ * Double solenoids have three states: Off, Forward, and Reverse. Forward and
+ *   Reverse divert the air through the two channels and correspond to the
+ *   on and off of a single solenoid, but a double solenoid can also be "off",
+ *   where both channels are diverted to exhaust such that there is no pressure
+ *   in either channel.
+ * Additionally, double solenoids take up two channels on your PCM whereas
+ *   single solenoids only take a single channel.
+ * During Operator Control, the loop waits for a brief time before continuing
+ *   in order to allow other threads to run. This is generally a good idea,
+ *   especially as joystick values are only received every 20ms.
+ */
+class Robot: public SampleRobot
+{
+	// Joystick with buttons to control solenoids with.
+	Joystick m_stick;
+	// Solenoids to control with the joystick.
+	// Solenoid corresponds to a single solenoid.
+	Solenoid m_solenoid;
+	// DoubleSolenoid corresponds to a double solenoid.
+	DoubleSolenoid m_doubleSolenoid;
+
+	// Update every 5milliseconds/0.005 seconds.
+	const double kUpdatePeriod = 0.005;
+
+	// Numbers of the buttons to use for triggering the solenoids.
+	const int kSolenoidButton = 1;
+	const int kDoubleSolenoidForward = 2;
+	const int kDoubleSolenoidReverse = 3;
+
+public:
+	Robot() :
+			m_stick(0), // Use joystick on port 0.
+			m_solenoid(0), // Use solenoid on channel 0.
+			// Use double solenoid with Forward Channel of 1 and Reverse of 2.
+			m_doubleSolenoid(1, 2)
+	{
+	}
+
+	/**
+	 * Sets the solenoids from the position of joystick buttons.
+	 */
+	void OperatorControl()
+	{
+		while (IsOperatorControl() && IsEnabled())
+		{
+			// The output of GetRawButton is true/false depending on whether
+			//   the button is pressed; Set takes a boolean for for whether to
+			//   use the default (false) channel or the other (true).
+			m_solenoid.Set(m_stick.GetRawButton(kSolenoidButton));
+
+			// In order to set the double solenoid, we will say that if neither
+			//   button is pressed, it is off, if just one button is pressed,
+			//   set the solenoid to correspond to that button, and if both
+			//   are pressed, set the solenoid to Forwards.
+			if (m_stick.GetRawButton(kDoubleSolenoidForward))
+				m_doubleSolenoid.Set(DoubleSolenoid::kForward);
+			else if (m_stick.GetRawButton(kDoubleSolenoidReverse))
+				m_doubleSolenoid.Set(DoubleSolenoid::kReverse);
+			else
+				m_doubleSolenoid.Set(DoubleSolenoid::kOff);
+
+			Wait(kUpdatePeriod);				// wait for a motor update time
+		}
+	}
+};
+
+START_ROBOT_CLASS(Robot);

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/examples/examples.xml

@@ -15,39 +15,318 @@
     <name>Simulation</name>
     <description>Examples that can be run in simulation.</description>
   </tagDescription>-->
+
   <tagDescription>
 	<name>Getting Started with C++</name>
 	<description>Examples for getting started with FRC C++</description>
   </tagDescription>
-  <example>
-	<name>Getting Started</name>
-	<description>An example program which demonstrates the simplest autonomous and
-	teleoperated routines.</description>
-	<tags>
-	  <tag>Getting Started with C++</tag>
-	</tags>
-	<packages>
-	  <package>src</package>
-	</packages>
-	<files>
-	  <file source="examples/GettingStarted/src/Robot.cpp"
-			destination="src/Robot.cpp"></file>
-	</files>
-  </example>
-	
+
   <tagDescription>
     <name>CommandBased Robot</name>
     <description>Examples for CommandBased robot programs.</description>
   </tagDescription>
 
+  <tagDescription>
+    <name>Actuators</name>
+    <description>Example programs that demonstrate the use of various actuators</description>
+  </tagDescription>
+
+  <tagDescription>
+    <name>Analog</name>
+    <description>Examples programs that show different uses of analog inputs, 
+      outputs and various analog sensors</description>
+  </tagDescription>
+
+  <tagDescription>
+    <name>CAN</name>
+    <description>Example programs that demonstrate the use of the CAN components in the control system</description>
+  </tagDescription>
+
+  <tagDescription>
+    <name>Complete List</name>
+    <description>Complete list of all sample programs across all categories</description>
+  </tagDescription>
+
+  <tagDescription>
+    <name>Digital</name>
+    <description>Example programs that demonstrate the sensors that use the digital I/O ports</description>
+  </tagDescription>
+
+  <tagDescription>
+    <name>I2C</name>
+    <description>Example programs that demonstrate the use of I2C and various sensors that use it</description>
+  </tagDescription>
+
+  <tagDescription>
+    <name>Joystick</name>
+    <description>Example programs that demonstate different uses of joysticks for robot driving</description>
+  </tagDescription>
+
+  <tagDescription>
+    <name>Pneumatics</name>
+    <description>Example programs that demonstrate the use of the compressor and solenoids</description>
+  </tagDescription>
+
+  <tagDescription>
+    <name>Robot and Motor</name>
+    <description>Example programs that demonstrate driving a robot and motors including safety, servos, etc.</description>
+  </tagDescription>
+
+  <tagDescription>
+    <name>SPI</name>
+    <description>Example programs that demonstrate the use of the SPI bus and sensors that connect to it</description>
+  </tagDescription>
+
+  <tagDescription>
+    <name>Safety</name>
+    <description>Example programs that demonstate the motor safety classes and how to use them with your programs</description>
+  </tagDescription>
+
+  <tagDescription>
+    <name>Sensors</name>
+    <description>Example programs that demonstrate the use of the various commonly used sensors on FRC robots</description>
+  </tagDescription>
+
+    <tagDescription>
+        <name>Vision</name>
+        <description>Example programs that demonstrate the use of a camera for image acquisition and processing</description>
+    </tagDescription>
+
+    <example>
+  <name>Motor Controller</name>
+  <description>Demonstrate controlling a single motor with a Joystick.</description>
+  <tags>
+    <tag>Robot and Motor</tag>
+    <tag>Actuators</tag>
+    <tag>Joystick</tag>
+    <tag>Complete List</tag>
+  </tags>
+  <packages>
+    <package>src</package>
+  </packages>
+  <files>
+    <file source="examples/MotorControl/src/Robot.cpp" destination="src/Robot.cpp"></file>
+  </files>
+</example>
+
+<example>
+  <name>Motor Control With Encoder</name>
+  <description>Demonstrate controlling a single motor with a Joystick and displaying the net movement of the motor using an encoder.</description>
+  <tags>
+    <tag>Robot and Motor</tag>
+    <tag>Digital</tag>
+    <tag>Sensors</tag>
+    <tag>Actuators</tag>
+    <tag>Joystick</tag>
+    <tag>Complete List</tag>
+  </tags>
+  <packages>
+    <package>src</package>
+  </packages>
+  <files>
+    <file source="examples/MotorControl/src/Robot.cpp" destination="src/Robot.cpp"></file>
+  </files>
+</example>
+
+<example>
+  <name>CAN Talon SRX</name>
+  <description>Quick demo of running the SRX at a given throttle value.</description>
+  <tags>
+    <tag>Robot and Motor</tag>
+    <tag>Digital</tag>
+    <tag>Actuators</tag>
+    <tag>Complete List</tag>
+  </tags>
+  <packages>
+    <package>src</package>
+  </packages>
+  <files>
+    <file source="examples/CANTalon/src/Robot.cpp" destination="src/Robot.cpp"></file>
+  </files>
+</example>
+
+<example>
+  <name>CAN Talon SRX PID</name>
+  <description>Quick demo of running the SRX with a PID loop.</description>
+  <tags>
+    <tag>Robot and Motor</tag>
+    <tag>Digital</tag>
+    <tag>Actuators</tag>
+    <tag>Complete List</tag>
+  </tags>
+  <packages>
+    <package>src</package>
+  </packages>
+  <files>
+    <file source="examples/CANTalonPID/src/Robot.cpp" destination="src/Robot.cpp"></file>
+  </files>
+</example>
+
+<example>
+  <name>Relay</name>
+  <description>Demonstrate controlling a Relay from Joystick buttons.</description>
+  <tags>
+    <tag>Actuators</tag>
+    <tag>Joystick</tag>
+    <tag>Complete List</tag>
+  </tags>
+  <packages>
+    <package>src</package>
+  </packages>
+  <files>
+    <file source="examples/Relay/src/Robot.cpp" destination="src/Robot.cpp"></file>
+  </files>
+</example>
+
+<example>
+  <name>PDP CAN Monitoring</name>
+  <description>Demonstrate using CAN to monitor the voltage, current, and temperature in the Power Distribution Panel.</description>
+  <tags>
+    <tag>Complete List</tag>
+    <tag>CAN</tag>
+    <tag>Sensors</tag>
+  </tags>
+  <packages>
+    <package>src</package>
+  </packages>
+  <files>
+    <file source="examples/CANPDP/src/Robot.cpp" destination="src/Robot.cpp"></file>
+  </files>
+</example>
+
+<example>
+  <name>Solenoids</name>
+  <description>Demonstrate controlling a single and double solenoid from Joystick buttons.</description>
+  <tags>
+    <tag>Actuators</tag>
+    <tag>Joystick</tag>
+    <tag>Pneumatics</tag>
+    <tag>Complete List</tag>
+  </tags>
+  <packages>
+    <package>src</package>
+  </packages>
+  <files>
+    <file source="examples/Solenoid/src/Robot.cpp" destination="src/Robot.cpp"></file>
+  </files>
+</example>
+
+<example>
+  <name>Encoder</name>
+  <description>Demonstrate displaying the value of a quadrature encoder on the SmartDashboard.</description>
+  <tags>
+    <tag>Complete List</tag>
+    <tag>Digital</tag>
+    <tag>Sensors</tag>
+  </tags>
+  <packages>
+    <package>src</package>
+  </packages>
+  <files>
+    <file source="examples/Encoder/src/Robot.cpp" destination="src/Robot.cpp"></file>
+  </files>
+</example>
+
+<example>
+  <name>Arcade Drive</name>
+  <description>An example program which the use of Arcade Drive with the RobotDrive class</description>
+  <tags>
+    <tag>Getting Started with C++</tag>
+    <tag>Robot and Motor</tag>
+    <tag>Joystick</tag>
+    <tag>Complete List</tag>
+  </tags>
+  <packages>
+    <package>src</package>
+  </packages>
+  <files>
+    <file source="examples/ArcadeDrive/src/Robot.cpp" destination="src/Robot.cpp"></file>
+  </files>
+  </example>
+
+
+<example>
+  <name>Mecanum Drive</name>
+  <description>An example program which the use of Mecanum Drive with the RobotDrive class</description>
+  <tags>
+    <tag>Getting Started with C++</tag>
+    <tag>Robot and Motor</tag>
+    <tag>Joystick</tag>
+    <tag>Complete List</tag>
+  </tags>
+  <packages>
+    <package>src</package>
+  </packages>
+  <files>
+    <file source="examples/MecanumDrive/src/Robot.cpp" destination="src/Robot.cpp"></file>
+  </files>
+  </example>
+
+
   <example>
+  <name>Getting Started</name>
+  <description>An example program which demonstrates the simplest autonomous and
+  teleoperated routines.</description>
+  <tags>
+    <tag>Getting Started with C++</tag>
+    <tag>Complete List</tag>
+  </tags>
+  <packages>
+    <package>src</package>
+  </packages>
+  <files>
+    <file source="examples/GettingStarted/src/Robot.cpp"
+      destination="src/Robot.cpp"></file>
+  </files>
+  </example>
+
+    <example>
+        <name>Simple vision program</name>
+        <description>The minimal program to acquire images from an attached USB camera on the robot
+        and send them to the dashboard.</description>
+        <tags>
+            <tag>Vision</tag>
+            <tag>Complete List</tag>
+        </tags>
+        <packages>
+            <package>src</package>
+        </packages>
+        <files>
+            <file source="examples/QuickVision/src/Robot.cpp"
+                  destination="src/Robot.cpp"></file>
+        </files>
+    </example>
+
+    <example>
+        <name>Intermediate vision</name>
+        <description>An example program that acquires images from an attached USB camera and adds some
+            annotation to the image as you might do for showing operators the result of some image
+            recognition, and sends it to the dashboard for display.
+        </description>
+        <tags>
+            <tag>Vision</tag>
+            <tag>Complete List</tag>
+        </tags>
+        <packages>
+            <package>src</package>
+        </packages>
+        <files>
+            <file source="examples/IntermediateVision/src/Robot.cpp"
+                  destination="src/Robot.cpp"></file>
+        </files>
+    </example>
+
+
+    <example>
     <name>GearsBot</name>
     <description>A fully functional example CommandBased program for
     WPIs GearsBot robot. This code can run on your computer if it
     supports simulation.</description>
     <tags>
       <tag>CommandBased Robot</tag>
+      <tag>Complete List</tag>
     </tags>
+    <world>/usr/share/frcsim/worlds/GearsBotDemo.world</world>
     <packages>
       <package>src</package>
       <package>src/Commands</package>
@@ -130,7 +409,9 @@
     <description>A fully functional example CommandBased program for FRC Team 190&#39;s 2014 robot. This code can run on your computer if it supports simulation.</description>
     <tags>
       <tag>CommandBased Robot</tag>
+      <tag>Complete List</tag>
     </tags>
+    <world>/usr/share/frcsim/worlds/PacGoat2014.world</world>
     <packages>
       <package>src</package>
       <package>src/Commands</package>

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/sample/Robot.cpp

@@ -18,7 +18,7 @@ class Robot: public SampleRobot
 public:
 	Robot() :
 			myRobot(0, 1),	// these must be initialized in the same order
-			stick(1)		// as they are declared above.
+			stick(0)		// as they are declared above.
 	{
 		myRobot.SetExpiration(0.1);
 	}
@@ -40,7 +40,7 @@ public:
 	void OperatorControl()
 	{
 		myRobot.SetSafetyEnabled(true);
-		while (IsOperatorControl())
+		while (IsOperatorControl() && IsEnabled())
 		{
 			myRobot.ArcadeDrive(stick); // drive with arcade style (use right stick)
 			Wait(0.005);				// wait for a motor update time

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/WPILibCPPPlugin.java

@@ -58,15 +58,6 @@ public class WPILibCPPPlugin extends AbstractUIPlugin implements IStartup {
 		return plugin;
 	}
 
-	public String getDefaultToolchainVersion() {
-		return "arm-none-linux-gnueabi-4.4.1";
-	}
-
-	public String getToolchain() {
-		return WPILibCore.getDefault().getWPILibBaseDir()
-				+ File.separator + "toolchains" + File.separator + getPreferenceStore().getString(PreferenceConstants.TOOLCHAIN_VERSION);
-	}
-	
 	public String getCurrentVersion() {
 		try {
 			Properties props = new AntPropertiesParser(WPILibCPPPlugin.class.getResourceAsStream("/resources/configuration.properties")).getProperties();
@@ -82,7 +73,7 @@ public class WPILibCPPPlugin extends AbstractUIPlugin implements IStartup {
 
 	public String getCPPDir() {
 		return WPILibCore.getDefault().getWPILibBaseDir()
-				+ File.separator + "cpp" + File.separator + getPreferenceStore().getString(PreferenceConstants.LIBRARY_VERSION);
+				+ File.separator + "cpp" + File.separator + "current";
 	}
 
 	@Override

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/installer/CPPInstaller.java

@@ -1,11 +1,12 @@
 package edu.wpi.first.wpilib.plugins.cpp.installer;
 
 import java.io.InputStream;
-import java.util.Properties;
 
-import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.variables.IStringVariableManager;
+import org.eclipse.core.variables.IValueVariable;
+import org.eclipse.core.variables.VariablesPlugin;
 
-import edu.wpi.first.wpilib.plugins.core.WPILibCore;
 import edu.wpi.first.wpilib.plugins.core.installer.AbstractInstaller;
 import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin;
 import edu.wpi.first.wpilib.plugins.cpp.preferences.PreferenceConstants;
@@ -19,28 +20,43 @@ import edu.wpi.first.wpilib.plugins.cpp.preferences.PreferenceConstants;
 public class CPPInstaller extends AbstractInstaller {
 
 	public CPPInstaller(String version) {
-		super(version);
+		super(version, 
+				WPILibCPPPlugin.getDefault().getPreferenceStore().getString(PreferenceConstants.LIBRARY_INSTALLED), WPILibCPPPlugin.getDefault().getCPPDir());
 	}
-
-	@Override
-	protected String getFeatureName() {
-		return "cpp";
-	}
-
 	@Override
 	protected void updateInstalledVersion(String version) {
-		IPreferenceStore prefs = WPILibCPPPlugin.getDefault().getPreferenceStore();
-		if (prefs.getBoolean(PreferenceConstants.UPDATE_LIBRARY_VERSION)) {
-			WPILibCPPPlugin.logInfo("Forcing library version to "+version);
-	    	Properties props = WPILibCore.getDefault().getProjectProperties(null);
-	    	props.setProperty("cpp-version", version);
-	    	WPILibCore.getDefault().saveGlobalProperties(props);
-			prefs.setValue(PreferenceConstants.LIBRARY_VERSION, version);
+		WPILibCPPPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.LIBRARY_INSTALLED,
+				version);
+		
+		IStringVariableManager vm = VariablesPlugin.getDefault().getStringVariableManager();
+		try
+		{
+			if (System.getProperty("os.name").startsWith("Windows"))
+			{
+				IValueVariable vv = vm.getValueVariable("HOME");
+				if (vv == null)
+					vm.addVariables(new IValueVariable[]{vm.newValueVariable("HOME", "user.home directory", false,System.getProperty("user.home"))});
+				else
+				{
+					if (!System.getProperty("user.home").equals(vm.performStringSubstitution("${HOME}")))
+						vv.setValue(System.getProperty("user.home"));
+				}
+			}
+		} catch (CoreException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			throw new RuntimeException(e);
 		}
 	}
-
+	
 	@Override
 	protected InputStream getInstallResourceStream() {
 		return CPPInstaller.class.getResourceAsStream("/resources/cpp.zip");
 	}
+
+	@Override
+	protected String getFeatureName()
+	{
+		return "cpp";
+	}
 }

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/launching/DeployLaunchShortcut.java

@@ -120,12 +120,7 @@ public class DeployLaunchShortcut implements ILaunchShortcut
 			ILaunchConfigurationWorkingCopy config;
 			try {
 				config = getRemoteDebugConfig(activeProj);
-				//config.doSave(); // NOTE: For debugging
-				//org.eclipse.debug.core.DebugPlugin.getDefault().getLaunchManager().addLaunch(config.launch(mode, null));
-				//THIS IS MADDENING! we want to add to the recent history, but I can't seem to find a public api to do so, so lets just launch the config dialog
-				//DebugUITools.openLaunchConfigurationPropertiesDialog(shell, config, "org.eclipse.cdt.launch.launchGroup");
-				//config.launch(mode, new NullProgressMonitor(), false, true);
-				DebugUITools.launch(config, mode);
+				DebugUITools.launch(config.doSave(), mode);
 			} catch (CoreException e) {
 				WPILibCPPPlugin.logError("Debug attach failed.", e);
 			}
@@ -149,32 +144,27 @@ public class DeployLaunchShortcut implements ILaunchShortcut
 		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ENABLE_VARIABLE_BOOKKEEPING, false);
 		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, "org.eclipse.rse.remotecdt.RemoteGDBDebugger");
 		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_REGISTER_GROUPS, "");
-		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, "run");
-		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, true);
-		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN_SYMBOL, "main");
+		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_START_MODE, "remote");
+		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_STOP_AT_MAIN, false);
 		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL, true);
 		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME, activeProj.getName());
 		Collection<Executable> exes = ExecutablesManager.getExecutablesManager().getExecutablesForProject(activeProj);
 		config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_NAME,
 				exes.size() > 0 ? exes.toArray(new Executable[0])[0].getPath().makeRelativeTo(activeProj.getLocation()).toString():
 			 "Debug/FRCUserProgram");
-			 
-			 
-		config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_PATH, "/home/admin/FRCUserProgram");
+		
+		config.setAttribute("org.eclipse.cdt.dsf.gdb.DEBUG_NAME", "arm-frc-linux-gnueabi-gdb");
+		config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_PATH, "/home/lvuser/FRCUserProgram");
 		config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_REMOTE_CONNECTION, remote_connection);
 		config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_SKIP_DOWNLOAD_TO_TARGET, false);
 		config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_PORT, "2345");
 		config.setAttribute(IRemoteConnectionConfigurationConstants.ATTR_GDBSERVER_COMMAND, "gdbserver");
 		
-		config.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME, WPILibCPPPlugin.getDefault().getToolchain() + "/bin/arm-none-linux-gnueabi-gdb");
 		List<String> solibs = new ArrayList<>();
-		solibs.add(WPILibCPPPlugin.getDefault().getToolchain() + "/arm-non-linux-gnueabi/libc/lib");
-		solibs.add(WPILibCPPPlugin.getDefault().getToolchain() + "/arm-non-linux-gnueabi/libc/usr/lib");
 		solibs.add(WPILibCPPPlugin.getDefault().getCPPDir() + "/lib");
 		config.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUGGER_SOLIB_PATH, solibs);
 		config.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUGGER_AUTO_SOLIB, true);
 		config.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUGGER_STOP_ON_SOLIB_EVENTS, false);
-		config.doSave();
 		return config;
 	}
 }

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/launching/RSEUtils.java

@@ -43,8 +43,8 @@ public class RSEUtils {
             			RSECorePlugin.getTheCoreRegistry().getSystemTypeById("org.eclipse.rse.systemtype.ssh");
             	host = registry.createHost(profile.getName(), systemType, connectionName, hostName,
             			"The remote target for debugging the robot for team "+teamNumber+".");
-            	host.setDefaultUserId("admin");
-            	SystemSignonInformation info = new SystemSignonInformation(hostName, "admin",
+            	host.setDefaultUserId("lvuser");
+            	SystemSignonInformation info = new SystemSignonInformation(hostName, "lvuser",
             			"", systemType);
     			PasswordPersistenceManager.getInstance().add(info, true, false);
             } catch (Exception e) {

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/launching/SimulateLaunchShortcut.java

@@ -18,6 +18,7 @@ import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.PlatformUI;
 
 import edu.wpi.first.wpilib.plugins.core.launching.AntLauncher;
+import edu.wpi.first.wpilib.plugins.core.launching.SimulationNotification;
 import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin;
 
 /**
@@ -79,7 +80,12 @@ public class SimulateLaunchShortcut implements ILaunchShortcut {
 	 * @param activeProj The project that the script will be run on/from
 	 * @param mode The mode it will be run in (ILaunchManager.RUN_MODE or ILaunchManager.DEBUG_MODE)
 	 */
-	public void runConfig(IProject activeProj, String mode){
+	public void runConfig(IProject activeProj, String mode) {
+		if (!SimulationNotification.supportsSimulation()) {
+			SimulationNotification.showUnsupported();
+			return;
+		}
+		
 		String targets = "simulate";
 		    
 		if(mode.equals(ILaunchManager.RUN_MODE)){

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/preferences/CPPPreferencePage.java

@@ -1,118 +0,0 @@
-package edu.wpi.first.wpilib.plugins.cpp.preferences;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-import edu.wpi.first.wpilib.plugins.core.WPILibCore;
-import edu.wpi.first.wpilib.plugins.core.preferences.ComboFieldEditor;
-import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin;
-
-/**
- * This class represents a preference page that
- * is contributed to the Preferences dialog. By 
- * subclassing <samp>FieldEditorPreferencePage</samp>, we
- * can use the field support built into JFace that allows
- * us to create a page that is small and knows how to 
- * save, restore and apply itself.
- * <p>
- * This page is used to modify preferences only. They
- * are stored in the preference store that belongs to
- * the main plug-in class. That way, preferences can
- * be accessed directly via the preference store.
- */
-
-public class CPPPreferencePage
-	extends FieldEditorPreferencePage
-	implements IWorkbenchPreferencePage {
-	ComboFieldEditor toolchainVersionEditor;
-	BooleanFieldEditor autoUpdateToolchainEditor;
-	private ComboFieldEditor wpiLibVersionEditor;
-	private BooleanFieldEditor autoUpdateEditor;
-
-	public CPPPreferencePage() {
-		super(GRID);
-		setPreferenceStore(WPILibCPPPlugin.getDefault().getPreferenceStore());
-		setDescription("Change workspace level settings for C++.");
-	}
-	
-	/**
-	 * Creates the field editors. Field editors are abstractions of
-	 * the common GUI blocks needed to manipulate various types
-	 * of preferences. Each field editor knows how to save and
-	 * restore itself.
-	 */
-	public void createFieldEditors() {
-		wpiLibVersionEditor = new ComboFieldEditor(PreferenceConstants.LIBRARY_VERSION,
-				"&Library Version:", getFieldEditorParent(), getInstalledVersions());
-		addField(wpiLibVersionEditor);
-		autoUpdateEditor =	new BooleanFieldEditor(PreferenceConstants.UPDATE_LIBRARY_VERSION,
-				"&Auto Update Library Version", getFieldEditorParent());
-		addField(autoUpdateEditor);
-		toolchainVersionEditor = new ComboFieldEditor(PreferenceConstants.TOOLCHAIN_VERSION,
-				"&Toolchain Version:", getFieldEditorParent(), getInstalledToolchains());
-		addField(toolchainVersionEditor);
-		autoUpdateToolchainEditor =	new BooleanFieldEditor(PreferenceConstants.UPDATE_TOOLCHAIN_VERSION,
-				"&Auto Update Toolchain Version", getFieldEditorParent());
-		addField(autoUpdateToolchainEditor);
-	}
-
-	private List<String> getInstalledVersions() {
-		File[] dirs = new File(WPILibCore.getDefault().getWPILibBaseDir()+File.separator+"cpp")
-							.listFiles(new FileFilter() {
-			@Override public boolean accept(File f) {
-				return f.isDirectory();
-			}
-		});
-		List<String> versions = new ArrayList<String>();
-		for (File dir : dirs) {
-			versions.add(dir.getName());
-		}
-		Collections.sort(versions);
-		return versions;
-	}
-	
-	private List<String> getInstalledToolchains() {
-		File[] dirs = new File(WPILibCore.getDefault().getWPILibBaseDir()+File.separator+"toolchains")
-							.listFiles(new FileFilter() {
-			@Override public boolean accept(File f) {
-				return f.isDirectory();
-			}
-		});
-		List<String> versions = new ArrayList<String>();
-		for (File dir : dirs) {
-			versions.add(dir.getName());
-		}
-		Collections.sort(versions);
-		return versions;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-		WPILibCPPPlugin.logInfo("Preferences initialized.");
-		Properties props = WPILibCore.getDefault().getProjectProperties(null);
-		getPreferenceStore().setValue(PreferenceConstants.LIBRARY_VERSION,
-				props.getProperty("cpp-version", WPILibCPPPlugin.getDefault().getCurrentVersion()));
-	}
-	
-	@Override public void performApply() {
-		performOk();
-	}
-	
-    @Override public boolean performOk() {
-    	Properties props = WPILibCore.getDefault().getProjectProperties(null);
-    	props.setProperty("cpp-version", wpiLibVersionEditor.getChoice());
-    	WPILibCore.getDefault().saveGlobalProperties(props);
-		return super.performOk();
-	}
-}

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/preferences/PreferenceConstants.java

@@ -4,8 +4,5 @@ package edu.wpi.first.wpilib.plugins.cpp.preferences;
  * Constant definitions for plug-in preferences
  */
 public class PreferenceConstants {
-	public static final String LIBRARY_VERSION = "libraryVersionPreference";
-	public static final String UPDATE_LIBRARY_VERSION = "udpateLibraryVersionPreference";
-	public static final String TOOLCHAIN_VERSION = "toolchainVersionPreference";
-	public static final String UPDATE_TOOLCHAIN_VERSION = "udpateToolchainVersionPreference";
+	public static final String LIBRARY_INSTALLED = "libraryVersion_current";
 }

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/preferences/PreferenceInitializer.java

@@ -18,11 +18,8 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
 	 */
 	public void initializeDefaultPreferences() {
 		IPreferenceStore store = WPILibCPPPlugin.getDefault().getPreferenceStore();
-		store.setDefault(PreferenceConstants.LIBRARY_VERSION,
-				WPILibCore.getDefault().getProjectProperties(null)
-				.getProperty("cpp-version", WPILibCPPPlugin.getDefault().getCurrentVersion()));
-		store.setDefault(PreferenceConstants.UPDATE_LIBRARY_VERSION, true);
-		store.setDefault(PreferenceConstants.TOOLCHAIN_VERSION, WPILibCPPPlugin.getDefault().getDefaultToolchainVersion());
-		store.setDefault(PreferenceConstants.UPDATE_TOOLCHAIN_VERSION, true);
+		if (!store.contains(PreferenceConstants.LIBRARY_INSTALLED))
+			store.setValue(PreferenceConstants.LIBRARY_INSTALLED,
+					"none");
 	}
 }

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/wizards/examples/ExampleCPPProject.java

@@ -7,16 +7,17 @@ import edu.wpi.first.wpilib.plugins.core.wizards.IExampleProject;
 import edu.wpi.first.wpilib.plugins.cpp.wizards.newproject.CPPProjectType;
 
 public class ExampleCPPProject extends CPPProjectType implements IExampleProject {
-	private String name, description;
+	private String name, description, world;
 	private List<String> tags;
 	private List<String> directories;
 	private List<ExportFile> files;
 	
 	public ExampleCPPProject(String name, String description, List<String> tags, 
-			List<String> directories, List<ExportFile> files) {
+			String world, List<String> directories, List<ExportFile> files) {
 		this.name = name;
 		this.description = description;
 		this.tags = tags;
+		this.world = world;
 		this.directories = directories;
 		this.files = files;
 	}
@@ -32,6 +33,10 @@ public class ExampleCPPProject extends CPPProjectType implements IExampleProject
 	public List<String> getTags() {
 		return tags;
 	}
+	
+	public String getWorld() {
+		return world;
+	}
 
 	@Override
 	public String[] getFolders(String packageName) {

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/java/edu/wpi/first/wpilib/plugins/cpp/wizards/examples/ExampleCPPWizard.java

@@ -11,6 +11,7 @@ import edu.wpi.first.wpilib.plugins.core.WPILibCore;
 import edu.wpi.first.wpilib.plugins.core.wizards.ExampleWizard;
 import edu.wpi.first.wpilib.plugins.core.wizards.IExampleProject;
 import edu.wpi.first.wpilib.plugins.core.wizards.IExampleProject.ExportFile;
+import edu.wpi.first.wpilib.plugins.core.wizards.INewProjectInfo;
 import edu.wpi.first.wpilib.plugins.core.wizards.NewProjectMainPage;
 import edu.wpi.first.wpilib.plugins.core.wizards.ProjectCreationUtils;
 import edu.wpi.first.wpilib.plugins.cpp.WPILibCPPPlugin;
@@ -38,10 +39,10 @@ public class ExampleCPPWizard extends ExampleWizard {
 	}
 
 	@Override
-	protected IWizardPage getDetailsPage() {
+	protected IWizardPage getDetailsPage(INewProjectInfo info) {
 		if (detailsPage != null) return detailsPage;
-		detailsPage = new NewProjectMainPage(selection, getTeamNumberPage());
-		detailsPage.setTitle("Create Example Robot Java Project");
+		detailsPage = new NewProjectMainPage(selection, getTeamNumberPage(), info);
+		detailsPage.setTitle("Create Example Robot C++ Project");
 		detailsPage.setDescription("This wizard creates a new example project based on your selection.");
 		detailsPage.setShowPackage(false);
 		return detailsPage;
@@ -49,8 +50,8 @@ public class ExampleCPPWizard extends ExampleWizard {
 
 	@Override
 	public IExampleProject makeExampleProject(String name, String description,
-			List<String> tags, List<String> folders, List<ExportFile> files) {
-		return new ExampleCPPProject(name, description, tags, folders, files);
+			List<String> tags, String world, List<String> folders, List<ExportFile> files) {
+		return new ExampleCPPProject(name, description, tags, world, folders, files);
 	}
 
 	@Override