Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-23 01:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Suppress Watchdog's generic timeout message in MotorSafety (#1486)"

Browse Source 
This reverts commit 41596608cc.
This commit is contained in:
Peter Johnson
2018-12-29 16:19:04 -08:00
parent 75cc09a9e4
commit 7c35355d29
5 changed files with 5 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibj/src/main/java/edu/wpi/first/wpilibj/MotorSafety.java
View File

@@ -20,10 +20,6 @@ public abstract class MotorSafety {
private boolean m_enabled;
private final Object m_thisMutex = new Object();
public MotorSafety() {
m_watchdog.suppressTimeoutMessage(true);
}
/**
* Feed the motor safety object.
*

18
wpilibj/src/main/java/edu/wpi/first/wpilibj/Watchdog.java
View File

@@ -23,7 +23,6 @@ import java.util.concurrent.locks.ReentrantLock;
*
* <p>The watchdog is initialized disabled, so the user needs to call enable() before use.
*/
@SuppressWarnings("PMD.TooManyMethods")
public class Watchdog implements Closeable, Comparable<Watchdog> {
// Used for timeout print rate-limiting
private static final long kMinPrintPeriod = 1000000; // us
@@ -39,8 +38,6 @@ public class Watchdog implements Closeable, Comparable<Watchdog> {
private final Map<String, Long> m_epochs = new HashMap<>();
boolean m_isExpired;
boolean m_suppressTimeoutMessage;
static {
startDaemonThread(() -> schedulerFunc());
}
@@ -204,17 +201,6 @@ public class Watchdog implements Closeable, Comparable<Watchdog> {
}
}
/**
* Enable or disable suppression of the generic timeout message.
*
* <p>This may be desirable if the user-provided callback already prints a more specific message.
*
* @param suppress Whether to suppress generic timeout message.
*/
public void suppressTimeoutMessage(boolean suppress) {
m_suppressTimeoutMessage = suppress;
}
private static Thread startDaemonThread(Runnable target) {
Thread inst = new Thread(target);
inst.setDaemon(true);
@@ -243,9 +229,7 @@ public class Watchdog implements Closeable, Comparable<Watchdog> {
long now = RobotController.getFPGATime();
if (now - watchdog.m_lastTimeoutPrintTime > kMinPrintPeriod) {
watchdog.m_lastTimeoutPrintTime = now;
if (!watchdog.m_suppressTimeoutMessage) {
System.out.format("Watchdog not fed within %.6fs\n", watchdog.m_timeout / 1.0e6);
}
System.out.format("Watchdog not fed within %.6fs\n", watchdog.m_timeout / 1.0e6);
}
m_queueMutex.unlock();
watchdog.m_callback.run();