From 59a0319647362f7ab1bf4a441911184b7ca94e69 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 27 Jan 2016 19:12:29 -0500 Subject: mechanical copyright/todo/authorship tidy --- .../frc/team4272/robotlib/DoubleSolenoid.java | 8 +++++ .../team4272/robotlib/LimitSwitchedPIDOutput.java | 8 +++++ .../frc/team4272/robotlib/PIDOutputSplitter.java | 2 -- .../usfirst/frc/team4272/robotlib/PIDServo.java | 1 - .../usfirst/frc/team4272/robotlib/PushButton.java | 8 +++++ .../team4272/robotlib/RateLimitedPIDOutput.java | 4 +-- .../usfirst/frc/team4272/robotlib/RollingAvg.java | 2 -- .../frc/team4272/robotlib/SendablePIDOutput.java | 4 +-- .../frc/team4272/robotlib/ToggleButton.java | 8 +++++ .../frc/team4272/robotlib/Xbox360Controller.java | 40 ++++++++++++++++++---- 10 files changed, 67 insertions(+), 18 deletions(-) diff --git a/src/org/usfirst/frc/team4272/robotlib/DoubleSolenoid.java b/src/org/usfirst/frc/team4272/robotlib/DoubleSolenoid.java index 33524f1..c785f9b 100644 --- a/src/org/usfirst/frc/team4272/robotlib/DoubleSolenoid.java +++ b/src/org/usfirst/frc/team4272/robotlib/DoubleSolenoid.java @@ -1,5 +1,13 @@ +/** + * TODO: copyright + * + * @author Luke Shumaker + */ package org.usfirst.frc.team4272.robotlib; +/** + * TODO: Write JavaDocs + */ public class DoubleSolenoid extends edu.wpi.first.wpilibj.DoubleSolenoid { private boolean enabled = true; private Value value; diff --git a/src/org/usfirst/frc/team4272/robotlib/LimitSwitchedPIDOutput.java b/src/org/usfirst/frc/team4272/robotlib/LimitSwitchedPIDOutput.java index 695d418..5e875a0 100644 --- a/src/org/usfirst/frc/team4272/robotlib/LimitSwitchedPIDOutput.java +++ b/src/org/usfirst/frc/team4272/robotlib/LimitSwitchedPIDOutput.java @@ -1,8 +1,16 @@ +/** + * TODO: copyright + * + * @author Luke Shumaker + */ package org.usfirst.frc.team4272.robotlib; import edu.wpi.first.wpilibj.DigitalInput; import edu.wpi.first.wpilibj.PIDOutput; +/** + * TODO: Write JavaDocs + */ public class LimitSwitchedPIDOutput implements PIDOutput { private final PIDOutput out; private final DigitalInput forward; diff --git a/src/org/usfirst/frc/team4272/robotlib/PIDOutputSplitter.java b/src/org/usfirst/frc/team4272/robotlib/PIDOutputSplitter.java index c750659..60ded68 100644 --- a/src/org/usfirst/frc/team4272/robotlib/PIDOutputSplitter.java +++ b/src/org/usfirst/frc/team4272/robotlib/PIDOutputSplitter.java @@ -26,14 +26,12 @@ * * @author Luke Shumaker */ - package org.usfirst.frc.team4272.robotlib; import edu.wpi.first.wpilibj.PIDOutput; /** * TODO: Write JavaDocs - * @author Luke Shumaker */ public class PIDOutputSplitter implements PIDOutput { private final PIDOutput[] outputs; diff --git a/src/org/usfirst/frc/team4272/robotlib/PIDServo.java b/src/org/usfirst/frc/team4272/robotlib/PIDServo.java index 2a19a51..783bbf9 100644 --- a/src/org/usfirst/frc/team4272/robotlib/PIDServo.java +++ b/src/org/usfirst/frc/team4272/robotlib/PIDServo.java @@ -23,7 +23,6 @@ import edu.wpi.first.wpilibj.PIDOutput; /** * TODO: Write JavaDocs - * @author Luke Shumaker */ public class PIDServo extends Servo implements PIDOutput { public PIDServo(int channel) { diff --git a/src/org/usfirst/frc/team4272/robotlib/PushButton.java b/src/org/usfirst/frc/team4272/robotlib/PushButton.java index d14c5d3..205875c 100644 --- a/src/org/usfirst/frc/team4272/robotlib/PushButton.java +++ b/src/org/usfirst/frc/team4272/robotlib/PushButton.java @@ -1,5 +1,13 @@ +/** + * TODO: copyright + * + * @author Luke Shumaker + */ package org.usfirst.frc.team4272.robotlib; +/** + * TODO: Write JavaDocs + */ public class PushButton { private boolean prev = false; public boolean update(boolean next) { diff --git a/src/org/usfirst/frc/team4272/robotlib/RateLimitedPIDOutput.java b/src/org/usfirst/frc/team4272/robotlib/RateLimitedPIDOutput.java index e54ae27..70010c6 100644 --- a/src/org/usfirst/frc/team4272/robotlib/RateLimitedPIDOutput.java +++ b/src/org/usfirst/frc/team4272/robotlib/RateLimitedPIDOutput.java @@ -16,15 +16,13 @@ * * @author Luke Shumaker */ - package org.usfirst.frc.team4272.robotlib; import edu.wpi.first.wpilibj.PIDOutput; import edu.wpi.first.wpilibj.Timer; /** - * - * @author Luke Shumaker + * TODO: Write JavaDocs */ public class RateLimitedPIDOutput implements PIDOutput { PIDOutput o; diff --git a/src/org/usfirst/frc/team4272/robotlib/RollingAvg.java b/src/org/usfirst/frc/team4272/robotlib/RollingAvg.java index 41c73f1..7f0af11 100644 --- a/src/org/usfirst/frc/team4272/robotlib/RollingAvg.java +++ b/src/org/usfirst/frc/team4272/robotlib/RollingAvg.java @@ -26,7 +26,6 @@ * * @author Luke Shumaker */ - package org.usfirst.frc.team4272.robotlib; import edu.wpi.first.wpilibj.PIDSource; @@ -35,7 +34,6 @@ import edu.wpi.first.wpilibj.PIDOutput; /** * TODO: Write JavaDocs - * @author Luke Shumaker */ public class RollingAvg implements PIDSource, PIDOutput { private PIDSource source = null; diff --git a/src/org/usfirst/frc/team4272/robotlib/SendablePIDOutput.java b/src/org/usfirst/frc/team4272/robotlib/SendablePIDOutput.java index 5c05460..38e64e0 100644 --- a/src/org/usfirst/frc/team4272/robotlib/SendablePIDOutput.java +++ b/src/org/usfirst/frc/team4272/robotlib/SendablePIDOutput.java @@ -17,15 +17,13 @@ * * @author Luke Shumaker */ - package org.usfirst.frc.team4272.robotlib; import edu.wpi.first.wpilibj.PIDOutput; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; /** - * - * @author Luke Shumaker + * TODO: Write JavaDocs */ public class SendablePIDOutput implements PIDOutput { PIDOutput o; diff --git a/src/org/usfirst/frc/team4272/robotlib/ToggleButton.java b/src/org/usfirst/frc/team4272/robotlib/ToggleButton.java index 1b70ad8..feac70c 100644 --- a/src/org/usfirst/frc/team4272/robotlib/ToggleButton.java +++ b/src/org/usfirst/frc/team4272/robotlib/ToggleButton.java @@ -1,5 +1,13 @@ +/** + * TODO: copyright + * + * @author Luke Shumaker + */ package org.usfirst.frc.team4272.robotlib; +/** + * TODO: Write JavaDocs + */ public class ToggleButton { private boolean prev = false; private boolean state = false; diff --git a/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java b/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java index 0a4df83..e8fff71 100644 --- a/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java +++ b/src/org/usfirst/frc/team4272/robotlib/Xbox360Controller.java @@ -1,10 +1,36 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) FIRST 2008-2012. All Rights Reserved. */ -/* Copyright (c) Luke Shumaker 2015. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +/** + * Copyright (c) FIRST 2008-2012. All Rights Reserved. + * Open Source Software - may be modified and shared by FRC teams. The code + * must be accompanied by the FIRST BSD license file in the root directory of + * the project. + * + * Copyright (c) 2015 Luke Shumaker + * 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'' 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. + * + * @author Luke Shumaker + */ package org.usfirst.frc.team4272.robotlib; import edu.wpi.first.wpilibj.Joystick; -- cgit v1.2.3