Fix naming of constant
Change-Id: Idf7fbb17a7f93b43c54700cf9591102305427e9e
diff --git a/y2016/control_loops/superstructure/superstructure_lib_test.cc b/y2016/control_loops/superstructure/superstructure_lib_test.cc
index 02f7ae2..1efdfcf 100644
--- a/y2016/control_loops/superstructure/superstructure_lib_test.cc
+++ b/y2016/control_loops/superstructure/superstructure_lib_test.cc
@@ -639,7 +639,7 @@
.Send());
// Expected states to cycle through and check in order.
- Superstructure::State ExpectedStateOrder[] = {
+ Superstructure::State kExpectedStateOrder[] = {
Superstructure::DISABLED_INITIALIZED,
Superstructure::HIGH_ARM_ZERO_LIFT_ARM,
Superstructure::HIGH_ARM_ZERO_LEVEL_SHOOTER,
@@ -653,24 +653,24 @@
}
static const int kNumberOfStates =
- sizeof(ExpectedStateOrder) / sizeof(ExpectedStateOrder[0]);
+ sizeof(kExpectedStateOrder) / sizeof(kExpectedStateOrder[0]);
// Next state when reached to disable
for (int i = 0; i < kNumberOfStates; i++) {
// Next expected state after being disabled that is expected until next
// state to disable at is reached
- for (int j = 0; superstructure_.state() != ExpectedStateOrder[i] && j <= i;
+ for (int j = 0; superstructure_.state() != kExpectedStateOrder[i] && j <= i;
j++) {
// RunIteration until next expected state is reached with a maximum
// of 10000 times to ensure a breakout
for (int o = 0;
- superstructure_.state() < ExpectedStateOrder[j] && o < 10000; o++) {
+ superstructure_.state() < kExpectedStateOrder[j] && o < 10000; o++) {
RunIteration(true);
}
- EXPECT_EQ(ExpectedStateOrder[j], superstructure_.state());
+ EXPECT_EQ(kExpectedStateOrder[j], superstructure_.state());
}
- EXPECT_EQ(ExpectedStateOrder[i], superstructure_.state());
+ EXPECT_EQ(kExpectedStateOrder[i], superstructure_.state());
// Disable
RunIteration(false);
@@ -703,7 +703,7 @@
.Send());
// Expected states to cycle through and check in order.
- Superstructure::State ExpectedStateOrder[] = {
+ Superstructure::State kExpectedStateOrder[] = {
Superstructure::DISABLED_INITIALIZED,
Superstructure::LOW_ARM_ZERO_LOWER_INTAKE,
Superstructure::LOW_ARM_ZERO_MAYBE_LEVEL_SHOOTER,
@@ -717,24 +717,24 @@
}
static const int kNumberOfStates =
- sizeof(ExpectedStateOrder) / sizeof(ExpectedStateOrder[0]);
+ sizeof(kExpectedStateOrder) / sizeof(kExpectedStateOrder[0]);
// Next state when reached to disable
for (int i = 0; i < kNumberOfStates; i++) {
// Next expected state after being disabled that is expected until next
// state to disable at is reached
- for (int j = 0; superstructure_.state() != ExpectedStateOrder[i] && j <= i;
+ for (int j = 0; superstructure_.state() != kExpectedStateOrder[i] && j <= i;
j++) {
// RunIteration until next expected state is reached with a maximum
// of 10000 times to ensure a breakout
for (int o = 0;
- superstructure_.state() < ExpectedStateOrder[j] && o < 10000; o++) {
+ superstructure_.state() < kExpectedStateOrder[j] && o < 10000; o++) {
RunIteration(true);
}
- EXPECT_EQ(ExpectedStateOrder[j], superstructure_.state());
+ EXPECT_EQ(kExpectedStateOrder[j], superstructure_.state());
}
- EXPECT_EQ(ExpectedStateOrder[i], superstructure_.state());
+ EXPECT_EQ(kExpectedStateOrder[i], superstructure_.state());
// Disable
RunIteration(false);
diff --git a/y2016_bot3/control_loops/intake/intake_lib_test.cc b/y2016_bot3/control_loops/intake/intake_lib_test.cc
index 43232aa..a82da71 100644
--- a/y2016_bot3/control_loops/intake/intake_lib_test.cc
+++ b/y2016_bot3/control_loops/intake/intake_lib_test.cc
@@ -357,7 +357,7 @@
.Send());
// Expected states to cycle through and check in order.
- Intake::State ExpectedStateOrder[] = {
+ Intake::State kExpectedStateOrder[] = {
Intake::DISABLED_INITIALIZED, Intake::ZERO_LOWER_INTAKE};
// Cycle through until intake_ is initialized in intake.cc
@@ -366,23 +366,23 @@
}
static const int kNumberOfStates =
- sizeof(ExpectedStateOrder) / sizeof(ExpectedStateOrder[0]);
+ sizeof(kExpectedStateOrder) / sizeof(kExpectedStateOrder[0]);
// Next state when reached to disable
for (int i = 0; i < kNumberOfStates; i++) {
// Next expected state after being disabled that is expected until next
// state to disable at is reached
- for (int j = 0; intake_.state() != ExpectedStateOrder[i] && j <= i; j++) {
+ for (int j = 0; intake_.state() != kExpectedStateOrder[i] && j <= i; j++) {
// RunIteration until next expected state is reached with a maximum
// of 10000 times to ensure a breakout
- for (int o = 0; intake_.state() < ExpectedStateOrder[j] && o < 10000;
+ for (int o = 0; intake_.state() < kExpectedStateOrder[j] && o < 10000;
o++) {
RunIteration(true);
}
- EXPECT_EQ(ExpectedStateOrder[j], intake_.state());
+ EXPECT_EQ(kExpectedStateOrder[j], intake_.state());
}
- EXPECT_EQ(ExpectedStateOrder[i], intake_.state());
+ EXPECT_EQ(kExpectedStateOrder[i], intake_.state());
// Disable
RunIteration(false);
@@ -406,7 +406,7 @@
.Send());
// Expected states to cycle through and check in order.
- Intake::State ExpectedStateOrder[] = {
+ Intake::State kExpectedStateOrder[] = {
Intake::DISABLED_INITIALIZED, Intake::ZERO_LIFT_INTAKE};
// Cycle through until intake_ is initialized in intake.cc
@@ -415,23 +415,23 @@
}
static const int kNumberOfStates =
- sizeof(ExpectedStateOrder) / sizeof(ExpectedStateOrder[0]);
+ sizeof(kExpectedStateOrder) / sizeof(kExpectedStateOrder[0]);
// Next state when reached to disable
for (int i = 0; i < kNumberOfStates; i++) {
// Next expected state after being disabled that is expected until next
// state to disable at is reached
- for (int j = 0; intake_.state() != ExpectedStateOrder[i] && j <= i; j++) {
+ for (int j = 0; intake_.state() != kExpectedStateOrder[i] && j <= i; j++) {
// RunIteration until next expected state is reached with a maximum
// of 10000 times to ensure a breakout
- for (int o = 0; intake_.state() < ExpectedStateOrder[j] && o < 10000;
+ for (int o = 0; intake_.state() < kExpectedStateOrder[j] && o < 10000;
o++) {
RunIteration(true);
}
- EXPECT_EQ(ExpectedStateOrder[j], intake_.state());
+ EXPECT_EQ(kExpectedStateOrder[j], intake_.state());
}
- EXPECT_EQ(ExpectedStateOrder[i], intake_.state());
+ EXPECT_EQ(kExpectedStateOrder[i], intake_.state());
// Disable
RunIteration(false);