Skip to content

Commit bb1fd5d

Browse files
committed
Merge remote-tracking branch 'origin/format-testing'
2 parents f3ebbe5 + 262f876 commit bb1fd5d

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

core/src/main/java/org/teamtators/rotator/tester/ManualTester.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ private void startTest() {
166166
if (test == null) {
167167
logger.info("== Test group '{}' is empty! ==", getCurrentTestGroup().getName());
168168
} else {
169-
logger.info("== Testing '{}' ==", test.getName());
169+
logger.info(" == Testing '{}' ==", test.getName());
170170
test.start();
171171
}
172172
}

rio/src/main/java/org/teamtators/rotator/tester/components/ADXRS453Test.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public ADXRS453Test(String name, ADXRS453 gyro) {
1414

1515
@Override
1616
public void start() {
17-
logger.info("Press A to get the rate, the angle, and the calibration offset of the gyro");
18-
logger.info("B to start calibration, and Y to end calibration, X to get detailed information");
17+
logger.info(">>>>Press A to get the rate, the angle, and the calibration offset of the gyro");
18+
logger.info(">>>>B to start calibration, and Y to end calibration, X to get detailed information");
1919
}
2020

2121
@Override
@@ -25,20 +25,20 @@ public void onButtonDown(LogitechF310.Button button) {
2525
double angle = gyro.getAngle();
2626
double rate = gyro.getRate();
2727
double calibrationOffset = gyro.getCalibrationOffset();
28-
logger.info("Gyro Angle: {}, Rate: {} (Offset: {})", angle, rate, calibrationOffset);
28+
logger.info(">>>>Gyro Angle: {}, Rate: {} (Offset: {})", angle, rate, calibrationOffset);
2929
break;
3030
case B:
31-
logger.info("Starting gyro calibration");
31+
logger.info(">>>>Starting gyro calibration");
3232
gyro.startCalibration();
3333
break;
3434
case Y:
35-
logger.info("Finishing gyro calibration");
35+
logger.info(">>>>Finishing gyro calibration");
3636
gyro.finishCalibration();
3737
break;
3838
case X:
3939
int serial = gyro.getSerialNumber();
4040
double temperature = gyro.getTemperature();
41-
logger.info("Serial: 0x{}, temperature: {} C", Integer.toHexString(serial), temperature);
41+
logger.info(">>>>Serial: 0x{}, temperature: {} C", Integer.toHexString(serial), temperature);
4242
break;
4343
}
4444
}

rio/src/main/java/org/teamtators/rotator/tester/components/DigitalSensorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ public DigitalSensorTest(String name, DigitalSensor digitalSensor) {
1515

1616
@Override
1717
public void start() {
18-
logger.info("Press 'A' to get the value and type from the sensor");
18+
logger.info(">>>>Press 'A' to get the value and type from the sensor");
1919
}
2020

2121
@Override
2222
public void onButtonDown(LogitechF310.Button button) {
2323
if (button == LogitechF310.Button.A) {
24-
logger.info("Digital sensor value {} (type {})", digitalSensor.get(), digitalSensor.getType());
24+
logger.info(">>>>Digital sensor value {} (type {})", digitalSensor.get(), digitalSensor.getType());
2525
}
2626
}
2727
}

rio/src/main/java/org/teamtators/rotator/tester/components/DistanceLaserTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ public DistanceLaserTest(String name, DistanceLaser distanceLaser) {
1414

1515
@Override
1616
public void start() {
17-
logger.info("Press 'A' to get the Distance and Voltage of the DistanceLaser");
17+
logger.info(">>>>Press 'A' to get the Distance and Voltage of the DistanceLaser");
1818
}
1919

2020
@Override
2121
public void onButtonDown(LogitechF310.Button button) {
2222
if (button == LogitechF310.Button.A) {
23-
logger.info("Distance Laser ballDistance: {}; voltage: {}", distanceLaser.getDistance(), distanceLaser.getVoltage());
23+
logger.info(">>>>Distance Laser ballDistance: {}; voltage: {}", distanceLaser.getDistance(), distanceLaser.getVoltage());
2424
}
2525
}
2626
}

rio/src/main/java/org/teamtators/rotator/tester/components/EncoderTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ public EncoderTest(String name, Encoder encoder) {
1515

1616
@Override
1717
public void start() {
18-
logger.info("Press 'A' to display the current values");
19-
logger.info("Press 'B' to resetAngle the encoder values");
18+
logger.info(">>>>Press 'A' to display the current values");
19+
logger.info(">>>>Press 'B' to resetAngle the encoder values");
2020
}
2121

2222
@Override
2323
public void onButtonDown(LogitechF310.Button button) {
2424
if (button == LogitechF310.Button.B) {
2525
encoder.reset();
26-
logger.info("Encoder resetAngle");
26+
logger.info(">>>>Encoder resetAngle");
2727
} else if (button == LogitechF310.Button.A) {
28-
logger.info("Distance: {} (ticks: {}), Rate: {}", encoder.getDistance(), encoder.get(), encoder.getRate());
28+
logger.info(">>>>Distance: {} (ticks: {}), Rate: {}", encoder.getDistance(), encoder.get(), encoder.getRate());
2929
}
3030
}
3131
}

rio/src/main/java/org/teamtators/rotator/tester/components/SolenoidTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ public SolenoidTest(String name, Solenoid solenoid) {
1414

1515
@Override
1616
public void start() {
17-
logger.info("Press A to activate solenoid, B to deactivate");
17+
logger.info(">>>>Press A to activate solenoid, B to deactivate");
1818
}
1919

2020
@Override
2121
public void onButtonDown(LogitechF310.Button button) {
2222
if (button == LogitechF310.Button.A) {
2323
solenoid.set(true);
24-
logger.info("Solenoid activated");
24+
logger.info(">>>>Solenoid activated");
2525
} else if (button == LogitechF310.Button.B) {
2626
solenoid.set(false);
27-
logger.info("Solenoid deactivated");
27+
logger.info(">>>>Solenoid deactivated");
2828
}
2929
}
3030
}

rio/src/main/java/org/teamtators/rotator/tester/components/VictorSPTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ public VictorSPTest(String name, VictorSP motor) {
1717

1818
@Override
1919
public void start() {
20-
logger.info("Push joystick in direction to move, where forward is positive");
21-
logger.info("Press back/add to drive backward/forward at full speed");
20+
logger.info(">>>>Push joystick in direction to move, where forward is positive");
21+
logger.info(">>>>Press back/add to drive backward/forward at full speed");
2222
fullspeed = 0;
2323
axisValue = 0;
2424
}

0 commit comments

Comments
 (0)