Skip to content

Commit

Permalink
Add motion profiling
Browse files Browse the repository at this point in the history
  • Loading branch information
@kylecorry31
kylecorry31 committed Feb 2, 2019
1 parent d42a3d3 commit 0eea951
Show file tree
Hide file tree
Showing 17 changed files with 479 additions and 59 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {
dependencies {
...
compile 'com.github.Gongoliers:Gongoliers-TalonSRX:v1.0.0'
compile 'com.github.Gongoliers:Gongoliers-TalonSRX:v1.1.0'
}
```

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

group 'com.thegongoliers.talonsrx'
version '1.0.0'
version '1.1.0'

repositories {
mavenCentral()
Expand Down
5 changes: 3 additions & 2 deletions docs/allclasses-frame.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_191) on Sat Feb 02 10:16:02 EST 2019 -->
<title>All Classes (Gongoliers-TalonSRX 1.0.0 API)</title>
<!-- Generated by javadoc (1.8.0_191) on Sat Feb 02 12:01:06 EST 2019 -->
<title>All Classes (Gongoliers-TalonSRX 1.1.0 API)</title>
<meta name="date" content="2019-02-02">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
Expand All @@ -13,6 +13,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
<div class="indexContainer">
<ul>
<li><a href="com/thegongoliers/talonsrx/GTalonSRX.html" title="class in com.thegongoliers.talonsrx" target="classFrame">GTalonSRX</a></li>
<li><a href="com/thegongoliers/talonsrx/TrajectoryCreator.html" title="class in com.thegongoliers.talonsrx" target="classFrame">TrajectoryCreator</a></li>
</ul>
</div>
</body>
Expand Down
5 changes: 3 additions & 2 deletions docs/allclasses-noframe.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_191) on Sat Feb 02 10:16:02 EST 2019 -->
<title>All Classes (Gongoliers-TalonSRX 1.0.0 API)</title>
<!-- Generated by javadoc (1.8.0_191) on Sat Feb 02 12:01:06 EST 2019 -->
<title>All Classes (Gongoliers-TalonSRX 1.1.0 API)</title>
<meta name="date" content="2019-02-02">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
Expand All @@ -13,6 +13,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
<div class="indexContainer">
<ul>
<li><a href="com/thegongoliers/talonsrx/GTalonSRX.html" title="class in com.thegongoliers.talonsrx">GTalonSRX</a></li>
<li><a href="com/thegongoliers/talonsrx/TrajectoryCreator.html" title="class in com.thegongoliers.talonsrx">TrajectoryCreator</a></li>
</ul>
</div>
</body>
Expand Down
90 changes: 65 additions & 25 deletions docs/com/thegongoliers/talonsrx/GTalonSRX.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_191) on Sat Feb 02 10:16:02 EST 2019 -->
<title>GTalonSRX (Gongoliers-TalonSRX 1.0.0 API)</title>
<!-- Generated by javadoc (1.8.0_191) on Sat Feb 02 12:01:06 EST 2019 -->
<title>GTalonSRX (Gongoliers-TalonSRX 1.1.0 API)</title>
<meta name="date" content="2019-02-02">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
Expand All @@ -12,13 +12,13 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="GTalonSRX (Gongoliers-TalonSRX 1.0.0 API)";
parent.document.title="GTalonSRX (Gongoliers-TalonSRX 1.1.0 API)";
}
}
catch(err) {
}
//-->
var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10};
var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
Expand Down Expand Up @@ -48,7 +48,7 @@
<div class="subNav">
<ul class="navList">
<li>Prev&nbsp;Class</li>
<li>Next&nbsp;Class</li>
<li><a href="../../../com/thegongoliers/talonsrx/TrajectoryCreator.html" title="class in com.thegongoliers.talonsrx"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../index.html?com/thegongoliers/talonsrx/GTalonSRX.html" target="_top">Frames</a></li>
Expand Down Expand Up @@ -219,38 +219,44 @@ <h3>Method Summary</h3>
</td>
</tr>
<tr id="i11" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#isMotionProfileFinished--">isMotionProfileFinished</a></span>()</code>
<div class="block">Determines if the motion profile is finished.</div>
</td>
</tr>
<tr id="i12" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#pidWrite-double-">pidWrite</a></span>(double&nbsp;output)</code>&nbsp;</td>
</tr>
<tr id="i12" class="altColor">
<tr id="i13" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#resetEncoder--">resetEncoder</a></span>()</code>
<div class="block">Reset the encoder position to 0.</div>
</td>
</tr>
<tr id="i13" class="rowColor">
<tr id="i14" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#set-double-">set</a></span>(double&nbsp;speed)</code>
<div class="block">Sets the percent output of the motor.</div>
</td>
</tr>
<tr id="i14" class="altColor">
<tr id="i15" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#setCurrent-double-">setCurrent</a></span>(double&nbsp;current)</code>
<div class="block">Sets the current of the motor in amps.</div>
</td>
</tr>
<tr id="i15" class="rowColor">
<tr id="i16" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#setInverted-boolean-">setInverted</a></span>(boolean&nbsp;isInverted)</code>&nbsp;</td>
</tr>
<tr id="i16" class="altColor">
<tr id="i17" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#setNeutralDeadband-double-">setNeutralDeadband</a></span>(double&nbsp;percentOutput)</code>
<div class="block">Set the neutral deadband (sets motor to 0 if below percent output).</div>
</td>
</tr>
<tr id="i17" class="rowColor">
<tr id="i18" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#setPID-double-double-double-int-">setPID</a></span>(double&nbsp;kp,
double&nbsp;ki,
Expand All @@ -259,7 +265,7 @@ <h3>Method Summary</h3>
<div class="block">Set the PID of the talon.</div>
</td>
</tr>
<tr id="i18" class="altColor">
<tr id="i19" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#setPIDF-double-double-double-double-int-">setPIDF</a></span>(double&nbsp;kp,
double&nbsp;ki,
Expand All @@ -269,65 +275,71 @@ <h3>Method Summary</h3>
<div class="block">Set the PIDF of the talon.</div>
</td>
</tr>
<tr id="i19" class="rowColor">
<tr id="i20" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#setPosition-double-">setPosition</a></span>(double&nbsp;position)</code>
<div class="block">Sets the position of the motor.</div>
</td>
</tr>
<tr id="i20" class="altColor">
<tr id="i21" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#setRamp-double-">setRamp</a></span>(double&nbsp;secondsFromNeutralToFull)</code>
<div class="block">Sets the open loop ramp of a Talon SRX.</div>
</td>
</tr>
<tr id="i21" class="rowColor">
<tr id="i22" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#setRemoteSensor-int-">setRemoteSensor</a></span>(int&nbsp;remoteTalonID)</code>
<div class="block">Set this talon's sensor to the sensor on another talon.</div>
</td>
</tr>
<tr id="i22" class="altColor">
<tr id="i23" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#setSensor-com.ctre.phoenix.motorcontrol.FeedbackDevice-">setSensor</a></span>(com.ctre.phoenix.motorcontrol.FeedbackDevice&nbsp;feedbackDevice)</code>
<div class="block">Set the selected sensor of the talon.</div>
</td>
</tr>
<tr id="i23" class="rowColor">
<tr id="i24" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#setSensorCoefficient-double-">setSensorCoefficient</a></span>(double&nbsp;sensorCoefficient)</code>
<div class="block">Set the coefficient of the sensor (can be used for encoder position).</div>
</td>
</tr>
<tr id="i24" class="altColor">
<tr id="i25" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#setSensorPhase-boolean-">setSensorPhase</a></span>(boolean&nbsp;sensorPhase)</code>
<div class="block">Set the sensor phase (if the sensor is inverted).</div>
</td>
</tr>
<tr id="i25" class="rowColor">
<tr id="i26" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#setVelocity-double-">setVelocity</a></span>(double&nbsp;velocity)</code>
<div class="block">Sets the change in position over 100ms.</div>
</td>
</tr>
<tr id="i26" class="altColor">
<tr id="i27" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#startMotionProflile-com.ctre.phoenix.motion.BufferedTrajectoryPointStream-">startMotionProflile</a></span>(com.ctre.phoenix.motion.BufferedTrajectoryPointStream&nbsp;pointStream)</code>
<div class="block">Start following a motion profile.</div>
</td>
</tr>
<tr id="i28" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#stopMotor--">stopMotor</a></span>()</code>&nbsp;</td>
</tr>
<tr id="i27" class="rowColor">
<tr id="i29" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#unfollow--">unfollow</a></span>()</code>
<div class="block">Unfollow any other talon SRXs if currently following.</div>
</td>
</tr>
<tr id="i28" class="altColor">
<tr id="i30" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#useBrakeMode--">useBrakeMode</a></span>()</code>
<div class="block">Use the brake mode when in neutral.</div>
</td>
</tr>
<tr id="i29" class="rowColor">
<tr id="i31" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../com/thegongoliers/talonsrx/GTalonSRX.html#useCoastMode--">useCoastMode</a></span>()</code>
<div class="block">Use the coast mode when in neutral.</div>
Expand Down Expand Up @@ -798,13 +810,41 @@ <h4>enableCurrentLimit</h4>
<a name="disableCurrentLimit--">
<!-- -->
</a>
<ul class="blockListLast">
<ul class="blockList">
<li class="blockList">
<h4>disableCurrentLimit</h4>
<pre>public&nbsp;void&nbsp;disableCurrentLimit()</pre>
<div class="block">Disable current limiting.</div>
</li>
</ul>
<a name="startMotionProflile-com.ctre.phoenix.motion.BufferedTrajectoryPointStream-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>startMotionProflile</h4>
<pre>public&nbsp;void&nbsp;startMotionProflile(com.ctre.phoenix.motion.BufferedTrajectoryPointStream&nbsp;pointStream)</pre>
<div class="block">Start following a motion profile.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>pointStream</code> - The motion profile to follow.</dd>
</dl>
</li>
</ul>
<a name="isMotionProfileFinished--">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>isMotionProfileFinished</h4>
<pre>public&nbsp;boolean&nbsp;isMotionProfileFinished()</pre>
<div class="block">Determines if the motion profile is finished.</div>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>True if the motion profile is finished.</dd>
</dl>
</li>
</ul>
</li>
</ul>
</li>
Expand Down Expand Up @@ -832,7 +872,7 @@ <h4>disableCurrentLimit</h4>
<div class="subNav">
<ul class="navList">
<li>Prev&nbsp;Class</li>
<li>Next&nbsp;Class</li>
<li><a href="../../../com/thegongoliers/talonsrx/TrajectoryCreator.html" title="class in com.thegongoliers.talonsrx"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
</ul>
<ul class="navList">
<li><a href="../../../index.html?com/thegongoliers/talonsrx/GTalonSRX.html" target="_top">Frames</a></li>
Expand Down
Loading

0 comments on commit 0eea951

Please sign in to comment.