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

Update to 2018_v4 image and new build system. (#598)

Browse Source 
* Revert "Force OpenCV to 3.1.0 (#602)"

This reverts commit 50ed55e8e2.

* Removes Simulation

* Removes old build system

* Removes old gtest

* Adds new gmock and gtest

* Updates to new ni-libraries

* removes MyRobot (to be replaced)

* moves files to new location

* Adds new sim backend and new test executables

* updates .styleguide and .gitignore

* Changes cpp WPILibVersion to a function

MSVC throws an AV with the old version.

* Disables USBCamera on all systems except for linux

* 2018 NI Libraries

* New build system
This commit is contained in:
Thad House
2017-08-18 21:35:53 -07:00
committed by Peter Johnson
parent 50ed55e8e2
commit e1195e8b9d
1024 changed files with 64481 additions and 61340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/PIDTest.java
View File

@@ -133,11 +133,11 @@ public class PIDTest extends AbstractComsSetup {
assertFalse("PID did not begin disabled", m_controller.isEnabled());
assertEquals("PID.getError() did not start at " + setpoint, setpoint,
m_controller.getError(), 0);
assertEquals(k_p, m_table.getNumber("p"), 0);
assertEquals(k_i, m_table.getNumber("i"), 0);
assertEquals(k_d, m_table.getNumber("d"), 0);
assertEquals(setpoint, m_table.getNumber("setpoint"), 0);
assertFalse(m_table.getBoolean("enabled"));
assertEquals(k_p, m_table.getNumber("p", 9999999), 0);
assertEquals(k_i, m_table.getNumber("i", 9999999), 0);
assertEquals(k_d, m_table.getNumber("d", 9999999), 0);
assertEquals(setpoint, m_table.getNumber("setpoint", 9999999), 0);
assertFalse(m_table.getBoolean("enabled", true));
}
@Test
@@ -148,11 +148,11 @@ public class PIDTest extends AbstractComsSetup {
m_controller.setSetpoint(setpoint);
m_controller.enable();
Timer.delay(.5);
assertTrue(m_table.getBoolean("enabled"));
assertTrue(m_table.getBoolean("enabled", false));
assertTrue(m_controller.isEnabled());
assertThat(0.0, is(not(me.getMotor().get())));
m_controller.reset();
assertFalse(m_table.getBoolean("enabled"));
assertFalse(m_table.getBoolean("enabled", true));
assertFalse(m_controller.isEnabled());
assertEquals(0, me.getMotor().get(), 0);
}

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

@@ -117,7 +117,7 @@ public class PreferencesTest extends AbstractComsSetup {
String networkedNumber = "networkCheckedValue";
int networkNumberValue = 100;
m_pref.putInt(networkedNumber, networkNumberValue);
assertEquals(networkNumberValue, (int) (m_prefTable.getNumber(networkedNumber)));
assertEquals(networkNumberValue, (int) (m_prefTable.getNumber(networkedNumber, 9999999)));
m_pref.remove(networkedNumber);
}

12
wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/RelayCrossConnectTest.java
View File

@@ -57,7 +57,7 @@ public class RelayCrossConnectTest extends AbstractComsSetup {
assertTrue("Input two was not high when relay set both high", m_relayFixture.getInputTwo()
.get());
assertEquals(Value.kOn, m_relayFixture.getRelay().get());
assertEquals("On", table.getString("Value"));
assertEquals("On", table.getString("Value", ""));
}
@Test
@@ -71,7 +71,7 @@ public class RelayCrossConnectTest extends AbstractComsSetup {
.getInputTwo()
.get());
assertEquals(Value.kForward, m_relayFixture.getRelay().get());
assertEquals("Forward", table.getString("Value"));
assertEquals("Forward", table.getString("Value", ""));
}
@Test
@@ -85,7 +85,7 @@ public class RelayCrossConnectTest extends AbstractComsSetup {
.getInputTwo()
.get());
assertEquals(Value.kReverse, m_relayFixture.getRelay().get());
assertEquals("Reverse", table.getString("Value"));
assertEquals("Reverse", table.getString("Value", ""));
}
@Test
@@ -98,7 +98,7 @@ public class RelayCrossConnectTest extends AbstractComsSetup {
assertTrue("Input two was not high when relay set Value.kOn in kForward Direction",
m_relayFixture.getInputTwo().get());
assertEquals(Value.kOn, m_relayFixture.getRelay().get());
assertEquals("On", table.getString("Value"));
assertEquals("On", table.getString("Value", ""));
}
@Test
@@ -111,7 +111,7 @@ public class RelayCrossConnectTest extends AbstractComsSetup {
assertFalse("Input two was not low when relay set Value.kOn in kReverse Direction",
m_relayFixture.getInputTwo().get());
assertEquals(Value.kOn, m_relayFixture.getRelay().get());
assertEquals("On", table.getString("Value"));
assertEquals("On", table.getString("Value", ""));
}
@Test(expected = InvalidValueException.class)
@@ -132,7 +132,7 @@ public class RelayCrossConnectTest extends AbstractComsSetup {
// Initially both outputs should be off
assertFalse(m_relayFixture.getInputOne().get());
assertFalse(m_relayFixture.getInputTwo().get());
assertEquals("Off", table.getString("Value"));
assertEquals("Off", table.getString("Value", ""));
}
@Override

10
wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/smartdashboard/SmartDashboardTest.java
View File

@@ -39,7 +39,7 @@ public class SmartDashboardTest extends AbstractComsSetup {
String value = "thisIsAValue";
SmartDashboard.putString(key, value);
assertEquals(value, SmartDashboard.getString(key, ""));
assertEquals(value, table.getString(key));
assertEquals(value, table.getString(key, ""));
}
@Test
@@ -48,7 +48,7 @@ public class SmartDashboardTest extends AbstractComsSetup {
int value = 2147483647;
SmartDashboard.putNumber(key, value);
assertEquals(value, SmartDashboard.getNumber(key, 0), 0.01);
assertEquals(value, table.getNumber(key), 0.01);
assertEquals(value, table.getNumber(key, 0), 0.01);
}
@Test
@@ -57,7 +57,7 @@ public class SmartDashboardTest extends AbstractComsSetup {
boolean value = true;
SmartDashboard.putBoolean(key, value);
assertEquals(value, SmartDashboard.getBoolean(key, !value));
assertEquals(value, table.getBoolean(key));
assertEquals(value, table.getBoolean(key, false));
}
@Test
@@ -66,12 +66,12 @@ public class SmartDashboardTest extends AbstractComsSetup {
String valueOld = "oldValue";
SmartDashboard.putString(key, valueOld);
assertEquals(valueOld, SmartDashboard.getString(key, ""));
assertEquals(valueOld, table.getString(key));
assertEquals(valueOld, table.getString(key, ""));
String valueNew = "newValue";
SmartDashboard.putString(key, valueNew);
assertEquals(valueNew, SmartDashboard.getString(key, ""));
assertEquals(valueNew, table.getString(key));
assertEquals(valueNew, table.getString(key, ""));
}
@Ignore