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

Enable checkstyle on cscore, ntcore, wpiutil (#1032)

Browse Source 
Also update to version 8.10.
This commit is contained in:
Austin Shalit
2018-05-24 00:31:04 -04:00
committed by Peter Johnson
parent ecfe95383c
commit 40cc743cc7
142 changed files with 1038 additions and 970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogInput.java
View File

@@ -9,8 +9,8 @@ package edu.wpi.first.wpilibj;
import edu.wpi.first.wpilibj.hal.AnalogJNI;
import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType;
import edu.wpi.first.wpilibj.sim.AnalogInSim;
import edu.wpi.first.wpilibj.hal.HAL;
import edu.wpi.first.wpilibj.sim.AnalogInSim;
import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder;
import edu.wpi.first.wpilibj.util.AllocationException;

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogOutput.java
View File

@@ -9,8 +9,8 @@ package edu.wpi.first.wpilibj;
import edu.wpi.first.wpilibj.hal.AnalogJNI;
import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType;
import edu.wpi.first.wpilibj.sim.AnalogOutSim;
import edu.wpi.first.wpilibj.hal.HAL;
import edu.wpi.first.wpilibj.sim.AnalogOutSim;
import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder;
/**

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/Compressor.java
View File

@@ -193,7 +193,7 @@ public class Compressor extends SendableBase {
@Override
public void initSendable(SendableBuilder builder) {
builder.setSmartDashboardType("Compressor");
builder.addBooleanProperty("Enabled", this::enabled, (value) -> {
builder.addBooleanProperty("Enabled", this::enabled, value -> {
if (value) {
start();
} else {

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/DigitalGlitchFilter.java
View File

@@ -12,8 +12,8 @@ import java.util.concurrent.locks.ReentrantLock;
import edu.wpi.first.wpilibj.hal.DigitalGlitchFilterJNI;
import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType;
import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder;
import edu.wpi.first.wpilibj.hal.HAL;
import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder;
/**
* Class to enable glitch filtering on a set of digital inputs. This class will manage adding and

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/DoubleSolenoid.java
View File

@@ -166,7 +166,7 @@ public class DoubleSolenoid extends SolenoidBase {
public void initSendable(SendableBuilder builder) {
builder.setSmartDashboardType("Double Solenoid");
builder.setSafeState(() -> set(Value.kOff));
builder.addStringProperty("Value", () -> get().name().substring(1), (value) -> {
builder.addStringProperty("Value", () -> get().name().substring(1), value -> {
if ("Forward".equals(value)) {
set(Value.kForward);
} else if ("Reverse".equals(value)) {

3
wpilibj/src/main/java/edu/wpi/first/wpilibj/GenericHID.java
View File

@@ -7,10 +7,11 @@
package edu.wpi.first.wpilibj;
import edu.wpi.first.wpilibj.hal.HAL;
import java.util.HashMap;
import java.util.Map;
import edu.wpi.first.wpilibj.hal.HAL;
/**
* GenericHID Interface.
*/

8
wpilibj/src/main/java/edu/wpi/first/wpilibj/Relay.java
View File

@@ -7,14 +7,14 @@
package edu.wpi.first.wpilibj;
import java.util.Arrays;
import java.util.Optional;
import edu.wpi.first.wpilibj.hal.FRCNetComm.tResourceType;
import edu.wpi.first.wpilibj.hal.HAL;
import edu.wpi.first.wpilibj.hal.RelayJNI;
import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder;
import java.util.Arrays;
import java.util.Optional;
import static java.util.Objects.requireNonNull;
/**
@@ -334,6 +334,6 @@ public class Relay extends SendableBase implements MotorSafety {
builder.setSmartDashboardType("Relay");
builder.setSafeState(() -> set(Value.kOff));
builder.addStringProperty("Value", () -> get().getPrettyValue(),
(value) -> set(Value.getValueOf(value).orElse(Value.kOff)));
value -> set(Value.getValueOf(value).orElse(Value.kOff)));
}
}

8
wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java
View File

@@ -183,11 +183,7 @@ public abstract class Trigger extends SendableBase {
@Override
public void initSendable(SendableBuilder builder) {
builder.setSmartDashboardType("Button");
builder.setSafeState(() -> {
m_sendablePressed = false;
});
builder.addBooleanProperty("pressed", this::grab, (value) -> {
m_sendablePressed = value;
});
builder.setSafeState(() -> m_sendablePressed = false);
builder.addBooleanProperty("pressed", this::grab, value -> m_sendablePressed = value);
}
}

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/command/Command.java
View File

@@ -555,7 +555,7 @@ public abstract class Command extends SendableBase {
public void initSendable(SendableBuilder builder) {
builder.setSmartDashboardType("Command");
builder.addStringProperty(".name", this::getName, null);
builder.addBooleanProperty("running", this::isRunning, (value) -> {
builder.addBooleanProperty("running", this::isRunning, value -> {
if (value) {
if (!isRunning()) {
start();

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/livewindow/LiveWindow.java
View File

@@ -13,9 +13,9 @@ import java.util.Map;
import edu.wpi.first.networktables.NetworkTable;
import edu.wpi.first.networktables.NetworkTableEntry;
import edu.wpi.first.networktables.NetworkTableInstance;
import edu.wpi.first.wpilibj.Sendable;
import edu.wpi.first.wpilibj.command.Scheduler;
import edu.wpi.first.wpilibj.smartdashboard.SendableBuilderImpl;
import edu.wpi.first.wpilibj.Sendable;
/**

2
wpilibj/src/main/java/edu/wpi/first/wpilibj/livewindow/LiveWindowSendable.java
View File

@@ -7,8 +7,8 @@
package edu.wpi.first.wpilibj.livewindow;
import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder;
import edu.wpi.first.wpilibj.Sendable;
import edu.wpi.first.wpilibj.smartdashboard.SendableBuilder;
/**
* Live Window Sendable is a special type of object sendable to the live window.

5
wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableBuilder.java
View File

@@ -7,14 +7,15 @@
package edu.wpi.first.wpilibj.smartdashboard;
import edu.wpi.first.networktables.NetworkTableEntry;
import edu.wpi.first.networktables.NetworkTableValue;
import java.util.function.BooleanSupplier;
import java.util.function.Consumer;
import java.util.function.DoubleConsumer;
import java.util.function.DoubleSupplier;
import java.util.function.Supplier;
import edu.wpi.first.networktables.NetworkTableEntry;
import edu.wpi.first.networktables.NetworkTableValue;
public interface SendableBuilder {
/**
* Set the string representation of the named data type that will be used

45
wpilibj/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SendableBuilderImpl.java
View File

@@ -7,18 +7,19 @@
package edu.wpi.first.wpilibj.smartdashboard;
import edu.wpi.first.networktables.EntryListenerFlags;
import edu.wpi.first.networktables.NetworkTable;
import edu.wpi.first.networktables.NetworkTableEntry;
import edu.wpi.first.networktables.NetworkTableValue;
import java.util.ArrayList;
import java.util.List;
import java.util.function.BooleanSupplier;
import java.util.function.Consumer;
import java.util.function.DoubleConsumer;
import java.util.function.DoubleSupplier;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.ArrayList;
import java.util.List;
import edu.wpi.first.networktables.EntryListenerFlags;
import edu.wpi.first.networktables.NetworkTable;
import edu.wpi.first.networktables.NetworkTableEntry;
import edu.wpi.first.networktables.NetworkTableValue;
public class SendableBuilderImpl implements SendableBuilder {
private static class Property {
@@ -185,10 +186,10 @@ public class SendableBuilderImpl implements SendableBuilder {
public void addBooleanProperty(String key, BooleanSupplier getter, BooleanConsumer setter) {
Property property = new Property(m_table, key);
if (getter != null) {
property.m_update = (entry) -> entry.setBoolean(getter.getAsBoolean());
property.m_update = entry -> entry.setBoolean(getter.getAsBoolean());
}
if (setter != null) {
property.m_createListener = (entry) -> entry.addListener((event) -> {
property.m_createListener = entry -> entry.addListener(event -> {
if (event.value.isBoolean()) {
setter.accept(event.value.getBoolean());
}
@@ -208,10 +209,10 @@ public class SendableBuilderImpl implements SendableBuilder {
public void addDoubleProperty(String key, DoubleSupplier getter, DoubleConsumer setter) {
Property property = new Property(m_table, key);
if (getter != null) {
property.m_update = (entry) -> entry.setDouble(getter.getAsDouble());
property.m_update = entry -> entry.setDouble(getter.getAsDouble());
}
if (setter != null) {
property.m_createListener = (entry) -> entry.addListener((event) -> {
property.m_createListener = entry -> entry.addListener(event -> {
if (event.value.isDouble()) {
setter.accept(event.value.getDouble());
}
@@ -231,10 +232,10 @@ public class SendableBuilderImpl implements SendableBuilder {
public void addStringProperty(String key, Supplier<String> getter, Consumer<String> setter) {
Property property = new Property(m_table, key);
if (getter != null) {
property.m_update = (entry) -> entry.setString(getter.get());
property.m_update = entry -> entry.setString(getter.get());
}
if (setter != null) {
property.m_createListener = (entry) -> entry.addListener((event) -> {
property.m_createListener = entry -> entry.addListener(event -> {
if (event.value.isString()) {
setter.accept(event.value.getString());
}
@@ -255,10 +256,10 @@ public class SendableBuilderImpl implements SendableBuilder {
Consumer<boolean[]> setter) {
Property property = new Property(m_table, key);
if (getter != null) {
property.m_update = (entry) -> entry.setBooleanArray(getter.get());
property.m_update = entry -> entry.setBooleanArray(getter.get());
}
if (setter != null) {
property.m_createListener = (entry) -> entry.addListener((event) -> {
property.m_createListener = entry -> entry.addListener(event -> {
if (event.value.isBooleanArray()) {
setter.accept(event.value.getBooleanArray());
}
@@ -279,10 +280,10 @@ public class SendableBuilderImpl implements SendableBuilder {
Consumer<double[]> setter) {
Property property = new Property(m_table, key);
if (getter != null) {
property.m_update = (entry) -> entry.setDoubleArray(getter.get());
property.m_update = entry -> entry.setDoubleArray(getter.get());
}
if (setter != null) {
property.m_createListener = (entry) -> entry.addListener((event) -> {
property.m_createListener = entry -> entry.addListener(event -> {
if (event.value.isDoubleArray()) {
setter.accept(event.value.getDoubleArray());
}
@@ -303,10 +304,10 @@ public class SendableBuilderImpl implements SendableBuilder {
Consumer<String[]> setter) {
Property property = new Property(m_table, key);
if (getter != null) {
property.m_update = (entry) -> entry.setStringArray(getter.get());
property.m_update = entry -> entry.setStringArray(getter.get());
}
if (setter != null) {
property.m_createListener = (entry) -> entry.addListener((event) -> {
property.m_createListener = entry -> entry.addListener(event -> {
if (event.value.isStringArray()) {
setter.accept(event.value.getStringArray());
}
@@ -326,10 +327,10 @@ public class SendableBuilderImpl implements SendableBuilder {
public void addRawProperty(String key, Supplier<byte[]> getter, Consumer<byte[]> setter) {
Property property = new Property(m_table, key);
if (getter != null) {
property.m_update = (entry) -> entry.setRaw(getter.get());
property.m_update = entry -> entry.setRaw(getter.get());
}
if (setter != null) {
property.m_createListener = (entry) -> entry.addListener((event) -> {
property.m_createListener = entry -> entry.addListener(event -> {
if (event.value.isRaw()) {
setter.accept(event.value.getRaw());
}
@@ -350,10 +351,10 @@ public class SendableBuilderImpl implements SendableBuilder {
Consumer<NetworkTableValue> setter) {
Property property = new Property(m_table, key);
if (getter != null) {
property.m_update = (entry) -> entry.setValue(getter.get());
property.m_update = entry -> entry.setValue(getter.get());
}
if (setter != null) {
property.m_createListener = (entry) -> entry.addListener((event) -> {
property.m_createListener = entry -> entry.addListener(event -> {
setter.accept(event.value);
}, EntryListenerFlags.kImmediate | EntryListenerFlags.kNew | EntryListenerFlags.kUpdate);
}