Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/maniplib/ManipArm.html
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ <h2>Method Summary</h2>
<div class="table-header col-second">Method</div>
<div class="table-header col-last">Description</div>
<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#addAbsoluteEncoderValue(double)" class="member-name-link">addAbsoluteEncoderValue</a><wbr>(double&nbsp;absEncoderDegrees)</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#addAbsoluteEncoderValue(double)" class="member-name-link">addAbsoluteEncoderValue</a><wbr>(double&nbsp;absEncoderRotations)</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">Adds an absolute encoder to sync to on init.</div>
</div>
Expand Down Expand Up @@ -342,10 +342,10 @@ <h3>addFollower</h3>
<li>
<section class="detail" id="addAbsoluteEncoderValue(double)">
<h3>addAbsoluteEncoderValue</h3>
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">addAbsoluteEncoderValue</span><wbr><span class="parameters">(double&nbsp;absEncoderDegrees)</span></div>
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name">addAbsoluteEncoderValue</span><wbr><span class="parameters">(double&nbsp;absEncoderRotations)</span></div>
<div class="block">Adds an absolute encoder to sync to on init. This is not used for actual control
but recommended to keep arm position on boot. Can be called in init.
Value must be in 0-360.</div>
Value must be in rotations 0-1.</div>
</section>
</li>
<li>
Expand Down
6 changes: 3 additions & 3 deletions maniplib/maniplib.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"fileName": "maniplib-2025.0.0-beta0.5.5.json",
"fileName": "maniplib-2025.0.0-beta0.5.6.json",
"name": "ManipLib",
"version": "2025.0.0-beta0.5.5",
"version": "2025.0.0-beta0.5.6",
"frcYear": "2025",
"uuid": "67953b3f-32a5-41cf-84d7-2f6989d3d38d",
"mavenUrls": [
Expand All @@ -12,7 +12,7 @@
{
"groupId": "maniplib",
"artifactId": "ManipLib-java",
"version": "2025.0.0-beta0.5.5"
"version": "2025.0.0-beta0.5.6"
}
],
"requires": [
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a884767781648034695405bfd16808eb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0938e82b7149a828fc2938f60c050b3c7362ed9b
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
273f0a84075bd10e72f425a3b5fd1eb6b3fb86c606ac52d71af991d5a396fb43
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
876f5ad34c4432a53d94b9d966485841babf8513dc17b812b5332de392b0d6e3641928ffcf5b0a79e777ac15bf64ed94d5def88a7fd581d2ca4720295d8c7a08
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a884767781648034695405bfd16808eb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0938e82b7149a828fc2938f60c050b3c7362ed9b
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
273f0a84075bd10e72f425a3b5fd1eb6b3fb86c606ac52d71af991d5a396fb43
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
876f5ad34c4432a53d94b9d966485841babf8513dc17b812b5332de392b0d6e3641928ffcf5b0a79e777ac15bf64ed94d5def88a7fd581d2ca4720295d8c7a08
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>maniplib</groupId>
<artifactId>ManipLib-cpp</artifactId>
<version>2025.0.0-beta0.5.6</version>
<packaging>pom</packaging>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
687b9e1480fa791f36ac563a3a454feb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b520c0928a399f1f33e1ac2afdbebbcdb804653e
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
be41f834589c32f509aed066dcee34d938117ced49805107802968143242e8e5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
146e209977660f00f6f0971c90d826ef9be8c757f9c1571574b3a2e0e67e143f2676df325261743ea476d54600bf5cb40046d9088728b471442a92fef36d9dd7
7 changes: 4 additions & 3 deletions maniplib/repos/maniplib/ManipLib-cpp/maven-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<groupId>maniplib</groupId>
<artifactId>ManipLib-cpp</artifactId>
<versioning>
<latest>2025.0.0-beta0.5.5</latest>
<release>2025.0.0-beta0.5.5</release>
<latest>2025.0.0-beta0.5.6</latest>
<release>2025.0.0-beta0.5.6</release>
<versions>
<version>test</version>
<version>2025.0.0-beta0</version>
Expand All @@ -18,7 +18,8 @@
<version>2025.0.0-beta0.5.3</version>
<version>2025.0.0-beta0.5.4</version>
<version>2025.0.0-beta0.5.5</version>
<version>2025.0.0-beta0.5.6</version>
</versions>
<lastUpdated>20250302150604</lastUpdated>
<lastUpdated>20250302152817</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0260e19efacdfd6f1e528a4a504c7818
af5347e51e6d3feba76297af389c8e26
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bbab56b8683e91acd82a594d57280fd52778da9c
ca9e0c2960e7451069c0bbb0f360c0b33a9315d4
Original file line number Diff line number Diff line change
@@ -1 +1 @@
355fb6fc06bd323f1aea9df9c0927679e37277583c8769ce40917a4bf32aea3d
7f2e28c7229e01ebcb51538722f02a620642a93a4ca37573e4cfb9665614882e
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b44f716852408cbfe6e5e1b0e61a6af8f420fdb6c11031f76ac42e8eeb5e9e48d351c7ba90c6a4b0d7933ba5aeae200f2b53391310dbbaff11cfc1895accb22f
8063c3eb5b63691e8c6d63fa65883948cbde90928be6aedac24b328577e7c6205a1f953e8d68b477d44136b9f00a5b88021901dfeeb166eaf1027dc51b948929
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ea615d1b0a6088c5138bb18a2627f303
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c5dd6ed69cbd9955c405e4626eab8f3a1ddec6f0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
73d6aa00e65f00397dc2f410c32cb441643b809b96fd62b4c2428c7a0d6848b0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
27bab572d7a7bce4002497783e3ce3e108ae50303236272596f0a3e89ba2a34103829ad4b852765a1df061c3c992f1b22de02eacb7fdfae143d9e8305d44eba5
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0e5b93cd75c446ee7dfdbe24ff40fe03
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
350ae875bfabe0ae977e46d4ad03a20b1e518a07
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0e2e230b0ad4158b2fc6d8160aafd63862dfbb1e367b35de064861ddfff80717
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
27149d9419bccbe7356589713db6e3ce5a1fced1adb5c7b220177ae1bd1751d1dc4a0d01d2cdf084eef580e47c73104f7f77eb6dc0a55350f9452642197aed18
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4c9026087a3fe7248bd883b306cac3d7
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
831835ab752580db5391224c128aad13bb2ac675
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cbdd56ff9229318e530ffb6fb31405776c28ce28a56494e24926186d9fb0bda8
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c48fd33828f3b51aaf6a216614b4dd7d53ec446f94e0562df08f4a6e0a27c7ad70b4e671a9c4e3ac884d144104b3a789981c608c47b4055a286e3ac770a7d815
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>maniplib</groupId>
<artifactId>ManipLib-java</artifactId>
<version>2025.0.0-beta0.5.6</version>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a978eb54b1575e9ee08b8868c8c3b5a6
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
03510ceec3c9f4e703821b4d790fa5052d2dd232
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6810f3327298f222a5b5419accd4fef20d87a2f601719fe21c504a3fb3293f06
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b8ce2d4da94b326c72e4b982ef66409404af3b86f520e94d144427c982b19d769cd08561325ca784080f6036cb22016d2cb6fd83aa2a9b74b174ee8de2eb831b
7 changes: 4 additions & 3 deletions maniplib/repos/maniplib/ManipLib-java/maven-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<groupId>maniplib</groupId>
<artifactId>ManipLib-java</artifactId>
<versioning>
<latest>2025.0.0-beta0.5.5</latest>
<release>2025.0.0-beta0.5.5</release>
<latest>2025.0.0-beta0.5.6</latest>
<release>2025.0.0-beta0.5.6</release>
<versions>
<version>2025.0.0-unreleased</version>
<version>test</version>
Expand All @@ -19,7 +19,8 @@
<version>2025.0.0-beta0.5.3</version>
<version>2025.0.0-beta0.5.4</version>
<version>2025.0.0-beta0.5.5</version>
<version>2025.0.0-beta0.5.6</version>
</versions>
<lastUpdated>20250302150604</lastUpdated>
<lastUpdated>20250302152821</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ee74021674753697e52729e0ff8ab3dc
f1c4d1a8bca76fc3bdfebac5c3dd27c2
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f1d672b8a10b523664e890f323467013bc99492a
20f165b6e8980fcbf5767b104079adf6d98d926e
Original file line number Diff line number Diff line change
@@ -1 +1 @@
46ddc9a267c34755e76f679d0080b92eef4c81c6e2c2c7801c1dd2873105bdc0
33e046bf659249a6ccb96285dd3998a81ce24a19770422c41a3d13ec9658f373
Original file line number Diff line number Diff line change
@@ -1 +1 @@
92233c7aeaf62f38eed214bb0e15d4709283b5b97abf9bae80d79c101788f6f91abf08707ebe9909509a75b964aba4a76f41d620f048e603b53a8379f849dbb6
c81206ee23af5981e94a47d422d6317addf7cb23f8cbb73d75b5d7bbddaee827e95be738d42fd5030dbef8b00fb19c16f921bfedef2369d29e81962385e0844a
2 changes: 1 addition & 1 deletion publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'maven-publish'

ext.licenseFile = files("$rootDir/LICENSE.txt")

def pubVersion = System.getenv("releaseVersion") ?: "2025.0.0-beta0.5.5"
def pubVersion = System.getenv("releaseVersion") ?: "2025.0.0-beta0.5.6"

def releasesRepoUrl = "maniplib/repos/"

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/maniplib/ManipArm.java
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,10 @@ public void addFollower(ManipMotor followerMotor, boolean isInverted) {
/**
* Adds an absolute encoder to sync to on init. This is not used for actual control
* but recommended to keep arm position on boot. Can be called in init.
* Value must be in 0-360.
* Value must be in rotations 0-1.
*/
public void addAbsoluteEncoderValue(double absEncoderDegrees) {
absEncoderAngle.mut_replace(absEncoderDegrees, Degrees);
public void addAbsoluteEncoderValue(double absEncoderRotations) {
absEncoderAngle.mut_replace(absEncoderRotations, Rotations);
this.absSetup = true;
}

Expand All @@ -295,7 +295,7 @@ public void setSyncAbsEncoderInit(boolean syncAbsEncoderInit) {
*/
public void synchronizeAbsoluteEncoder() {
motor.setPosition(
Rotations.of(absEncoderAngle.in(Degrees))
Degrees.of(absEncoderAngle.in(Rotations))
.minus(armConstants.kArmOffsetToHorizantalZero)
.in(Rotations));
}
Expand Down
Loading