Skip to content

Commit

Permalink
Prepare for release
Browse files Browse the repository at this point in the history
  • Loading branch information
ControlsNarwhal committed Feb 24, 2024
1 parent 022a361 commit 868c4a0
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 16 deletions.
4 changes: 2 additions & 2 deletions 3128-Common.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "3128-common",
"version": "1.3.8",
"version": "1.4.0",
"uuid": "ae3fa5a2-78d9-47e8-921a-dba45b889445",
"frcYear": "2024",
"mavenUrls": [
Expand All @@ -12,7 +12,7 @@
{
"groupId": "com.github.Team3128",
"artifactId": "3128-common",
"version": "1.3.8"
"version": "1.4.0"
}
],
"jniDependencies": [],
Expand Down
4 changes: 2 additions & 2 deletions 3128-common.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "3128-common",
"version": "1.3.8",
"version": "1.4.0",
"uuid": "ae3fa5a2-78d9-47e8-921a-dba45b889445",
"frcYear": "2024",
"mavenUrls": [
Expand All @@ -12,7 +12,7 @@
{
"groupId": "com.github.Team3128",
"artifactId": "3128-common",
"version": "1.3.8"
"version": "1.4.0"
}
],
"jniDependencies": [],
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "java-library"
id "eclipse"
id "edu.wpi.first.GradleRIO" version "2024.1.1"
id "edu.wpi.first.GradleRIO" version "2024.3.1"
id "org.ajoberstar.grgit" version "3.0.0"
id "maven-publish"
id "io.github.mosadie.vendorJSON" version "1.0"
Expand Down Expand Up @@ -134,7 +134,7 @@ dependencies {
implementation wpi.java.vendor.java()
implementation group: 'gov.nist.math', name: 'jama', version: '1.0.3'

implementation 'org.java-websocket:Java-WebSocket:1.3.8'
implementation 'org.java-websocket:Java-WebSocket:1.4.0'
implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'


Expand Down
24 changes: 21 additions & 3 deletions doc/common/hardware/motorcontroller/NAR_CANSpark.html
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,17 @@ <h2>Method Summary</h2>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">Sets a motor's output based on the leader's</div>
</div>
<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>double</code></div>
<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAppliedOutput()" class="member-name-link">getAppliedOutput</a>()</code></div>
<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>short</code></div>
<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAllFaults()" class="member-name-link">getAllFaults</a>()</code></div>
<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>double</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAppliedOutput()" class="member-name-link">getAppliedOutput</a>()</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">Gets the motors current output</div>
</div>
<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div>
<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getFault(com.revrobotics.CANSparkBase.FaultID)" class="member-name-link">getFault</a><wbr>(com.revrobotics.CANSparkBase.FaultID&nbsp;fault)</code></div>
<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>com.revrobotics.CANSparkBase</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getMotor()" class="member-name-link">getMotor</a>()</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
Expand Down Expand Up @@ -816,6 +822,18 @@ <h3>getMotor</h3>
</section>
</li>
<li>
<section class="detail" id="getAllFaults()">
<h3>getAllFaults</h3>
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">short</span>&nbsp;<span class="element-name">getAllFaults</span>()</div>
</section>
</li>
<li>
<section class="detail" id="getFault(com.revrobotics.CANSparkBase.FaultID)">
<h3>getFault</h3>
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name">getFault</span><wbr><span class="parameters">(com.revrobotics.CANSparkBase.FaultID&nbsp;fault)</span></div>
</section>
</li>
<li>
<section class="detail" id="getState()">
<h3>getState</h3>
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../../utility/narwhaldashboard/NarwhalDashboard.State.html" title="enum class in common.utility.narwhaldashboard">NarwhalDashboard.State</a></span>&nbsp;<span class="element-name">getState</span>()</div>
Expand Down
6 changes: 3 additions & 3 deletions doc/common/utility/narwhaldashboard/NarwhalDashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ <h2 id="nested-classes-inherited-from-class-org.java_websocket.server.WebSocketS
<h2>Field Summary</h2>
<div class="inherited-list">
<h3 id="fields-inherited-from-class-org.java_websocket.server.WebSocketServer">Fields inherited from class&nbsp;org.java_websocket.server.WebSocketServer</h3>
<code>decoders, DECODERS</code></div>
<code>decoders</code></div>
</section>
</li>
<!-- ========== METHOD SUMMARY =========== -->
Expand Down Expand Up @@ -226,13 +226,13 @@ <h2>Method Summary</h2>
</div>
<div class="inherited-list">
<h3 id="methods-inherited-from-class-org.java_websocket.server.WebSocketServer">Methods inherited from class&nbsp;org.java_websocket.server.WebSocketServer</h3>
<code>addConnection, allocateBuffers, broadcast, broadcast, broadcast, broadcast, connections, createBuffer, getAddress, getConnections, getDraft, getLocalSocketAddress, getPort, getRemoteSocketAddress, getWebSocketFactory, onCloseInitiated, onClosing, onConnect, onFragment, onMessage, onWebsocketClose, onWebsocketCloseInitiated, onWebsocketClosing, onWebsocketError, onWebsocketHandshakeReceivedAsServer, onWebsocketMessage, onWebsocketMessage, onWebsocketMessageFragment, onWebsocketOpen, onWriteDemand, queue, releaseBuffers, removeConnection, run, setWebSocketFactory, start, stop, stop</code></div>
<code>addConnection, allocateBuffers, broadcast, broadcast, broadcast, broadcast, broadcast, broadcast, createBuffer, getAddress, getConnections, getDraft, getLocalSocketAddress, getPort, getRemoteSocketAddress, getWebSocketFactory, onCloseInitiated, onClosing, onConnect, onMessage, onWebsocketClose, onWebsocketCloseInitiated, onWebsocketClosing, onWebsocketError, onWebsocketMessage, onWebsocketMessage, onWebsocketOpen, onWriteDemand, queue, releaseBuffers, removeConnection, run, setWebSocketFactory, start, stop, stop</code></div>
<div class="inherited-list">
<h3 id="methods-inherited-from-class-org.java_websocket.AbstractWebSocket">Methods inherited from class&nbsp;org.java_websocket.AbstractWebSocket</h3>
<code>getConnectionLostTimeout, isReuseAddr, isTcpNoDelay, setConnectionLostTimeout, setReuseAddr, setTcpNoDelay, startConnectionLostTimer, stopConnectionLostTimer</code></div>
<div class="inherited-list">
<h3 id="methods-inherited-from-class-org.java_websocket.WebSocketAdapter">Methods inherited from class&nbsp;org.java_websocket.WebSocketAdapter</h3>
<code>onWebsocketHandshakeReceivedAsClient, onWebsocketHandshakeSentAsClient, onWebsocketPing, onWebsocketPong</code></div>
<code>onWebsocketHandshakeReceivedAsClient, onWebsocketHandshakeReceivedAsServer, onWebsocketHandshakeSentAsClient, onWebsocketPing, onWebsocketPong</code></div>
<div class="inherited-list">
<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
Expand Down
4 changes: 4 additions & 0 deletions doc/index-all.html
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,8 @@ <h2 class="title" id="I:F">F</h2>
</dl>
<h2 class="title" id="I:G">G</h2>
<dl class="index">
<dt><a href="common/hardware/motorcontroller/NAR_CANSpark.html#getAllFaults()" class="member-name-link">getAllFaults()</a> - Method in class common.hardware.motorcontroller.<a href="common/hardware/motorcontroller/NAR_CANSpark.html" title="class in common.hardware.motorcontroller">NAR_CANSpark</a></dt>
<dd>&nbsp;</dd>
<dt><a href="common/core/swerve/SwerveModule.html#getAngleMotor()" class="member-name-link">getAngleMotor()</a> - Method in class common.core.swerve.<a href="common/core/swerve/SwerveModule.html" title="class in common.core.swerve">SwerveModule</a></dt>
<dd>
<div class="block">Returns the angle motor</div>
Expand Down Expand Up @@ -682,6 +684,8 @@ <h2 class="title" id="I:G">G</h2>
<dd>
<div class="block">Get the Simple Widget object from an widget</div>
</dd>
<dt><a href="common/hardware/motorcontroller/NAR_CANSpark.html#getFault(com.revrobotics.CANSparkBase.FaultID)" class="member-name-link">getFault(CANSparkBase.FaultID)</a> - Method in class common.hardware.motorcontroller.<a href="common/hardware/motorcontroller/NAR_CANSpark.html" title="class in common.hardware.motorcontroller">NAR_CANSpark</a></dt>
<dd>&nbsp;</dd>
<dt><a href="common/core/swerve/SwerveBase.html#getFieldVelocity()" class="member-name-link">getFieldVelocity()</a> - Method in class common.core.swerve.<a href="common/core/swerve/SwerveBase.html" title="class in common.core.swerve">SwerveBase</a></dt>
<dd>
<div class="block">Gets the current field-relative velocity (x, y and omega) of the robot</div>
Expand Down
2 changes: 1 addition & 1 deletion doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h1 class="title">3128-common</h1>
</div>
<div class="block"><h1>FRC Team 3128 Robot Control Program Utility Library</h1>
<p>Provides utility classes and functions for FRC robot control programs.</p>
<p>Version 1.3.8 (February 22 2024)</p></div>
<p>Version 1.4.0 (February 22 2024)</p></div>
<div id="all-packages-table">
<div class="caption"><span>Packages</span></div>
<div class="summary-table two-column-summary">
Expand Down
2 changes: 1 addition & 1 deletion doc/member-search-index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LibraryVersion=1.3.8
LibraryVersion=1.4.0
archivesGroup = com.github.Team3128
archivesBaseName = 3128-common
jsonFileName = 3128-common.json
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
<body>
<h1>FRC Team 3128 Robot Control Program Utility Library</h1>
<p>Provides utility classes and functions for FRC robot control programs.</p>
<p>Version 1.3.8 (February 22 2024)</p>
<p>Version 1.4.0 (February 22 2024)</p>
</body>

0 comments on commit 868c4a0

Please sign in to comment.