Skip to content
This repository has been archived by the owner on Sep 6, 2024. It is now read-only.

Commit

Permalink
Merge branch 'MentorSandbox'
Browse files Browse the repository at this point in the history
Former-commit-id: 24a39d3488b5c3258924fa0a499b652661e8f1be
Former-commit-id: 7b2905b
  • Loading branch information
rgatkinson committed Oct 3, 2015
2 parents 98971a1 + b5cff95 commit 0a7cb91
Show file tree
Hide file tree
Showing 16 changed files with 101 additions and 22 deletions.
22 changes: 22 additions & 0 deletions SwerveRoboticsLibrary/doc/javadoc/deprecated-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,28 @@
<div class="header">
<h1 title="Deprecated API" class="title">Deprecated API</h1>
<h2 title="Contents">Contents</h2>
<ul>
<li><a href="#method">Deprecated Methods</a></li>
</ul>
</div>
<div class="contentContainer"><a name="method">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<table class="deprecatedSummary" border="0" cellpadding="3" cellspacing="0" summary="Deprecated Methods table, listing deprecated methods, and an explanation">
<caption><span>Deprecated Methods</span><span class="tabEnd">&nbsp;</span></caption>
<tr>
<th class="colOne" scope="col">Method and Description</th>
</tr>
<tbody>
<tr class="altColor">
<td class="colOne"><a href="org/swerverobotics/library/SynchronousOpMode.html#waitOneFullHardwareCycle--">org.swerverobotics.library.SynchronousOpMode.waitOneFullHardwareCycle()</a></td>
</tr>
</tbody>
</table>
</li>
</ul>
</div>
<!-- ======= START OF BOTTOM NAVBAR ====== -->
<div class="bottomNav"><a name="navbar.bottom">
Expand Down
4 changes: 4 additions & 0 deletions SwerveRoboticsLibrary/doc/javadoc/index-all.html
Original file line number Diff line number Diff line change
Expand Up @@ -1514,6 +1514,10 @@ <h2 class="title">W</h2>
thread have completed their execution over on the loop() thread and their effects
to have reached the hardware.</div>
</dd>
<dt><span class="memberNameLink"><a href="org/swerverobotics/library/SynchronousOpMode.html#waitOneFullHardwareCycle--">waitOneFullHardwareCycle()</a></span> - Method in class <a href="org/swerverobotics/library/SynchronousOpMode.html" title="class in org.swerverobotics.library">SynchronousOpMode</a></dt>
<dd>
<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
</dd>
<dt><span class="memberNameLink"><a href="org/swerverobotics/library/exceptions/SwerveRuntimeException.html#wrap-java.lang.Exception-">wrap(Exception)</a></span> - Static method in exception <a href="org/swerverobotics/library/exceptions/SwerveRuntimeException.html" title="class in org.swerverobotics.library.exceptions">SwerveRuntimeException</a></dt>
<dd>
<div class="block">Takes an exception, of any flavor, and wraps it (only if necessary) to yield
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
catch(err) {
}
//-->
var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":9,"i7":9,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":6,"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":9,"i31":10,"i32":9,"i33":9,"i34":10,"i35":10,"i36":10};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]};
var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":9,"i7":9,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":6,"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":9,"i31":10,"i32":9,"i33":9,"i34":10,"i35":10,"i36":10,"i37":42};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
var tableTab = "tableTab";
Expand Down Expand Up @@ -230,7 +230,7 @@ <h3>Constructor Summary</h3>
</a>
<h3>Method Summary</h3>
<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
<tr>
<th class="colFirst" scope="col">Modifier and Type</th>
<th class="colLast" scope="col">Method and Description</th>
Expand Down Expand Up @@ -473,6 +473,12 @@ <h3>Method Summary</h3>
to have reached the hardware.</div>
</td>
</tr>
<tr id="i37" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../org/swerverobotics/library/SynchronousOpMode.html#waitOneFullHardwareCycle--">waitOneFullHardwareCycle</a></span>()</code>
<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
</td>
</tr>
</table>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.OpMode">
Expand Down Expand Up @@ -819,6 +825,28 @@ <h4>idle</h4>
</dl>
</li>
</ul>
<a name="waitOneFullHardwareCycle--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>waitOneFullHardwareCycle</h4>
<pre>@Deprecated
public&nbsp;void&nbsp;waitOneFullHardwareCycle()
throws java.lang.InterruptedException</pre>
<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
<div class="block">Waits until the rest of the event loop code that runs on the loop() thread but outside
of the actual body of the loop() method itself has had a chance to run at least once. In
practice, up to two such 'hardware cycles' are sometimes used. Provided only for compatibility
with LinearOpMode, as it is unnecessary here: <a href="../../../org/swerverobotics/library/SynchronousOpMode.html#idle--"><code>idle()</code></a> is a better choice.</div>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
<dd><code>java.lang.InterruptedException</code></dd>
<dt><span class="seeLabel">See Also:</span></dt>
<dd><a href="../../../org/swerverobotics/library/SynchronousOpMode.html#idle--"><code>idle()</code></a></dd>
</dl>
</li>
</ul>
<a name="synchronousThreadIdle--">
<!-- -->
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ <h3>Method Summary</h3>
<!-- -->
</a>
<h3>Methods inherited from class&nbsp;<a href="../../../../org/swerverobotics/library/SynchronousOpMode.html" title="class in org.swerverobotics.library">SynchronousOpMode</a></h3>
<code><a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#createSynchronousWorkerThread-org.swerverobotics.library.interfaces.IInterruptableRunnable-">createSynchronousWorkerThread</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#executeOnLoopThread-org.swerverobotics.library.interfaces.IAction-">executeOnLoopThread</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#executeSingletonOnLoopThread-int-org.swerverobotics.library.interfaces.IAction-">executeSingletonOnLoopThread</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#getLoopCount--">getLoopCount</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#getMsLoopDwellMax--">getMsLoopDwellMax</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#getNewSingletonKey--">getNewSingletonKey</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#getStopActionRegistrar--">getStopActionRegistrar</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#getThreadThunker--">getThreadThunker</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#idle--">idle</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#init_loop--">init_loop</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#init--">init</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#isStarted--">isStarted</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#isStopRequested--">isStopRequested</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#loop--">loop</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#midLoopHook--">midLoopHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#opModeIsActive--">opModeIsActive</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#postInitHook--">postInitHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#postInitLoopHook--">postInitLoopHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#postLoopHook--">postLoopHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#postStartHook--">postStartHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#postStopHook--">postStopHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#preInitHook--">preInitHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#preInitLoopHook--">preInitLoopHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#preLoopHook--">preLoopHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#preStartHook--">preStartHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#preStopHook--">preStopHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#registerActionOnStop-org.swerverobotics.library.interfaces.IAction-">registerActionOnStop</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#setMsLoopDwellMax-long-">setMsLoopDwellMax</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#start--">start</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#staticGetNewSingletonKey--">staticGetNewSingletonKey</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#stop--">stop</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#synchronousThreadIdle--">synchronousThreadIdle</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#synchronousThreadWaitForLoopCycleEmptyOfActionKey-int-">synchronousThreadWaitForLoopCycleEmptyOfActionKey</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#updateGamepads--">updateGamepads</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#waitForStart--">waitForStart</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#waitForThreadsWritesToReachHardware--">waitForThreadsWritesToReachHardware</a></code></li>
<code><a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#createSynchronousWorkerThread-org.swerverobotics.library.interfaces.IInterruptableRunnable-">createSynchronousWorkerThread</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#executeOnLoopThread-org.swerverobotics.library.interfaces.IAction-">executeOnLoopThread</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#executeSingletonOnLoopThread-int-org.swerverobotics.library.interfaces.IAction-">executeSingletonOnLoopThread</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#getLoopCount--">getLoopCount</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#getMsLoopDwellMax--">getMsLoopDwellMax</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#getNewSingletonKey--">getNewSingletonKey</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#getStopActionRegistrar--">getStopActionRegistrar</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#getThreadThunker--">getThreadThunker</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#idle--">idle</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#init_loop--">init_loop</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#init--">init</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#isStarted--">isStarted</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#isStopRequested--">isStopRequested</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#loop--">loop</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#midLoopHook--">midLoopHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#opModeIsActive--">opModeIsActive</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#postInitHook--">postInitHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#postInitLoopHook--">postInitLoopHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#postLoopHook--">postLoopHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#postStartHook--">postStartHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#postStopHook--">postStopHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#preInitHook--">preInitHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#preInitLoopHook--">preInitLoopHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#preLoopHook--">preLoopHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#preStartHook--">preStartHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#preStopHook--">preStopHook</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#registerActionOnStop-org.swerverobotics.library.interfaces.IAction-">registerActionOnStop</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#setMsLoopDwellMax-long-">setMsLoopDwellMax</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#start--">start</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#staticGetNewSingletonKey--">staticGetNewSingletonKey</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#stop--">stop</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#synchronousThreadIdle--">synchronousThreadIdle</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#synchronousThreadWaitForLoopCycleEmptyOfActionKey-int-">synchronousThreadWaitForLoopCycleEmptyOfActionKey</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#updateGamepads--">updateGamepads</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#waitForStart--">waitForStart</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#waitForThreadsWritesToReachHardware--">waitForThreadsWritesToReachHardware</a>, <a href="../../../../org/swerverobotics/library/SynchronousOpMode.html#waitOneFullHardwareCycle--">waitOneFullHardwareCycle</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods.inherited.from.class.OpMode">
Expand Down
Loading

0 comments on commit 0a7cb91

Please sign in to comment.