Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

StartLiveWindowMode ITables use lambdas (#461)

Browse Source
This commit is contained in:
Austin Shalit
2017-05-07 02:26:18 -04:00
committed by Fred Silberberg
parent 7187e005d4
commit 0b9ff68da1
5 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wpilibj/src/athena/java/edu/wpi/first/wpilibj/DigitalOutput.java
View File

@@ -256,12 +256,7 @@ public class DigitalOutput extends DigitalSource implements LiveWindowSendable {
@Override
public void startLiveWindowMode() {
m_tableListener = new ITableListener() {
@Override
public void valueChanged(ITable itable, String key, Object value, boolean bln) {
set((Boolean) value);
}
};
m_tableListener = (source, key, value, isNew) -> set((boolean) value);
m_table.addTableListener("Value", m_tableListener, true);
}

6
wpilibj/src/athena/java/edu/wpi/first/wpilibj/PWM.java
View File

@@ -292,11 +292,7 @@ public class PWM extends SensorBase implements LiveWindowSendable {
@Override
public void startLiveWindowMode() {
setSpeed(0); // Stop for safety
m_tableListener = new ITableListener() {
public void valueChanged(ITable itable, String key, Object value, boolean bln) {
setSpeed((Double) value);
}
};
m_tableListener = (source, key, value, isNew) -> setSpeed((double) value);
m_table.addTableListener("Value", m_tableListener, true);
}

27
wpilibj/src/athena/java/edu/wpi/first/wpilibj/Relay.java
View File

@@ -105,12 +105,12 @@ public class Relay extends SensorBase implements MotorSafety, LiveWindowSendable
/**
* Relay constructor given a channel.
*
* @param channel The channel number for this relay (0 - 3).
* @param channel The channel number for this relay (0 - 3).
* @param direction The direction that the Relay object will control.
*/
public Relay(final int channel, Direction direction) {
m_channel = channel;
m_direction = requireNonNull( direction, "Null Direction was given");
m_direction = requireNonNull(direction, "Null Direction was given");
initRelay();
set(Value.kOff);
}
@@ -345,19 +345,16 @@ public class Relay extends SensorBase implements MotorSafety, LiveWindowSendable
@Override
public void startLiveWindowMode() {
m_tableListener = new ITableListener() {
@Override
public void valueChanged(ITable itable, String key, Object value, boolean bln) {
String val = ((String) value);
if (val.equals("Off")) {
set(Value.kOff);
} else if (val.equals("On")) {
set(Value.kOn);
} else if (val.equals("Forward")) {
set(Value.kForward);
} else if (val.equals("Reverse")) {
set(Value.kReverse);
}
m_tableListener = (source, key, value, isNew) -> {
String val = ((String) value);
if (val.equals("Off")) {
set(Value.kOff);
} else if (val.equals("On")) {
set(Value.kOn);
} else if (val.equals("Forward")) {
set(Value.kForward);
} else if (val.equals("Reverse")) {
set(Value.kReverse);
}
};
m_table.addTableListener("Value", m_tableListener, true);

6
wpilibj/src/athena/java/edu/wpi/first/wpilibj/Servo.java
View File

@@ -132,11 +132,7 @@ public class Servo extends PWM {
@Override
public void startLiveWindowMode() {
m_tableListener = new ITableListener() {
public void valueChanged(ITable itable, String key, Object value, boolean bln) {
set(((Double) value).doubleValue());
}
};
m_tableListener = (source, key, value, isNew) -> set((double) value);
m_table.addTableListener("Value", m_tableListener, true);
}

2
wpilibj/src/athena/java/edu/wpi/first/wpilibj/Solenoid.java
View File

@@ -128,7 +128,7 @@ public class Solenoid extends SolenoidBase implements LiveWindowSendable {
@Override
public void startLiveWindowMode() {
set(false); // Stop for safety
m_tableListener = (source, key, value, isNew) -> set((Boolean) value);
m_tableListener = (source, key, value, isNew) -> set((boolean) value);
m_table.addTableListener("Value", m_tableListener, true);
}