Add missing semi-colon to cproject file

Change-Id: I540730c3a4be32c6a636296ce36aab5b230afc8a

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.");

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

@@ -23,7 +23,7 @@ public class ToolchainInstaller extends AbstractInstaller {
 	@Override
 	protected void updateInstalledVersion(String version) {
 		WPILibCPPPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.TOOLCHAIN_INSTALLED,
-				WPILibCPPPlugin.getDefault().getCurrentVersion());
+				version);
 	}
 
 	@Override

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

@@ -12,7 +12,8 @@ public class ToolchainInstaller extends AbstractInstaller {
 
 	public ToolchainInstaller(String version) {
 		super(version, 
-				WPILibCPPPlugin.getDefault().getPreferenceStore().getString(PreferenceConstants.TOOLCHAIN_INSTALLED), WPILibCPPPlugin.getDefault().getToolchain());
+				WPILibCPPPlugin.getDefault().getPreferenceStore().getString(PreferenceConstants.TOOLCHAIN_INSTALLED), 
+				WPILibCPPPlugin.getDefault().getToolchain());
 	}
 
 	@Override
@@ -22,13 +23,12 @@ public class ToolchainInstaller extends AbstractInstaller {
 
 	@Override
 	protected void updateInstalledVersion(String version) {
-		WPILibCPPPlugin.getDefault().getPreferenceStore().setDefault(PreferenceConstants.TOOLCHAIN_INSTALLED,
-				WPILibCPPPlugin.getDefault().getCurrentVersion());
+		WPILibCPPPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.TOOLCHAIN_INSTALLED,
+				version);
 	}
 
 	@Override
 	protected InputStream getInstallResourceStream() {
 		return ToolchainInstaller.class.getResourceAsStream("/resources/toolchain.zip");
 	}
-
 }

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

@@ -23,7 +23,7 @@ public class ToolchainInstaller extends AbstractInstaller {
 	@Override
 	protected void updateInstalledVersion(String version) {
 		WPILibCPPPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.TOOLCHAIN_INSTALLED,
-				WPILibCPPPlugin.getDefault().getCurrentVersion());
+				version);
 	}
 
 	@Override

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

@@ -57,7 +57,7 @@
 									<listOptionValue builtIn="false" value="dl"/>
 									<listOptionValue builtIn="false" value="pthread"/>
 								</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.flags.1747959472" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,-rpath-link,&quot;$cpp-location/lib&quot;" 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>

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

@@ -20,7 +20,7 @@ public class CPPInstaller extends AbstractInstaller {
 	@Override
 	protected void updateInstalledVersion(String version) {
 		WPILibCPPPlugin.getDefault().getPreferenceStore().setValue(PreferenceConstants.LIBRARY_INSTALLED,
-				WPILibCPPPlugin.getDefault().getCurrentVersion());
+				version);
 	}
 	
 	@Override

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.xml

@@ -46,7 +46,7 @@
        username="${username}"
        password="${password}"
        trust="true"
-       command="tail -F -s 0 -n 0 ${deploy.log.file}"/>
+       command="tail -F -n 0 ${deploy.log.file}"/>
   </target>
   
   <target name="kill-program" depends="get-target-ip" description="Kill the currently running FRC program">

eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties

@@ -4,9 +4,10 @@ password=
 deploy.dir=/home/admin
 deploy.kill.command=. /etc/profile.d/natinst-path.sh; /usr/local/frc/bin/frcKillRobot.sh -t -r
 deploy.log.file=/var/local/natinst/log/FRC_UserProgram.log
-deploy.log.command=tail -F -s 0 -n 0 ${deploy.log.file}
+deploy.log.command=tail -F -n 0 ${deploy.log.file}
 debug.flag.dir=/tmp/
 command.dir=/home/lvuser/
+version=current
 
 # Libraries to use
 wpilib=${user.home}/wpilib/java/${version}

hal/lib/Athena/FRC_FPGA_ChipObject/RoboRIO_FRC_ChipObject_Aliases.h

@@ -4,6 +4,6 @@
 #ifndef __RoboRIO_FRC_ChipObject_Aliases_h__
 #define __RoboRIO_FRC_ChipObject_Aliases_h__
 
-#define nRoboRIO_FPGANamespace nFRC_2015_1_0_7
+#define nRoboRIO_FPGANamespace nFRC_2015_1_0_8
 
 #endif // __RoboRIO_FRC_ChipObject_Aliases_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/nInterfaceGlobals.h

@@ -1,15 +1,15 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_nInterfaceGlobals_h__
-#define __nFRC_2015_1_0_7_nInterfaceGlobals_h__
+#ifndef __nFRC_2015_1_0_8_nInterfaceGlobals_h__
+#define __nFRC_2015_1_0_8_nInterfaceGlobals_h__
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
    extern unsigned int g_currentTargetClass;
 }
 }
 
-#endif // __nFRC_2015_1_0_7_nInterfaceGlobals_h__
+#endif // __nFRC_2015_1_0_8_nInterfaceGlobals_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAI.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_AI_h__
-#define __nFRC_2015_1_0_7_AI_h__
+#ifndef __nFRC_2015_1_0_8_AI_h__
+#define __nFRC_2015_1_0_8_AI_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tAI
@@ -140,4 +140,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_AI_h__
+#endif // __nFRC_2015_1_0_8_AI_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAO.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_AO_h__
-#define __nFRC_2015_1_0_7_AO_h__
+#ifndef __nFRC_2015_1_0_8_AO_h__
+#define __nFRC_2015_1_0_8_AO_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tAO
@@ -47,4 +47,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_AO_h__
+#endif // __nFRC_2015_1_0_8_AO_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccel.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_Accel_h__
-#define __nFRC_2015_1_0_7_Accel_h__
+#ifndef __nFRC_2015_1_0_8_Accel_h__
+#define __nFRC_2015_1_0_8_Accel_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tAccel
@@ -99,4 +99,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_Accel_h__
+#endif // __nFRC_2015_1_0_8_Accel_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAccumulator.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_Accumulator_h__
-#define __nFRC_2015_1_0_7_Accumulator_h__
+#ifndef __nFRC_2015_1_0_8_Accumulator_h__
+#define __nFRC_2015_1_0_8_Accumulator_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tAccumulator
@@ -84,4 +84,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_Accumulator_h__
+#endif // __nFRC_2015_1_0_8_Accumulator_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAlarm.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_Alarm_h__
-#define __nFRC_2015_1_0_7_Alarm_h__
+#ifndef __nFRC_2015_1_0_8_Alarm_h__
+#define __nFRC_2015_1_0_8_Alarm_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tAlarm
@@ -54,4 +54,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_Alarm_h__
+#endif // __nFRC_2015_1_0_8_Alarm_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tAnalogTrigger.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_AnalogTrigger_h__
-#define __nFRC_2015_1_0_7_AnalogTrigger_h__
+#ifndef __nFRC_2015_1_0_8_AnalogTrigger_h__
+#define __nFRC_2015_1_0_8_AnalogTrigger_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tAnalogTrigger
@@ -126,4 +126,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_AnalogTrigger_h__
+#endif // __nFRC_2015_1_0_8_AnalogTrigger_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tBIST.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_BIST_h__
-#define __nFRC_2015_1_0_7_BIST_h__
+#ifndef __nFRC_2015_1_0_8_BIST_h__
+#define __nFRC_2015_1_0_8_BIST_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tBIST
@@ -87,4 +87,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_BIST_h__
+#endif // __nFRC_2015_1_0_8_BIST_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tCounter.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_Counter_h__
-#define __nFRC_2015_1_0_7_Counter_h__
+#ifndef __nFRC_2015_1_0_8_Counter_h__
+#define __nFRC_2015_1_0_8_Counter_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tCounter
@@ -216,4 +216,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_Counter_h__
+#endif // __nFRC_2015_1_0_8_Counter_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDIO.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_DIO_h__
-#define __nFRC_2015_1_0_7_DIO_h__
+#ifndef __nFRC_2015_1_0_8_DIO_h__
+#define __nFRC_2015_1_0_8_DIO_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tDIO
@@ -245,4 +245,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_DIO_h__
+#endif // __nFRC_2015_1_0_8_DIO_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tDMA.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_DMA_h__
-#define __nFRC_2015_1_0_7_DMA_h__
+#ifndef __nFRC_2015_1_0_8_DMA_h__
+#define __nFRC_2015_1_0_8_DMA_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tDMA
@@ -185,4 +185,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_DMA_h__
+#endif // __nFRC_2015_1_0_8_DMA_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tEncoder.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_Encoder_h__
-#define __nFRC_2015_1_0_7_Encoder_h__
+#ifndef __nFRC_2015_1_0_8_Encoder_h__
+#define __nFRC_2015_1_0_8_Encoder_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tEncoder
@@ -196,4 +196,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_Encoder_h__
+#endif // __nFRC_2015_1_0_8_Encoder_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tGlobal.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_Global_h__
-#define __nFRC_2015_1_0_7_Global_h__
+#ifndef __nFRC_2015_1_0_8_Global_h__
+#define __nFRC_2015_1_0_8_Global_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tGlobal
@@ -101,4 +101,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_Global_h__
+#endif // __nFRC_2015_1_0_8_Global_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tInterrupt.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_Interrupt_h__
-#define __nFRC_2015_1_0_7_Interrupt_h__
+#ifndef __nFRC_2015_1_0_8_Interrupt_h__
+#define __nFRC_2015_1_0_8_Interrupt_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tInterrupt
@@ -90,4 +90,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_Interrupt_h__
+#endif // __nFRC_2015_1_0_8_Interrupt_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPWM.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_PWM_h__
-#define __nFRC_2015_1_0_7_PWM_h__
+#ifndef __nFRC_2015_1_0_8_PWM_h__
+#define __nFRC_2015_1_0_8_PWM_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tPWM
@@ -80,6 +80,15 @@ public:
    virtual unsigned char readPeriodScaleHdr(unsigned char bitfield_index, tRioStatusCode *status) = 0;
 
 
+   typedef enum
+   {
+      kNumZeroLatchElements = 20,
+   } tZeroLatch_IfaceConstants;
+
+   virtual void writeZeroLatch(unsigned char bitfield_index, bool value, tRioStatusCode *status) = 0;
+   virtual bool readZeroLatch(unsigned char bitfield_index, tRioStatusCode *status) = 0;
+
+
 
 
    typedef enum
@@ -108,4 +117,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_PWM_h__
+#endif // __nFRC_2015_1_0_8_PWM_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tPower.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_Power_h__
-#define __nFRC_2015_1_0_7_Power_h__
+#ifndef __nFRC_2015_1_0_8_Power_h__
+#define __nFRC_2015_1_0_8_Power_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tPower
@@ -214,4 +214,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_Power_h__
+#endif // __nFRC_2015_1_0_8_Power_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tRelay.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_Relay_h__
-#define __nFRC_2015_1_0_7_Relay_h__
+#ifndef __nFRC_2015_1_0_8_Relay_h__
+#define __nFRC_2015_1_0_8_Relay_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tRelay
@@ -65,4 +65,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_Relay_h__
+#endif // __nFRC_2015_1_0_8_Relay_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_SPI_h__
-#define __nFRC_2015_1_0_7_SPI_h__
+#ifndef __nFRC_2015_1_0_8_SPI_h__
+#define __nFRC_2015_1_0_8_SPI_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tSPI
@@ -65,4 +65,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_SPI_h__
+#endif // __nFRC_2015_1_0_8_SPI_h__

hal/lib/Athena/FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h

@@ -1,14 +1,14 @@
 // Copyright (c) National Instruments 2008.  All Rights Reserved.
 // Do Not Edit... this file is generated!
 
-#ifndef __nFRC_2015_1_0_7_SysWatchdog_h__
-#define __nFRC_2015_1_0_7_SysWatchdog_h__
+#ifndef __nFRC_2015_1_0_8_SysWatchdog_h__
+#define __nFRC_2015_1_0_8_SysWatchdog_h__
 
 #include "tSystemInterface.h"
 
 namespace nFPGA
 {
-namespace nFRC_2015_1_0_7
+namespace nFRC_2015_1_0_8
 {
 
 class tSysWatchdog
@@ -98,4 +98,4 @@ private:
 }
 }
 
-#endif // __nFRC_2015_1_0_7_SysWatchdog_h__
+#endif // __nFRC_2015_1_0_8_SysWatchdog_h__

wpilibc/wpilibC++Devices/src/Preferences.cpp

@@ -18,7 +18,7 @@ static const char *kTableName = "Preferences";
 /** The value of the save field */
 static const char *kSaveField = "~S A V E~";
 /** The file to save to */
-static const char *kFileName = "wpilib-preferences.ini";
+static const char *kFileName = "/home/lvuser/wpilib-preferences.ini";
 /** The characters to put between a field and value */
 static const char *kValuePrefix = "=\"";
 /** The characters to put after the value */

wpilibc/wpilibC++IntegrationTests/src/PreferencesTest.cpp

@@ -10,7 +10,7 @@
 #include <cstdio>
 #include <fstream>
 
-static const char *kFileName = "wpilib-preferences.ini";
+static const char *kFileName = "/home/lvuser/wpilib-preferences.ini";
 static const double kSaveTime = 0.2;
 
 /**

wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Compressor.java

@@ -9,13 +9,36 @@ import edu.wpi.first.wpilibj.hal.HALUtil;
 import edu.wpi.first.wpilibj.livewindow.LiveWindowSendable;
 import edu.wpi.first.wpilibj.tables.ITable;
 
+/**
+ * Class for operating the PCM (Pneumatics compressor module)
+ * The PCM automatically will run in close-loop mode by default whenever a Solenoid object is 
+ * created. For most cases the Compressor object does not need to be
+ * instantiated or used in a robot program.
+ * 
+ * This class is only required in cases where more detailed status or to enable/disable
+ * closed loop control. Note: you cannot operate the compressor directly from this class as
+ * doing so would circumvent the safety provided in using the pressure switch and closed
+ * loop control. You can only turn off closed loop control, thereby stopping the compressor
+ * from operating.
+ */
 public class Compressor extends SensorBase implements LiveWindowSendable {
 	private ByteBuffer m_pcm;
 
+	/**
+	 * Create an instance of the Compressor
+	 * @param pcmID
+	 * 		The PCM CAN device ID. Most robots that use PCM will have a single module. Use this
+	 * 		for supporting a second module other than the default.
+	 */
 	public Compressor(int pcmId) {
 		initCompressor(pcmId);
 	}
 
+	/**
+	 * Create an instance of the Compressor
+	 * Makes a new instance of the compressor using the default address. Additional modules can be
+	 * supported by making a new instancce and specifying the CAN ID
+	 */
 	public Compressor() {
 		initCompressor(getDefaultSolenoidModule());
 	}
@@ -26,14 +49,30 @@ public class Compressor extends SensorBase implements LiveWindowSendable {
 		m_pcm = CompressorJNI.initializeCompressor((byte)module);
 	}
 
+	/**
+	 * Start the compressor running in closed loop control mode
+	 * Use the method in cases where you would like to manually stop and start the compressor
+	 * for applications such as conserving battery or making sure that the compressor motor
+	 * doesn't start during critical operations.
+	 */
 	public void start() {
 		setClosedLoopControl(true);
 	}
 
+	/**
+	 * Stop the compressor from running in closed loop control mode.
+	 * Use the method in cases where you would like to manually stop and start the compressor
+	 * for applications such as conserving battery or making sure that the compressor motor
+	 * doesn't start during critical operations.
+	 */
 	public void stop() {
 		setClosedLoopControl(false);
 	}
 
+	/**
+	 * Get the enabled status of the compressor
+	 * @returns true if the compressor is on
+	 */
 	public boolean enabled() {
 		ByteBuffer status = ByteBuffer.allocateDirect(4);
 		status.order(ByteOrder.LITTLE_ENDIAN);
@@ -44,6 +83,10 @@ public class Compressor extends SensorBase implements LiveWindowSendable {
 		return on;
 	}
 
+	/**
+	 * Get the current pressure switch value
+	 * @return true if the pressure is low by reading the pressure switch that is plugged into the PCM
+	 */
 	public boolean getPressureSwitchValue() {
 		ByteBuffer status = ByteBuffer.allocateDirect(4);
 		status.order(ByteOrder.LITTLE_ENDIAN);
@@ -54,6 +97,10 @@ public class Compressor extends SensorBase implements LiveWindowSendable {
 		return on;
 	}
 
+	/**
+	 * Get the current being used by the compressor
+	 * @return current consumed in amps for the compressor motor
+	 */
 	public float getCompressorCurrent() {
 		ByteBuffer status = ByteBuffer.allocateDirect(4);
 		status.order(ByteOrder.LITTLE_ENDIAN);
@@ -64,6 +111,12 @@ public class Compressor extends SensorBase implements LiveWindowSendable {
 		return current;
 	}
 
+	/**
+	 * Set the PCM in closed loop control mode
+	 * @param on
+	 * 			If true sets the compressor to be in closed loop control mode otherwise
+	 * 			normal operation of the compressor is disabled.
+	 */
 	public void setClosedLoopControl(boolean on) {
 		ByteBuffer status = ByteBuffer.allocateDirect(4);
 		status.order(ByteOrder.LITTLE_ENDIAN);
@@ -72,6 +125,10 @@ public class Compressor extends SensorBase implements LiveWindowSendable {
 		HALUtil.checkStatus(status.asIntBuffer());
 	}
 
+	/**
+	 * Gets the current operating mode of the PCM
+	 * @return true if compressor is operating on closed-loop mode, otherwise return false.
+	 */
 	public boolean getClosedLoopControl() {
 		ByteBuffer status = ByteBuffer.allocateDirect(4);
 		status.order(ByteOrder.LITTLE_ENDIAN);

wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/Preferences.java

@@ -53,7 +53,7 @@ public class Preferences {
     /**
      * The file to save to
      */
-    private static final String FILE_NAME = "wpilib-preferences.ini";
+    private static final String FILE_NAME = "/home/lvuser/wpilib-preferences.ini";
     /**
      * The characters to put between a field and value
      */

wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/SensorBase.java

@@ -94,7 +94,7 @@ public abstract class SensorBase { // TODO: Refactor
      */
     protected static void checkDigitalChannel(final int channel) {
         if (channel < 0 || channel >= kDigitalChannels) {
-            System.err.println("Requested digital channel number is out of range.");
+            throw new IndexOutOfBoundsException("Requested digital channel number is out of range.");
         }
     }
 
@@ -107,7 +107,6 @@ public abstract class SensorBase { // TODO: Refactor
      */
     protected static void checkRelayChannel(final int channel) {
         if (channel < 0 || channel >= kRelayChannels) {
-            System.err.println("Requested relay channel number is out of range.");
             throw new IndexOutOfBoundsException("Requested relay channel number is out of range.");
         }
     }
@@ -121,7 +120,6 @@ public abstract class SensorBase { // TODO: Refactor
      */
     protected static void checkPWMChannel(final int channel) {
         if (channel < 0 || channel >= kPwmChannels) {
-            System.err.println("Requested PWM channel number is out of range.");
             throw new IndexOutOfBoundsException("Requested PWM channel number is out of range.");
         }
     }
@@ -134,8 +132,8 @@ public abstract class SensorBase { // TODO: Refactor
      * @param channel The channel number to check.
      */
     protected static void checkAnalogInputChannel(final int channel) {
-        if (channel <= 0 || channel > kAnalogInputChannels) {
-            System.err.println("Requested analog channel number is out of range.");
+        if (channel < 0 || channel >= kAnalogInputChannels) {
+            throw new IndexOutOfBoundsException("Requested analog input channel number is out of range.");
         }
     }
 
@@ -147,8 +145,8 @@ public abstract class SensorBase { // TODO: Refactor
      * @param channel The channel number to check.
      */
     protected static void checkAnalogOutputChannel(final int channel) {
-        if (channel <= 0 || channel > kAnalogOutputChannels) {
-            System.err.println("Requested analog channel number is out of range.");
+        if (channel < 0 || channel >= kAnalogOutputChannels) {
+            throw new IndexOutOfBoundsException("Requested analog output channel number is out of range.");
         }
     }
 
@@ -160,7 +158,7 @@ public abstract class SensorBase { // TODO: Refactor
      */
     protected static void checkSolenoidChannel(final int channel) {
         if (channel < 0 || channel >= kSolenoidChannels) {
-            System.err.println("Requested solenoid channel number is out of range.");
+            throw new IndexOutOfBoundsException("Requested solenoid channel number is out of range.");
         }
     }
 
@@ -172,7 +170,7 @@ public abstract class SensorBase { // TODO: Refactor
      */
     protected static void checkPDPChannel(final int channel) {
         if (channel < 0 || channel >= kPDPChannels) {
-            System.err.println("Requested solenoid channel number is out of range.");
+            throw new IndexOutOfBoundsException("Requested PDP channel number is out of range.");
         }
     }
 

wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/SolenoidBase.java

@@ -46,7 +46,7 @@ public abstract class SolenoidBase extends SensorBase {
      * @param mask The channels you want to be affected.
      */
     protected synchronized void set(int value, int mask) {
-        IntBuffer status = IntBuffer.allocate(1);
+        IntBuffer status = ByteBuffer.allocateDirect(4).asIntBuffer();
         for (int i = 0; i < SensorBase.kSolenoidChannels; i++) {
             int local_mask = 1 << i;
             if ((mask & local_mask) != 0)
@@ -62,7 +62,7 @@ public abstract class SolenoidBase extends SensorBase {
      */
     public byte getAll() {
         byte value = 0;
-        IntBuffer status = IntBuffer.allocate(1);
+        IntBuffer status = ByteBuffer.allocateDirect(4).asIntBuffer();
         for (int i = 0; i < SensorBase.kSolenoidChannels; i++) {
             value |= SolenoidJNI.getSolenoid(m_ports[i], status) << i;
         }

wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/PrefrencesTest.java

@@ -28,7 +28,7 @@ import edu.wpi.first.wpilibj.test.AbstractComsSetup;
  */
 public class PrefrencesTest extends AbstractComsSetup {
 	private static final Logger logger = Logger.getLogger(PrefrencesTest.class.getName());
-	
+
 	private NetworkTable prefTable;
 	private Preferences pref;
 	private long check;
@@ -45,7 +45,7 @@ public class PrefrencesTest extends AbstractComsSetup {
 	@Before
 	public void setUp() throws Exception {
 		try {
-			File file = new File("wpilib-preferences.ini");
+			File file = new File("/home/lvuser/wpilib-preferences.ini");
 			file.mkdirs();
 			if (file.exists()) {
 				file.delete();
@@ -109,7 +109,7 @@ public class PrefrencesTest extends AbstractComsSetup {
 		assertEquals(pref.getFloat("checkedValueFloat", 0), 1, 0);
 		assertTrue(pref.getBoolean("checkedValueBoolean", false));
 	}
-	
+
 	@Test
 	public void testPreferencesToNetworkTables(){
 		String networkedNumber = "networkCheckedValue";