Convert RobotTime into a singleton

This commit is contained in:
Keenan D. Buckley
2020-03-28 21:42:08 -06:00
parent 850f503889
commit e373211f27
5 changed files with 43 additions and 26 deletions
+3 -1
View File
@@ -18,6 +18,8 @@ import edu.wpi.first.wpiutil.math.MathUtil;
* Gyro class that allows for interchangeable use between a pigeon and a navX
*/
public class RobotGyro extends GyroBase {
private RobotTime m_robotTime = RobotTime.getInstance();
private PigeonIMU m_pigeon;
private AHRS m_navX;
public boolean m_isGyroAPigeon; //true if pigeon, false if navX
@@ -149,7 +151,7 @@ public class RobotGyro extends GyroBase {
@Override
public double getRate() {
if (m_isGyroAPigeon) {
return m_deltaPigeonAngle / (RobotTime.m_deltaTime * 1000);
return m_deltaPigeonAngle / (m_robotTime.m_deltaTime * 1000);
} else {
return m_navX.getRate();
}
+27 -14
View File
@@ -11,29 +11,42 @@ package frc4388.utility;
* <p>Keeps track of Robot times like time passed, delta time, etc
* <p>All times are in milliseconds
*/
public final class RobotTime {
private static long m_currTime = System.currentTimeMillis();
public static long m_deltaTime = 0;
public class RobotTime {
private long m_currTime = System.currentTimeMillis();
public long m_deltaTime = 0;
private static long m_startRobotTime = m_currTime;
public static long m_robotTime = 0;
public static long m_lastRobotTime = 0;
private long m_startRobotTime = m_currTime;
public long m_robotTime = 0;
public long m_lastRobotTime = 0;
private static long m_startMatchTime = 0;
public static long m_matchTime = 0;
public static long m_lastMatchTime = 0;
private long m_startMatchTime = 0;
public long m_matchTime = 0;
public long m_lastMatchTime = 0;
public static long m_frameNumber = 0;
public long m_frameNumber = 0;
/**
* This class should not be instantiated.
* Private constructor prevents other classes from instantiating
*/
private RobotTime(){}
private static RobotTime instance = null;
/**
* Gets the instance of Robot Time. If there is no instance running one will be created.
* @return instance of Robot Time
*/
public static RobotTime getInstance() {
if (instance == null) {
instance = new RobotTime();
}
return instance;
}
/**
* Call this once per periodic loop.
*/
public static void updateTimes() {
public void updateTimes() {
m_lastRobotTime = m_robotTime;
m_lastMatchTime = m_matchTime;
@@ -50,7 +63,7 @@ public final class RobotTime {
/**
* Call this in both the auto and periodic inits
*/
public static void startMatchTime() {
public void startMatchTime() {
if (m_matchTime == 0) {
m_startMatchTime = m_currTime;
m_matchTime = 1;
@@ -60,7 +73,7 @@ public final class RobotTime {
/**
* Call this in disabled init
*/
public static void endMatchTime() {
public void endMatchTime() {
m_startMatchTime = 0;
m_matchTime = 0;
}