Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
  • 12 commits
  • 12 files changed
  • 0 commit comments
  • 2 contributors
Commits on Jan 07, 2016
@ThadHouse ThadHouse Ups WPILib Version Number in AppVeyor 825dcf8
Commits on Jan 08, 2016
@ThadHouse ThadHouse Updates NavX code changes made upstream e6c1454
@ThadHouse ThadHouse Fixes SmartDashboard Gyro naming bb76d23
@ThadHouse ThadHouse Fixes PIDController always returning OnTarget properly. 50506fc
Commits on Jan 09, 2016
@ThadHouse ThadHouse Updates Driver Station Locking
Locking the joysticks now uses a ReaderWriterLock, and we now get the
descriptor in the GetData loop. This should speed up the DriverStation,
and make it more reliable.
dd86fe3
@msoucy msoucy Fixed case sensitivity
Prevents building on Linux systems
af0da3f
@ThadHouse ThadHouse Merge pull request #96 from msoucy/case-sensitivity
Fixed case sensitivity in project file
0996697
Commits on Jan 12, 2016
@ThadHouse ThadHouse Implements Driver Station Caching to speed up DS reads
The GetData HAL methods take 5 ms combined to grab all the data. So
there is easily a period where the data could be locked and contended
for. This now grabs the data into a cache, leave all joystick data
readable. It then grabs the write lock, does a quick reference swap, and
unlocks. This way, the  writing only takes a few nanoseconds, rather
then 5 milliseconds.

Should fix DS Joystick Tests

The tests need to wait longer.

Extends wait times

Might need to actually figure out locking driver station.
1379b5e
@ThadHouse ThadHouse Fixes PIDController SetToleranceBuffer Locking 03e0b97
Commits on Jan 13, 2016
@ThadHouse ThadHouse Changes Joystick Report Error to use reporting line numbers 109495f
@ThadHouse ThadHouse Merge pull request #97 from robotdotnet/DriverStationReadWriteLock
Driver Station Performance Improvements
78a39d7
@ThadHouse ThadHouse Fixes a few documentation mistakes 94be211
View
@@ -95,7 +95,7 @@
<Compile Include="Base\HALAccelerometer.cs" />
<Compile Include="Base\HALAnalog.cs" />
<Compile Include="Base\HALCAN.cs" />
- <Compile Include="Base\HALCanTalonSRX.cs" />
+ <Compile Include="Base\HALCANTalonSRX.cs" />
<Compile Include="Base\HALCompressor.cs" />
<Compile Include="Base\HALDigital.cs" />
<Compile Include="Base\HALErrors.cs" />
Oops, something went wrong.
@@ -282,53 +282,11 @@ public void TestHALBlittable()
}
- internal struct Function
- {
- public bool Equals(Function other)
- {
- return string.Equals(m_retType, other.m_retType) && string.Equals(m_identifier.ToLower(), other.m_identifier.ToLower()) && m_parameters.SequenceEqual(other.m_parameters);
- }
-
- public override int GetHashCode()
- {
- unchecked
- {
- var hashCode = m_retType?.GetHashCode() ?? 0;
- hashCode = (hashCode * 397) ^ (m_identifier?.GetHashCode() ?? 0);
- hashCode = (hashCode * 397) ^ (m_parameters?.GetHashCode() ?? 0);
- return hashCode;
- }
- }
-
- public Function(string ret, string id, string[] p)
- {
- m_retType = ret;
- m_identifier = id;
- m_parameters = p;
- }
-
- private readonly string m_retType;
- private readonly string m_identifier;
- private readonly string[] m_parameters;
-
- public override bool Equals(object obj)
- {
- if (ReferenceEquals(null, obj)) return false;
- return obj is Function && Equals((Function)obj);
- }
- }
-
- public struct HALMethodClass
- {
- public string ClassName;
- public List<MethodDeclarationSyntax> Methods;
- }
-
public struct HALDelegateClass
{
public string ClassName;
public List<DelegateDeclarationSyntax> Methods;
}
-
+
}
@@ -77,5 +77,11 @@ public void TestReset()
m_gyro.Reset();
Assert.AreEqual(0.0, m_gyro.GetAngle(), 0.0001);
}
+
+ [Test]
+ public void TestSmartDashboardType()
+ {
+ Assert.That(m_gyro.SmartDashboardType, Is.EqualTo("Gyro"));
+ }
}
}
@@ -232,7 +232,7 @@ public void TestSmartDashboardType()
{
using (AnalogGyro s = GetAnalogGyro(0))
{
- Assert.That(s.SmartDashboardType, Is.EqualTo("AnalogGyro"));
+ Assert.That(s.SmartDashboardType, Is.EqualTo("Gyro"));
}
}
@@ -256,7 +256,7 @@ public void TestJoystickButtons([Range(0,32)] int numButtons)
}
};
DriverStationHelper.UpdateData();
- Thread.Sleep(10);
+ Thread.Sleep(150);
int buttonCount = DriverStation.Instance.GetStickButtonCount(0);
Assert.That(buttonCount, Is.EqualTo(numButtons));
for (int i = 0; i < buttonCount; i++)
@@ -271,7 +271,7 @@ public void TestJoystickButtons([Range(0,32)] int numButtons)
buttons[i] = true;
}
DriverStationHelper.UpdateData();
- Thread.Sleep(10);
+ Thread.Sleep(150);
for (int i = 0; i < buttonCount; i++)
{
bool button = DriverStation.Instance.GetStickButton(0, (byte)(i + 1));
@@ -301,7 +301,7 @@ public void TestJoystickAxes([Range(0, 6)] int numAxes)
}
};
DriverStationHelper.UpdateData();
- Thread.Sleep(10);
+ Thread.Sleep(150);
int axesCount = DriverStation.Instance.GetStickAxisCount(0);
Assert.That(axesCount, Is.EqualTo(numAxes));
for (int i = 0; i < axesCount; i++)
@@ -316,7 +316,7 @@ public void TestJoystickAxes([Range(0, 6)] int numAxes)
axes[i] = -.598;
}
DriverStationHelper.UpdateData();
- Thread.Sleep(10);
+ Thread.Sleep(150);
for (int i = 0; i < axesCount; i++)
{
double axis = DriverStation.Instance.GetStickAxis(0, i);
@@ -28,7 +28,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <PlatformTarget>x86</PlatformTarget>
+ <PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -172,8 +172,5 @@ public override double GetRate()
}
return m_spi.GetAccumulatorLastValue() * DegreePerSecondPerLSB;
}
-
- /// <inheritdoc/>
- public override string SmartDashboardType => nameof(ADXRS450_Gyro);
}
}
@@ -197,8 +197,5 @@ private double Deadband
AnalogInput.AccumulatorDeadband = deadband;
}
}
-
- ///<inheritdoc />
- public override string SmartDashboardType => "AnalogGyro";
}
}
Oops, something went wrong.

No commit comments for this range