From 7670b3f40e062d762b0d329f4ec36472f496ccbd Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Wed, 17 Feb 2016 10:44:18 -0800 Subject: [PATCH] Put all sensors in sensor package and update the import paths --- src/org/usfirst/frc/team3501/robot/Robot.java | 3 ++- src/org/usfirst/frc/team3501/robot/{ => sensors}/GyroLib.java | 2 +- src/org/usfirst/frc/team3501/robot/{ => sensors}/Lidar.java | 2 +- .../frc/team3501/robot/{subsystems => sensors}/Photogate.java | 2 +- .../frc/team3501/robot/{ => sensors}/RotationTracker.java | 2 +- src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java | 4 ++-- src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) rename src/org/usfirst/frc/team3501/robot/{ => sensors}/GyroLib.java (99%) rename src/org/usfirst/frc/team3501/robot/{ => sensors}/Lidar.java (97%) rename src/org/usfirst/frc/team3501/robot/{subsystems => sensors}/Photogate.java (96%) rename src/org/usfirst/frc/team3501/robot/{ => sensors}/RotationTracker.java (98%) diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index 9e2ec446..90584412 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -1,10 +1,11 @@ package org.usfirst.frc.team3501.robot; import org.usfirst.frc.team3501.robot.Constants.Defense; +import org.usfirst.frc.team3501.robot.sensors.GyroLib; +import org.usfirst.frc.team3501.robot.sensors.Photogate; import org.usfirst.frc.team3501.robot.subsystems.DefenseArm; import org.usfirst.frc.team3501.robot.subsystems.DriveTrain; import org.usfirst.frc.team3501.robot.subsystems.IntakeArm; -import org.usfirst.frc.team3501.robot.subsystems.Photogate; import org.usfirst.frc.team3501.robot.subsystems.Scaler; import org.usfirst.frc.team3501.robot.subsystems.Shooter; diff --git a/src/org/usfirst/frc/team3501/robot/GyroLib.java b/src/org/usfirst/frc/team3501/robot/sensors/GyroLib.java similarity index 99% rename from src/org/usfirst/frc/team3501/robot/GyroLib.java rename to src/org/usfirst/frc/team3501/robot/sensors/GyroLib.java index 36d177c3..c683b516 100644 --- a/src/org/usfirst/frc/team3501/robot/GyroLib.java +++ b/src/org/usfirst/frc/team3501/robot/sensors/GyroLib.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot; +package org.usfirst.frc.team3501.robot.sensors; /** * Copyright (c) 2015, www.techhounds.com * All rights reserved. diff --git a/src/org/usfirst/frc/team3501/robot/Lidar.java b/src/org/usfirst/frc/team3501/robot/sensors/Lidar.java similarity index 97% rename from src/org/usfirst/frc/team3501/robot/Lidar.java rename to src/org/usfirst/frc/team3501/robot/sensors/Lidar.java index 2e6aee64..8ba641e3 100644 --- a/src/org/usfirst/frc/team3501/robot/Lidar.java +++ b/src/org/usfirst/frc/team3501/robot/sensors/Lidar.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot; +package org.usfirst.frc.team3501.robot.sensors; import java.util.TimerTask; diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Photogate.java b/src/org/usfirst/frc/team3501/robot/sensors/Photogate.java similarity index 96% rename from src/org/usfirst/frc/team3501/robot/subsystems/Photogate.java rename to src/org/usfirst/frc/team3501/robot/sensors/Photogate.java index 33f7b151..ddb52472 100644 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Photogate.java +++ b/src/org/usfirst/frc/team3501/robot/sensors/Photogate.java @@ -1,4 +1,4 @@ -package org.usfirst.frc.team3501.robot.subsystems; +package org.usfirst.frc.team3501.robot.sensors; import edu.wpi.first.wpilibj.AnalogInput; diff --git a/src/org/usfirst/frc/team3501/robot/RotationTracker.java b/src/org/usfirst/frc/team3501/robot/sensors/RotationTracker.java similarity index 98% rename from src/org/usfirst/frc/team3501/robot/RotationTracker.java rename to src/org/usfirst/frc/team3501/robot/sensors/RotationTracker.java index f0757ff1..4c0d6df8 100644 --- a/src/org/usfirst/frc/team3501/robot/RotationTracker.java +++ b/src/org/usfirst/frc/team3501/robot/sensors/RotationTracker.java @@ -31,7 +31,7 @@ *

*/ -package org.usfirst.frc.team3501.robot; +package org.usfirst.frc.team3501.robot.sensors; import edu.wpi.first.wpilibj.PIDSource; diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java index bbca72fc..2b11491a 100644 --- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java @@ -1,10 +1,10 @@ package org.usfirst.frc.team3501.robot.subsystems; import org.usfirst.frc.team3501.robot.Constants; -import org.usfirst.frc.team3501.robot.GyroLib; -import org.usfirst.frc.team3501.robot.Lidar; import org.usfirst.frc.team3501.robot.MathLib; import org.usfirst.frc.team3501.robot.commands.driving.JoystickDrive; +import org.usfirst.frc.team3501.robot.sensors.GyroLib; +import org.usfirst.frc.team3501.robot.sensors.Lidar; import edu.wpi.first.wpilibj.CANTalon; import edu.wpi.first.wpilibj.CounterBase.EncodingType; diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java index a9e8d6e8..bcce7bcd 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java @@ -1,7 +1,7 @@ package org.usfirst.frc.team3501.robot.subsystems; import org.usfirst.frc.team3501.robot.Constants; -import org.usfirst.frc.team3501.robot.Lidar; +import org.usfirst.frc.team3501.robot.sensors.Lidar; import edu.wpi.first.wpilibj.CANTalon; import edu.wpi.first.wpilibj.CounterBase.EncodingType; -- 2.30.2